No commit message

No commit message

Makefile.in

@@ -21,17 +21,21 @@ PHONY: config byte opt clean superclean install tar version release
 
 BINARIES=acgc acgc.opt acg acg.opt
 
-VERSION = $(shell date "+%Y-%m-%d")
+VERSION_FILE = src/utils/version.ml
+VERSION = $(shell date "+%Y%m%d-%M")
 RELEASE = acg-$(VERSION)
 
-AR_EXCLUDE = 
+TAR_RELEASE =acg-$(TAR_VERSION)
+
 
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-essai:
-	echo $(DATE)
+
+essai: TAR_VERSION=$(shell grep "^DEFINE" $(VERSION_FILE) | sed -e 's/DEFINE.* = "\(.*\)"/\1/')
+essai: 
+	echo "$(TAR_VERSION)" "$(TAR_RELEASE)"
 
 byte opt: 
 	$(MAKE) -C src $@
@@ -40,14 +44,14 @@ byte opt:
 all: byte opt
 
 clean:
-	if test "$@" = clean ; then $(MAKE) -C config $@ ; fi
-	$(MAKE) -C src $@
-	rm -rf *.log  *~ autom4te.cache
+	-if test "$@" = clean ; then $(MAKE) -C config $@ ; fi
+	-$(MAKE) -C src $@
+	rm -rf *.log  *~ autom4te.cache *.tar.gz
 	find . -name "*~" -exec rm -f {} \;
 	-for file in $(BINARIES); do rm $$file ; done
 
 superclean: clean
-	-find . -name "*.in" -print | sed -e 's/\(.*\)\.in/\1/' | xargs -n 1 rm
+	-find . -wholename "./*/*.in" -print | sed -e 's/\(.*\)\.in/\1/' | xargs -n 1 rm
 
 install:
 	for file in $(BINARIES); do if test -x $$file ; then cp $$file @bindir@/. ; fi ; done
@@ -63,14 +67,18 @@ config: configure
 configure: config/configure.ac
 	cd $(<D) && autoconf && mv configure .. & cd ..
 
-tar: version superclean
-	if test -a ../$(RELEASE) ; then rm ../$(RELEASE) ; fi
-	cd .. && ln -s trunk $(RELEASE) && cd trunk
-	tar cvfz $(RELEASE).tar.gz -C .. -h $(RELEASE) --exclude="*\.svn*" --exclude "$(RELEASE)/data" --exclude "$(RELEASE)/src/data" --exclude "$(RELEASE)/src/*.old" --exclude "$(RELEASE)/*.tar*"
-	if test -a ../$(RELEASE) ; then rm ../$(RELEASE) ; fi
+tar: TAR_VERSION = $(shell grep "^DEFINE" $(VERSION_FILE) | sed -e 's/DEFINE.* = "\(.*\)"/\1/')
+
+tar: superclean
+	if test -a ../$(TAR_RELEASE) ; then rm ../$(TAR_RELEASE) ; fi
+	cd .. && ln -s trunk $(TAR_RELEASE) && cd trunk
+	echo $(TAR_RELEASE).tar.gz
+	tar cvfz $(TAR_RELEASE).tar.gz -C .. -h $(TAR_RELEASE) --exclude="*\.svn*" --exclude "$(TAR_RELEASE)/data" --exclude "$(TAR_RELEASE)/src/data" --exclude "$(TAR_RELEASE)/src/*.old" --exclude "$(TAR_RELEASE)/*.tar*"
+	if test -a ../$(TAR_RELEASE) ; then rm ../$(TAR_RELEASE) ; fi
 	./configure
 
 version :
-	sed -i 's/@VERSION@/$(VERSION)/' src/utils/version.ml
+	sed -i 's/\(VERSION = \)".*"/\1"$(VERSION)"/' $(VERSION_FILE)
 
-release :
\ No newline at end of file
+release : version tar
+	if svn status -q -u | grep -v "^Status against" | grep -q -v "^\?" ; then echo "Please commit before making a release" ; else $(MAKE) superclean ; svn cp svn+ssh://pogodall@scm.gforge.inria.fr/svn/acg/dev/trunk svn+ssh://pogodall@scm.gforge.inria.fr/svn/acg/dev/tags/release-$(VERSION) -m "Tagging the $(VERSION) release of the 'acg' project" ; fi
\ No newline at end of file

src/utils/version.ml

@@ -17,7 +17,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-DEFINE VERSION= "@VERSION@"
+DEFINE VERSION = "20081022-49"
 
 
 let version = VERSION