Made a release (ProofGeneral.spec, proof-site.el, download.phtml)

Makefile.devel: fixed fakerelease
doc/Makefile:   Don't attempt page rearrangement if dviutils not present

5 files changed, 34 insertions, 18 deletions

diff --git a/Makefile.devel b/Makefile.devel
index de77ad68..2b7d0d49 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -281,7 +281,12 @@ dist:
 	@echo "*************************************************"
 	@echo " Running cvs export .."
 	@echo "*************************************************"
-	(cd $(DISTBUILDIR); cvs export -kv -r "$(CVS_RELEASENAME)" -d $(RELEASENAME) $(CVSNAME))
+	if [ -z "$(NOCVS)" ]; then \
+           (cd $(DISTBUILDIR); cvs export -kv -r "$(CVS_RELEASENAME)" -d $(RELEASENAME) $(CVSNAME)); \
+	else \
+	   mkdir -p $(DISTBUILDIR)/$(RELEASENAME); \
+	   cp -pr . $(DISTBUILDIR)/$(RELEASENAME); \
+	fi
 	@echo "*************************************************"
 	@echo " Running 'make alldist' for new release .."
 	@echo "*************************************************"
@@ -320,7 +325,12 @@ develdist:
 	@echo " Making developer distribution..."
 	@echo "*************************************************"
 	mkdir -p $(DISTBUILDIR)
-	(cd $(DISTBUILDIR); cvs export -kv -r "$(CVS_RELEASENAME)" -d $(DEVELRELEASENAME) $(CVSNAME))
+	if [ -z "$(NOCVS)" ]; then \
+           (cd $(DISTBUILDIR); cvs export -kv -r "$(CVS_RELEASENAME)" -d $(DEVELRELEASENAME) $(CVSNAME)) \
+	else \
+	   mkdir -p $(DISTBUILDIR)/$(DEVELRELEASENAME); \
+	   cp -pr . $(DISTBUILDIR)/$(DEVELRELEASENAME); \
+	fi
 	$(TAR) -cvhf $(DISTBUILDIR)/$(DEVELRELEASENAMETAR) -C $(DISTBUILDIR) $(DEVELRELEASENAME)
 	gzip -9 $(DISTBUILDIR)/$(DEVELRELEASENAMETAR)
 
@@ -329,13 +339,13 @@ develdist:
 ##
 ## release:
 ##     tag the CVS sources, and make a distribution.
-##     Then install the distribution in RELEASEDIR.
+##     Then install the distribution in RELEASEDIR
 ##     WARNING: RELEASEDIR is not cleaned, but files there
 ##     with same names will be overwritten.
 ##     Moreover, a link ProofGeneral -> ProofGeneral-<version>
 ##     is made.
-##	  
-release: distclean tag dist develdist
+##
+release: distclean tag dist develdist 
 	mkdir -p $(RELEASEDIR)
 	cp -pfr $(DISTBUILDIR)/* $(RELEASEDIR)
 	(cd $(RELEASEDIR); rm -f $(NAME); ln -s $(RELEASENAME) $(NAME))
diff --git a/doc/Makefile b/doc/Makefile
index 9ea2eb3a..3ef0feb0 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -20,8 +20,11 @@ DOCNAME = ProofGeneral
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
-DVICONCAT = dviconcat
+# `dviutils' package contains these useful utilities.
+# "make rearrange" will only be called if you have dviselect.
 DVISELECT = dviselect
+DVICONCAT = dviconcat
+
 
 # Assumes actual first two pages belong to titlepage
 TITLERANGE = =1,=2
@@ -45,6 +48,9 @@ TMPFILE=pgt
 
 .texi.dvi:
 	$(TEXI2DVI) $<
+	if `which $(DVISELECT) > /dev/null`; then $(MAKE) rearrange; fi
+
+rearrange:
 	$(DVISELECT) -i $*.dvi -o $*.tmp1 $(TITLERANGE)
 	$(DVISELECT) -i $*.dvi -o $*.tmp2 $(MAINRANGE)
 	$(DVISELECT) -i $*.dvi -o $*.tmp3 $(TOC)
diff --git a/etc/ProofGeneral.spec b/etc/ProofGeneral.spec
index 7639eaed..c76f0448 100644
--- a/etc/ProofGeneral.spec
+++ b/etc/ProofGeneral.spec
@@ -1,12 +1,12 @@
 Summary:	Proof General, Emacs interface for Proof Assistants
 Name:		ProofGeneral
-Version:	2.2pre990827
+Version:	2.2pre990831
 Release:	1
 Group:		Applications/Editors/Emacs
 Copyright:	LFCS, University of Edinburgh
 Url:		http://www.dcs.ed.ac.uk/proofgen/
 Packager:	David Aspinall <da@dcs.ed.ac.uk>
-Source:		http://www.dcs.ed.ac.uk/proofgen/ProofGeneral-2.2pre990827.tar.gz
+Source:		http://www.dcs.ed.ac.uk/proofgen/ProofGeneral-2.2pre990831.tar.gz
 BuildRoot:	/tmp/ProofGeneral-root
 Patch:		ProofGeneral.patch
 PreReq:		/sbin/install-info
diff --git a/generic/proof-site.el b/generic/proof-site.el
index 91c7019b..0e821767 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -263,7 +263,7 @@ Note: to change proof assistant, you must start a new Emacs session.")
 
 ;; WARNING: do not edit below here 
 ;; (the next constant is set automatically)
-(defconst proof-general-version "Proof General, Version 2.2pre990827 released by da. Email proofgen@dcs.ed.ac.uk."
+(defconst proof-general-version "Proof General, Version 2.2pre990831 released by da. Email proofgen@dcs.ed.ac.uk."
  "Version string identifying Proof General release.")
 
 (provide 'proof-site)
diff --git a/html/download.phtml b/html/download.phtml
index 6d9f73b2..7c841c9f 100644
--- a/html/download.phtml
+++ b/html/download.phtml
@@ -20,7 +20,7 @@ You can download the latest
 stable release, 
 <a href="#stable">ProofGeneral-2.1</a>, or the latest pre-release,
 <!-- Warning, next line edited by make file -->
-<a href="#prerel">ProofGeneral-2.2pre990827</a>.
+<a href="#prerel">ProofGeneral-2.2pre990831</a>.
 There is also a complete archive 
 of the current pre-release 
 <a href="#devel">for developers</a>.
@@ -102,7 +102,7 @@ any problems, suggestions, or patches.
 <hr>
 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<h2><a name="prerel">Pre-release: ProofGeneral-2.2pre990827</a></h2>
+<h2><a name="prerel">Pre-release: ProofGeneral-2.2pre990831</a></h2>
 <!-- End Warning. -->
 
 <p>
@@ -111,7 +111,7 @@ features are added and experimented with.
 <br>
 Check the 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<?php fileshow("ProofGeneral-2.2pre990827/CHANGES","CHANGES"); ?> file
+<?php fileshow("ProofGeneral-2.2pre990831/CHANGES","CHANGES"); ?> file
 <!-- End Warning. -->
 for a summary of changes since the last stable version, and
 the planned changes to come.
@@ -123,13 +123,13 @@ in a pre-release.
 <ul>
 <!-- WARNING!  Lines below automatically edited by makefile. -->
   <li> gzip'ed tar file: 
-      <?php download_link("ProofGeneral-2.2pre990827.tar.gz") ?>
+      <?php download_link("ProofGeneral-2.2pre990831.tar.gz") ?>
   </li>
   <li> Linux RPM package 
-      <?php download_link("ProofGeneral-2.2pre990827-1.noarch.rpm") ?>
+      <?php download_link("ProofGeneral-2.2pre990831-1.noarch.rpm") ?>
      <br>
      The source RPM is 
-      <?php download_link("ProofGeneral-2.2pre990827-1.src.rpm","here") ?>.
+      <?php download_link("ProofGeneral-2.2pre990831-1.src.rpm","here") ?>.
   </li>
 <!-- End Warning. -->
 </ul>
@@ -147,7 +147,7 @@ version distribution above is that we include:
 <ul>
   <li> provisional instantiations of Proof General to new provers <br>
 	(mentioned in the 
-	<?php fileshow("ProofGeneral-2.2pre990827/CHANGES","CHANGES"); ?> file),
+	<?php fileshow("ProofGeneral-2.2pre990831/CHANGES","CHANGES"); ?> file),
   </li>
   <li> the low-level list of things to do, </li>
   <li> developer's Makefile used to generate documentation files <br>
@@ -163,7 +163,7 @@ release, because developers should have the right tools!
 <ul>
   <li> gzip'ed tar file: 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-      <?php download_link("ProofGeneral-2.2pre990827-devel.tar.gz") ?>
+      <?php download_link("ProofGeneral-2.2pre990831-devel.tar.gz") ?>
 <!-- End Warning. -->
   </li>
 </ul>
@@ -174,7 +174,7 @@ interested in hacking the Emacs lisp part of the program for
 a prover that is currently supported.  But you may
 still like to check the latest
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<?php fileshow("ProofGeneral-2.2pre990827/todo","low-level to-do list"); ?>.
+<?php fileshow("ProofGeneral-2.2pre990831/todo","low-level to-do list"); ?>.
 <!-- End Warning. -->
 </p>