Commit 6e8fac1e authored by POGODALLA Sylvain's avatar POGODALLA Sylvain

Version management added

parent 47ddb01f
...@@ -22,7 +22,7 @@ PHONY: config byte opt clean superclean install tar version release ...@@ -22,7 +22,7 @@ PHONY: config byte opt clean superclean install tar version release
BINARIES=acgc acgc.opt acg acg.opt BINARIES=acgc acgc.opt acg acg.opt
VERSION_FILE = src/utils/version.ml VERSION_FILE = src/utils/version.ml
VERSION = $(shell date "+%Y%m%d-%M") VERSION = $(shell date "+%Y%m%d")
RELEASE = acg-$(VERSION) RELEASE = acg-$(VERSION)
TAR_RELEASE =acg-$(TAR_VERSION) TAR_RELEASE =acg-$(TAR_VERSION)
...@@ -33,9 +33,6 @@ prefix = @prefix@ ...@@ -33,9 +33,6 @@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
essai: TAR_VERSION=$(shell grep "^DEFINE" $(VERSION_FILE) | sed -e 's/DEFINE.* = "\(.*\)"/\1/')
essai:
echo "$(TAR_VERSION)" "$(TAR_RELEASE)"
byte opt: byte opt:
$(MAKE) -C src $@ $(MAKE) -C src $@
...@@ -81,4 +78,4 @@ version : ...@@ -81,4 +78,4 @@ version :
sed -i 's/\(VERSION = \)".*"/\1"$(VERSION)"/' $(VERSION_FILE) sed -i 's/\(VERSION = \)".*"/\1"$(VERSION)"/' $(VERSION_FILE)
release : version tar 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 if svn status -q -u | grep -v "^Status against" | grep -q -v "^\?" ; then printf "\n\nERROR:\nPlease commit before making a release\n\n" ; 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 \ No newline at end of file
...@@ -26,7 +26,8 @@ let dirs = ref [""] ...@@ -26,7 +26,8 @@ let dirs = ref [""]
let options = let options =
[ [
("-i", Arg.Set interactive , " Enter the interaction loop to parse terms according to signatures"); ("-version", Arg.Unit (fun () -> Printf.printf "%s\n" Version.version;exit 0), " Prints the version number");
("-i", Arg.Set interactive , " Enters the interaction loop to parse terms according to signatures");
("-I", Arg.String (fun dir -> dirs := (!dirs)@[dir]) , " -I dir sets dir as a directory in which file arguments can be looked for") ("-I", Arg.String (fun dir -> dirs := (!dirs)@[dir]) , " -I dir sets dir as a directory in which file arguments can be looked for")
] ]
......
...@@ -27,6 +27,7 @@ let dirs = ref [""] ...@@ -27,6 +27,7 @@ let dirs = ref [""]
let options = let options =
[ [
("-version", Arg.Unit (fun () -> Printf.printf "%s\n" Version.version;exit 0), " Prints the version number");
("-I", Arg.String (fun dir -> dirs := (!dirs)@[dir]) , " -I dir sets dir as a directory in which file arguments can be looked for") ("-I", Arg.String (fun dir -> dirs := (!dirs)@[dir]) , " -I dir sets dir as a directory in which file arguments can be looked for")
] ]
...@@ -42,7 +43,9 @@ module P = Script_parser.Make(E) ...@@ -42,7 +43,9 @@ module P = Script_parser.Make(E)
let welcome_msg = let welcome_msg =
"\n\t\t\tWelcome to the ACG toplevel\n\t\t\t\tINRIA 2008\nPlease send your comments or bug reports or featrure requests to sylvain.pogodalla@loria.fr\n\n\nType\n\t\thelp ;\nto get help.\n\n\n\n" Printf.sprintf
"\n\t\t\tWelcome to the ACG toplevel\n\t\t\t Version %s\n\t\t\t\tINRIA 2008\nPlease send your comments or bug reports or featrure requests to sylvain.pogodalla@loria.fr\n\n\nType\n\t\thelp ;\nto get help.\n\n\n\n"
Version.version
let env = ref E.empty let env = ref E.empty
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
DEFINE VERSION = "20081022-49" DEFINE VERSION = "20081022"
let version = VERSION let version = VERSION
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment