preparation a la release 8.0

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5655 85f007b7-540e-0410-9357-904b9bb8a0f7

6 files changed, 28 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 1550f362b4..5442c8c527 100644
--- a/Makefile
+++ b/Makefile
@@ -663,7 +663,12 @@ ML4FILES += contrib/interface/debug_tac.ml4 contrib/interface/centaur.ml4
 PARSERREQUIRES=$(CMO) # Solution de facilité...
 PARSERREQUIRESCMX=$(CMX)
 
-COQINTERFACE=bin/coq-interface$(EXE) bin/coq-interface.opt$(EXE) bin/parser$(EXE)
+ifeq ($(BEST),opt)
+  COQINTERFACE=bin/coq-interface$(EXE) bin/coq-interface.opt$(EXE) bin/parser$(EXE) bin/parser.opt$(EXE)
+else
+  COQINTERFACE=bin/coq-interface$(EXE) bin/parser$(EXE)
+endif
+
 pcoq-binaries:: $(COQINTERFACE) 
 
 bin/coq-interface$(EXE): $(COQMKTOP) $(CMO) $(USERTACCMO) $(INTERFACE)
@@ -674,10 +679,20 @@ bin/coq-interface.opt$(EXE): $(COQMKTOP) $(CMX) $(USERTACCMX) $(INTERFACECMX)
 	$(SHOW)'COQMKTOP -o $@'
 	$(HIDE)$(COQMKTOP) -opt $(OPTFLAGS) -o $@ $(INTERFACECMX)
 
-bin/parser$(EXE): contrib/interface/parse.cmx contrib/interface/line_parser.cmx $(PARSERREQUIRESCMX) contrib/interface/xlate.cmx contrib/interface/vtp.cmx
+PARSERCODE=contrib/interface/line_parser.cmo contrib/interface/vtp.cmo \
+           contrib/interface/xlate.cmo contrib/interface/parse.cmo
+PARSERCMO=$(PARSERREQUIRES) $(PARSERCODE)
+PARSERCMX= $(PARSERREQUIRESCMX) $(PARSECODE:.cmo=.cmx)
+
+bin/parser$(EXE): $(PARSERCMO)
+	$(SHOW)'OCAMLC -o $@'
+	$(HIDE)$(OCAMLC) -linkall -cclib -lunix $(OPTFLAGS) -o $@ \
+	  dynlink.cma $(CMA) $(PARSERCMO)
+
+bin/parser.opt$(EXE): $(PARSERCMX)
 	$(SHOW)'OCAMLOPT -o $@'
-	$(HIDE)$(OCAMLOPT) -linkall -cclib -lunix $(OPTFLAGS) -o $@ $(CMXA) \
-	$(PARSERREQUIRESCMX) line_parser.cmx vtp.cmx xlate.cmx parse.cmx
+	$(HIDE)$(OCAMLOPT) -linkall -cclib -lunix $(OPTFLAGS) -o $@ \
+	  $(CMXA) $(PARSERCMX)
 
 INTERFACEVO=
 
diff --git a/distrib/RH/coq.spec b/distrib/RH/coq.spec
index c8945b4fa7..f28177e03a 100644
--- a/distrib/RH/coq.spec
+++ b/distrib/RH/coq.spec
@@ -1,12 +1,12 @@
 Name: coq
-Version: 8.0cdrom
+Version: 8.0
 Release: 1
 Summary: The Coq Proof Assistant
 Copyright: freely redistributable
 Group: Applications/Math
 Vendor: INRIA & LRI
 URL: http://coq.inria.fr
-Source: ftp://ftp.inria.fr/INRIA/coq/V8.0/coq-8.0cdrom.tar.gz
+Source: ftp://ftp.inria.fr/INRIA/coq/V8.0/coq-8.0.tar.gz
 Icon: petit-coq.gif
 
 %description
diff --git a/distrib/RH/coq_ext_for_pcoq.spec b/distrib/RH/coq_ext_for_pcoq.spec
index f774372e6d..734afb961f 100644
--- a/distrib/RH/coq_ext_for_pcoq.spec
+++ b/distrib/RH/coq_ext_for_pcoq.spec
@@ -1,14 +1,14 @@
 Name: coq_ext_for_pcoq
-Version: 8.0cdrom
+Version: 8.0
 Release: 1
 Summary: The Coq Extension for Pcoq
 Copyright: freely redistributable
 Group: Applications/Math
 Vendor: INRIA & LRI
 URL: http://coq.inria.fr
-Source: ftp://ftp.inria.fr/INRIA/coq/V8.0/coq-8.0cdrom.tar.gz
+Source: ftp://ftp.inria.fr/INRIA/coq/V8.0/coq-8.0.tar.gz
 Icon: petit-coq.gif
-Requires: coq = 8.0cdrom
+Requires: coq = 8.0
 
 %description
 The Coq Extension for Pcoq provides all facilities to interface Coq with
diff --git a/distrib/RH/coqide.spec b/distrib/RH/coqide.spec
index 420589b266..81b2e56340 100644
--- a/distrib/RH/coqide.spec
+++ b/distrib/RH/coqide.spec
@@ -1,14 +1,14 @@
 Name: coqide
-Version: 8.0cdrom
+Version: 8.0
 Release: 1
 Summary: The Coq Integrated Development Interface
 Copyright: freely redistributable
 Group: Applications/Math
 Vendor: INRIA & LRI
 URL: http://coq.inria.fr
-Source: ftp://ftp.inria.fr/INRIA/coq/V8.0beta/coq-8.0cdrom.tar.gz
+Source: ftp://ftp.inria.fr/INRIA/coq/V8.0beta/coq-8.0.tar.gz
 Icon: petit-coq.gif
-Requires: coq = 8.0cdrom
+Requires: coq = 8.0
 
 %description
 The Coq Integrated Development Interface is a graphical interface for the 
diff --git a/distrib/check-list b/distrib/check-list
index 7116683936..a2a7107b2c 100755
--- a/distrib/check-list
+++ b/distrib/check-list
@@ -11,12 +11,10 @@ COQPACKAGE=coq-$VERSION
 CONFIGFILE=$COQPACKAGE/configure
 
 version=`grep "^VERSION=" $CONFIGFILE | sed -e 's/^VERSION=\(.*\)/\1/'`
-#versionsi=`grep "^VERSIONSI=" $CONFIGFILE | sed -e 's/^VERSIONSI=\(.*\)/\1/'`
 coqdate=`grep "^DATE=" $CONFIGFILE | sed -e 's/^DATE=\(.*\)/\1/'`
 
 echo "According to the configure file of the archive to be released"
 echo "  The release version is V$version"
-#echo "  The SearchIsos release version is V$versionsi"
 echo "  The date is $coqdate"
 echo
 echo "Comparing datas with expected ones"
@@ -24,9 +22,6 @@ echo "Comparing datas with expected ones"
 if [ ! "$version" = "$VERSION" ]; then
 	 echo "Inconsistent version number";exit
 fi
-#if [ ! "$versionsi" = "$VERSIONSI" ]; then
-#	echo "Inconsistent SearchIsos version number";exit
-#fi
 if [ ! "$date" = "$DATE" ]; then
 	echo "Inconsistent date release";exit
 fi
@@ -76,7 +71,7 @@ read a
 if [ "$a" != 'y' -a "$a" != 'Y' ]; then echo Aborting; exit 1; fi
 
 versionspec1=`sed -n -e 's!^Version: \(.*\)!\1!p' ./RH/coq.spec`
-versionspec2=`sed -n -e 's!.*coq-\(.*\)\.tar\.gz.*!\1!' ./RH/coq.spec`
+versionspec2=`sed -n -e 's!^Source: .*coq-\(.*\)\.tar\.gz.*!\1!p' ./RH/coq.spec`
 if [ "$versionspec1" = "$version" -a "$versionspec2" = "$version" ];
 then echo "Version number in coq.spec seems OK ($versionspec1)";
 else
diff --git a/distrib/configure.distrib b/distrib/configure.distrib
index bd4faf442e..bc7ff74e92 100755
--- a/distrib/configure.distrib
+++ b/distrib/configure.distrib
@@ -11,7 +11,6 @@
 #
 
 VERSION=`sed -n -e 's/^VERSION=\(.*\)/\1/p' ../configure`
-#VERSIONSI=`sed -n -e 's/^VERSIONSI=\(.*\)/\1/p' ../configure`
 DATE=`sed -n -e 's/^DATE=\(.*\)/\1/p' ../configure`
 RELEASENUM=1
 DISTRIBDIR=`pwd`