Commit 3d7f852f authored by Erwan Jahier's avatar Erwan Jahier

Issue a 1.54 release.

parent f7ea162e
# well, finally, set it manually...
VERSION:=1.53
VERSION:=1.54
#
# When incrementing that version number, please don't forget to
# fill-in the RELEASE-NOTES file (using the git history).
#
# In order to put it on the web site, from the source dir, do
# $ make install (to update the version number used in -version options of command-line tools)
# $ make test (as usual)
# $ make rel (to build the various tgz)
# $ make test-rel (to test them)
# $ make www (to copy the tgz on the web site)
# $ make verimag (to install that version in /usr/local/tools/lustre-misc/)
#
# Then, once everything is done, tag the current git HEAD:
# $ git tag 1.42
# the sha is still automatic tough!
SHA:=`git log -1 --pretty=format:"%h"`
gen_version:
rm -f source/version.ml
echo "let str=\"$(VERSION)\"" > source/common/version.ml
echo "let sha=\"$(SHA)\"" >> source/common/version.ml
rm -f version.tex
date +VERSION_DATE=%d-%m-%y > version.tex
echo "\\newcommand{\\version}{$(VERSION)}" > doc/version.tex
cd $(LURETTE_PATH) ; \
rm -f source/version.ml ; \
echo "let str=\"$(VERSION)\"" > source/common/version.ml ; \
echo "let sha=\"$(SHA)\"" >> source/common/version.ml ; \
rm -f version.tex ; \
date +VERSION_DATE=%d-%m-%y > version.tex ; \
echo "\\newcommand{\\version}{$(VERSION)}" > doc/version.tex ; \
echo "\\newcommand{\\versiondate}{`date +%d-%m-%y`}" >> doc/version.tex
......@@ -3,6 +3,7 @@
Pré-requis pour les tests de non-regression :
- lus2lic, ocaml* doivent être dans le PATH
- LUSTRE_INSTALL doit être correctement positionné
- HOSTTYPE doit être exporté (export en bash, setenv en csh)
1 - Le clonage
......
V1.54 (05/01/2011)
* A lot of improvements in the Lutin manual
* More Lutin examples
* More Lutin functionalities
- add loop exactly n times construct: now one can write 'loop 42' instead of 'loop [42;42]'
- add support to call lutin program from C, lustre, or luciole
* Automatically choose a node in the Lutin program if -main is not specified
* Fix a bug in the Lutin variable initialisation
V1.53 (18/11/2010)
......
......@@ -68,7 +68,7 @@
\input{macros}
\input{/home/jahier/lurette/version}
\input{/home/jahier/lurette/doc/version}
......
#!/bin/sh
case $HOSTTYPE in
*linux*)
*86*inux*)
if [ "lib" -ef "$HOSTTYPE/lib" ]; then
echo "Je pointe deja vers $HOSTTYPE!"
else
......
......@@ -545,7 +545,7 @@ ifeq ($(HOSTTYPE),cygwin)
LUCKY_DEF=lucky.def
endif
compile_all: $(OBJDIR) lurette_ml_exec libnc lucky ltop show stubs gnuplot-rif gnuplot-socket gen_luc luc2c luc2luciole luc4c libluc4c_nc.a draw-all luc4ocaml-all $(LUCKY_DEF) lutin
compile_all: gen_version $(OBJDIR) lurette_ml_exec libnc lucky ltop show stubs gnuplot-rif gnuplot-socket gen_luc luc2c luc2luciole luc4c libluc4c_nc.a draw-all luc4ocaml-all $(LUCKY_DEF) lutin
rest: luc2luciole luc4c libluc4c_nc.a draw-all luc4ocaml-all $(LUCKY_DEF) lutin
......@@ -573,10 +573,9 @@ clean_exe:
gen_fake_lutin gen_fake_lucky lutin luc2c luc2luciole show_luc *_assert \
liblurette_lib*
clean: $(OBJDIR)
clean: $(OBJDIR) gen_version
rm -rf $(OBJDIR)/*
cp:
[ -d $(PRE_RELEASE_DIR) ] || mkdir $(PRE_RELEASE_DIR) && \
[ -d $(BIN_INSTALL_DIR) ] || mkdir $(BIN_INSTALL_DIR) && \
......
......@@ -132,7 +132,7 @@ lurette-rel: strip
cp -rf $(LURETTE_PATH)/examples/xlurette/heater /tmp/$(LURETTE_RELEASE_NAME)/examples/xlurette
cp -rf $(LURETTE_PATH)/examples/xlurette/Gyro /tmp/$(LURETTE_RELEASE_NAME)/examples/xlurette
cp -rf $(LURETTE_PATH)/examples/xlurette/tram /tmp/$(LURETTE_RELEASE_NAME)/examples/xlurette
cp -rf $(LURETTE_PATH)/examples/xlurette/Sildex /tmp/$(LURETTE_RELEASE_NAME)/examples/xlurette
cp -rf $(LURETTE_PATH)/examples/xlurette/call-luciole /tmp/$(LURETTE_RELEASE_NAME)/examples/xlurette
\
cp -rf $(LURETTE_PATH)/utils /tmp/$(LURETTE_RELEASE_NAME)/
cp $(LURETTE_PATH)/LICENCE /tmp/$(LURETTE_RELEASE_NAME)/
......@@ -372,8 +372,17 @@ ALL_RELEASE_NAME=luretteToolSuite_$(VERSION)_$(HOSTTYPE)+ocaml-$(OCAMLC_RELEASE_
cleanup:
cd .. ; rm -f *~ ; rm -f */*~; rm -f */*/*~; rm -f */*/*/*~; rm -f */*/*/*/*~
update-lutin-man:
cd ../doc/lutin-man ; make
update-lurette-man:
cd ../doc/lurette-man ; make
update-lucky-man:
cd ../doc/lucky-man ; make
rel: lurette-rel lutin-rel draw-rel luc4ocaml-rel luc4c-rel rel_nodep
update-man: update-lutin-man update-lurette-man update-lucky-man
rel: update-man lurette-rel lutin-rel draw-rel luc4ocaml-rel luc4c-rel rel_nodep
rel_nodep:
rm -rf /tmp/$(ALL_RELEASE_NAME)
......@@ -388,6 +397,12 @@ rel_nodep:
cd /tmp && tar cvfz $(ALL_RELEASE_NAME).tgz $(ALL_RELEASE_NAME)
echo "release built. do a 'make test-rel' to copy it on the web site"
# on fait le test depuis le compte synchron, c'est mieux
test-rel-synchrone:
rm -rf /tmp/$(ALL_RELEASE_NAME)
ssh synchron@peouvou 'bash -c "cd ~jahier/lurette/source && make LURETTE_PATH=$(LURETTE_PATH) test-rel"'
test-rel:
export LURETTE_PATH=/tmp/$(ALL_RELEASE_NAME)
cd /tmp && \
......@@ -399,22 +414,24 @@ test-rel:
ranlib lib/*.a && \
./RUN_ME
cd /tmp/$(ALL_RELEASE_NAME)/examples/ && \
cp /tmp/$(ALL_RELEASE_NAME).tgz $(SYNCHRONE_DIR)/lurette/ && \
cp $(LURETTE_PATH)/RELEASE-NOTES $(SYNCHRONE_DIR)/lurette && \
make test && \
echo && \
echo && \
rm -rf /tmp/$(ALL_RELEASE_NAME) && \
echo "test ok; consider issuing a 'make www' and a 'make verimag'"
# Update the web site with the new tgz
www:
cd ~/tools/html/ ; make go
cp $(LURETTE_PATH)/RELEASE-NOTES $(SYNCHRONE_DIR)/lurette && \
cp /tmp/$(ALL_RELEASE_NAME).tgz $(SYNCHRONE_DIR)/lurette/ && \
cp ../doc/lurette-man/lurette-man.pdf $(SYNCHRONE_DIR)/lurette/
cp ../doc/lutin-man/lutin-man.pdf $(SYNCHRONE_DIR)/lurette/
cp ../doc/lucky-man/lucky-man.pdf $(SYNCHRONE_DIR)/lurette/
cp ../RELEASE-NOTES $(SYNCHRONE_DIR)/lurette/
xxx:
echo $(XXX)
#################################################################################################"
......
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