####################################################################################### # Workflow: # C=make cia ; A=make amend ; U=make uv ; P=make opam-rel # - to make sure the sha and the version are good, one should never # do U and then A. # - to make sure gtit is not confused, one should never do A and the P # # therefore, to avoid such problems, legal trace are defined by this automata: # 0 -C-> 1 # 1 -A-> 1 # 1 -P-> 2 # 2 -U-> 0 # 1 -U-> 0 # to implement such a workflow, C puts a lock (state 1) and U removes it (state 0) ############################### # typical workflow: # uv -> [cia -> amend*]+ -> push -> # wait for gitlab release job -> pull (to get the release tag) # and then; optionnaly, to release an opam version: # opam-rel uv:update_version update_version: git pull rm -f lutin/src/version.ml make lutin/src/version.ml cp _oasis _oasis.save cat _oasis.save | sed "s/^Version:.*/Version: $(VERSION)/" > _oasis rm -f committed git add lutin/src/version.ml _oasis make clean && make cia: test man cia-no-test cia-no-test: test -f committed && \ echo "*** I won't commit!\n*** until you 'make update_version'!" \ || (git commit -a -F log && touch committed) push: opam-test git push amend: test -f committed && git commit -a -F log --amend dif: git --no-pager diff --color-words diff:dodiff echo "il y a $(shell grep "+" diff.diff | wc -l) + et $(shell grep "-" diff.diff | wc -l) -" dodiff: git diff HEAD -w > diff.diff # diff of the lastly commited change cdiff: git diff -w "HEAD^" HEAD > diff.diff ############################### # tags OTAGS=otags # otags don't manage to parse gnuplotRif.ml NO_TAGS=gnuplotRif.ml tags: $(OTAGS) -v $(shell ocamlc -where)/*.mli $(shell ls src/*.ml | grep -v $(NO_TAGS)) ############################### # opam-ing NAME=lutin opam-rel : make-opam-pack $(NAME) opam-test : make-opam-pack $(NAME) -test opam-pr: cp -rf $(OPAM_DIR) /home/jahier/local/opam-repository/packages/lutin/ .PHONY:install $(WWW)/pool/$(PACKNAME).tgz $(WWWTEST)/pool/$(PACKNAME).tgz oi:install or:reinstall ob:build oc:clean clean: ocaml setup.ml -clean rm -f setup.data cd polka; make clean cd lutin-utils/src/ ; make clean