diff --git a/Makefile b/Makefile index 83eea31f43a4a886f341d13aa7ff25539cc735d3..4e26e3ad13a01a52d28e4f65e92ea456fa3c13fb 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ build: setup.data src/lutilsVersion.ml setup.ml:_oasis oasis setup + setup.data:configure configure: setup.ml ocaml setup.ml -configure --exec-prefix $(BIN_INSTALL) @@ -29,6 +30,7 @@ reinstall: clean: ocaml setup.ml -clean rm setup.data + rm src/lutilsVersion.ml distclean: ocaml setup.ml -distclean @@ -43,5 +45,26 @@ NO_TAGS=gnuplotRif.ml tags: $(OTAGS) -v $(shell ocamlc -where)/*.mli $(shell ls src/*.ml | grep -v $(NO_TAGS)) +############################### +# opam-ing + +NAME=lutils +PACKNAME=$(NAME).$(VERSION) +WWW=/import/www/DIST-TOOLS/SYNCHRONE +HTTP=http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE + +$(PACKNAME).tgz: + git archive --prefix=$(PACKNAME)/ -o $(PACKNAME).tgz HEAD + +$(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz + mv $^ $@ + + +opam : $(WWW)/pool/$(PACKNAME).tgz + cd $(WWW)/opam-repository/packages && \ + oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \ + cd .. ; opam-admin check && opam-admin make -g + + -include ./Makefile.local diff --git a/Makefile.version b/Makefile.version index 27a0c8b7ff5c61c66440a3e6ca8d01d7ee90c66a..28a0a087a9be6c11d0cb727813b6f1c60f59f943 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,16 +1,17 @@ # can oasis do all this stuff? -SHA:=`git log -1 --pretty=format:"%h"` -COMMIT_NB:=`git log --pretty=oneline | wc -l` +SHA:=$(shell git log -1 --pretty=format:"%h") +COMMIT_NB:=$(shell git log --pretty=oneline | wc -l) -VERSION:=1.0.$(COMMIT_NB) +VERSION:=1.$(COMMIT_NB) + del_version: rm -f lutils/src/lutilsVersion.ml -gen_version: del_version src/lutilsVersion.ml +gen_version: del_version src/lutilsVersion.ml src/lutilsVersion.ml: echo "let str=\"$(VERSION)\"" > src/lutilsVersion.ml ; \ diff --git a/_oasis b/_oasis index d5a4710cd1542a19c2625271b0e91264e9d41043..583234f04db75073846952867220ee3ef9ca8cfc 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lutils -Version: 1.0 +Version: 1.4 Authors: Erwan Jahier Maintainers: erwan.jahier@imag.fr License: GPL-3 @@ -36,3 +36,9 @@ Library lutils Modules: RifIO,Data,LocalGenlex,GnuplotRif,Mypervasives,Luciole,LutilsVersion Install: true XMETAEnable: true + +SourceRepository "master" + Type: git + Location: https://forge.imag.fr/anonscm/git/lutils/lutils.git + Branch: master + Browser: https://forge.imag.fr/projects/lutils/ diff --git a/_tags b/_tags index 0cb499a5b86f1ea9350fcde447316b8814b0f4fd..87ca8510d9181e6a8fbf978beea97b21aa104bf5 100644 --- a/_tags +++ b/_tags @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 1fc8fa2a99309239571ced5b0d82b828) +# DO NOT EDIT (digest: 921e300846e9ed7b61c55c01b929ae28) # Ignore VCS directories, you can use the same kind of rule outside # OASIS_START/STOP if you want to exclude directories that contains # useless stuff for the build process @@ -15,16 +15,16 @@ true: annot, bin_annot "_darcs": -traverse "_darcs": not_hygienic # Executable gnuplot-rif -"src/gnuplotrif.native": package(camlp4) -"src/gnuplotrif.native": package(num) -"src/gnuplotrif.native": package(str) -"src/gnuplotrif.native": package(unix) +"src/gnuplotrif.native": pkg_camlp4 +"src/gnuplotrif.native": pkg_num +"src/gnuplotrif.native": pkg_str +"src/gnuplotrif.native": pkg_unix # Library lutils "src/lutils.cmxs": use_lutils -<src/*.ml{,i,y}>: package(camlp4) -<src/*.ml{,i,y}>: package(num) -<src/*.ml{,i,y}>: package(str) -<src/*.ml{,i,y}>: package(unix) +<src/*.ml{,i,y}>: pkg_camlp4 +<src/*.ml{,i,y}>: pkg_num +<src/*.ml{,i,y}>: pkg_str +<src/*.ml{,i,y}>: pkg_unix # OASIS_STOP "src/gnuplotRif.ml": syntax_camlp4o diff --git a/doc/version.tex b/doc/version.tex new file mode 100644 index 0000000000000000000000000000000000000000..d802caf3cd351b71455ca77736f4a4bfb7271ade --- /dev/null +++ b/doc/version.tex @@ -0,0 +1,4 @@ +\newcommand{\version}{1.4} +\newcommand{\sha}{f76bf61} +\newcommand{\versionname}{none} +\newcommand{\versiondate}{28-01-16} diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml deleted file mode 100644 index 0911db945f4c586d57431e5148392c58c0369376..0000000000000000000000000000000000000000 --- a/src/lutilsVersion.ml +++ /dev/null @@ -1,2 +0,0 @@ -let str="1.0.0" -let sha="0"