Commit 2b40538c authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.143 Thu, 26 Jun 2003 16:50:35 +0200 by jahier

Parent-Version:      0.142
Version-Log:

share/*.sh.in:
   use set instead of export for sh scripts (export is a bashism
   that does not work for sun).

Project-Description: Lurette
parent 8d11bd37
......@@ -8,7 +8,7 @@
(source/constraint.mli 1601 1045489850 c/18_constraint 1.5)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(TODO 5063 1056616700 d/22_TODO 1.20)
(TODO 4311 1056639035 d/22_TODO 1.21)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/ne.mli 2138 1050421093 c/22_ne.mli 1.6)
(share/config.guess 39153 1055926783 f/25_config.gue 1.1)
......@@ -27,7 +27,7 @@
(test/sparc-scade/libpwlinear.saofdm 1379 1055487917 e/43_libpwlinea 1.1)
(test/cygwin-scade/ConfAnnot.aty 13661 1055926783 g/4_ConfAnnot. 1.1)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(share/lucky_init.sh.in 731 1056374363 e/24_lucky_init 1.8)
(share/lucky_init.sh.in 686 1056639035 e/24_lucky_init 1.9)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(test/test-scade-cygwin.res 0 1055926783 f/28_test-scade 1.1)
(source/gen_stubs_common.ml 6381 1055487917 e/39_gen_stubs_ 1.1)
......@@ -78,7 +78,7 @@
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(test/cygwin-scade/det_mvt_mode_env.lut 333 1055926783 f/32_det_mvt_mo 1.1)
(ihm/xlurette/xlurette.glade 91651 1055926783 c/13_xlurette.g 1.18)
(ihm/xlurette/xlurette.glade 91888 1056639035 c/13_xlurette.g 1.19)
(test/cygwin-scade/MODULE.saofd 3026 1055926783 f/45_MODULE.sao 1.1)
(test/cygwin-scade/Command.saofd 4147 1055926783 g/6_Command.sa 1.1)
(test/cygwin-scade/lib_pilot.err 119 1055926783 f/49_lib_pilot. 1.1)
......@@ -117,7 +117,7 @@
(source/call_lurette_main.c 322 1050421093 e/28_call_luret 1.1)
(polka/C/vector.c 13780 1047029868 e/3_vector.c 1.1)
(test/sparc-scade/Direction_D1.saofd 1335 1055487917 e/51_Direction_ 1.1)
(share/Makefile.test 2040 1056616700 c/25_user-rules 1.7)
(share/Makefile.test 2072 1056639035 c/25_user-rules 1.8)
(source/Makefile.lurette_lib 2392 1053337243 c/2_Makefile.l 1.20)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(mlcuddidl/bdd.idl 18233 1034006019 d/7_bdd.idl 1.1)
......@@ -188,7 +188,7 @@
(test/cygwin-scade/MyConsts.saofd 153 1055926783 f/44_MyConsts.s 1.1)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 24712 1056616700 c/14_myrules 1.39)
(user-rules 24657 1056639035 c/14_myrules 1.40)
(mlcuddidl/cudd_caml.c 22890 1034006019 d/3_cudd_caml. 1.1)
(polka/C/config.h 77 1047029868 e/13_config.h 1.1)
(test/usager.luc 508 1046682069 b/14_usager.env 1.11)
......
......@@ -67,12 +67,9 @@ Les transitions :
(2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
a lurettetop et xlurette...)
* rajouter une option qui dit si les formules doivent etre tronquees
dans show_luc
* La notion d'epaisseur est mal branlée, surtout en presence de var
numériques. Il faudrait un 3eme parametre sui dit le nombre
numériques. Il faudrait un 3eme parametre qui dit le nombre
de tirage que l'on fait dans chaque polyedres.
-> remplacer l'epaisseur de formules par un taux de couverture
......@@ -99,7 +96,7 @@ Les transitions :
dans des cas ou les polyedres peteraient...
* zipper et dezipper les .rif a la vollée (cf zlib)
* zipper et dezipper les .rif a la vollée (cf zlib et camlzip)
* giro :
-> Il faudrait rajouter la possibilité de faire, par ex, des
......@@ -116,7 +113,6 @@ Les transitions :
* autoconf :
-> tester si gtk est la
* Chercher a detecter des egalites lors de l'ajout d'une inegalité.
(cf code commenté dans store.ml)
......@@ -144,17 +140,6 @@ Les transitions :
pourquoi (cf version 0.68). D'une maniere générale, Graph.t est elle
vraiment la bonne structure de donnees pour les sous-graphes ?
* Profiler, profiler, profiler, ...
o En particulier, verifier que ca ne se casse pas la gueule avec
un grand nombre de variables, ou bien avec de tres grosses
formules.
o Faire un passage sur le code pour voir si je n'aurais pas
du utiliser Map plutot que Hashtbl a un certain nombre
d'endroits...
o Utiliser une table de hash pour env_state.pre, ou bien
alors separer les entiers, les reels et les booleans. Parce
que, tel quel, la recherche des pre peut couter bien cher
avec beucoup de variables...
*********** A faire
......@@ -174,8 +159,6 @@ Les transitions :
meme dimension que le polyhedre (quitte à faire un changement de
variable) puis tirer dans le cube enveloppant.
* Faire un passage pour rendre tail recursive les fonctions qui le méritent.
* dans gne.ml, rajouter partout assertion <<is_a_partition>>
......
......@@ -1996,7 +1996,7 @@ scade
<handler>on_sim2chro_clicked</handler>
<last_modification_time>Fri, 11 Apr 2003 09:36:37 GMT</last_modification_time>
</signal>
<label>sim2chro</label>
<label>View with sim2chro</label>
<icon>chrono.xpm</icon>
</widget>
......@@ -2013,7 +2013,7 @@ scade
<handler>gnuplot_rif</handler>
<last_modification_time>Mon, 19 May 2003 12:30:08 GMT</last_modification_time>
</signal>
<label>gnuplot </label>
<label>View with gnuplot </label>
<icon>gnuplot-rif.xpm</icon>
</widget>
......@@ -2031,6 +2031,15 @@ scade
<label>Delete</label>
<icon>quit.xpm</icon>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>edit_rif</name>
<border_width>4</border_width>
<label>Edit </label>
<icon>open.xpm</icon>
</widget>
</widget>
<widget>
......@@ -2846,32 +2855,6 @@ Do you really want to quit xlurette?
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>extra_cfiles_entry</name>
<width>400</width>
<tooltip>Set the EXTRA_CFILES environment variable. May be necessary if the sut or the oracle uses external C files </tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>extra_libs_entry</name>
......@@ -3114,6 +3097,32 @@ Do you really want to quit xlurette?
<icon>open.xpm</icon>
</widget>
</widget>
<widget>
<class>GtkEntry</class>
<name>extra_cfiles_entry</name>
<width>400</width>
<tooltip>Set the EXTRA_CFILES environment variable. May be necessary if the sut or the oracle uses external C files </tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
</widget>
<widget>
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 142)
(Parent-Version lurette 0 141)
(Project-Version lurette 0 143)
(Parent-Version lurette 0 142)
(Version-Log "
source/show_luc.ml:
source/show_env.ml:
Add a command line option to set the max nb of char before
truncate formula.
share/*.sh.in:
use set instead of export for sh scripts (export is a bashism
that does not work for sun).
")
(New-Version-Log ""
)
(Checkin-Time "Thu, 26 Jun 2003 11:17:53 +0200")
(Checkin-Time "Thu, 26 Jun 2003 16:50:35 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -151,8 +149,8 @@ source/show_env.ml:
(Makefile.common.source (lurette/e/33_Makefile.c 1.5 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.51 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.26 644))
(user-rules (lurette/c/14_myrules 1.39 644))
(share/Makefile.test (lurette/c/25_user-rules 1.7 644))
(user-rules (lurette/c/14_myrules 1.40 644))
(share/Makefile.test (lurette/c/25_user-rules 1.8 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.3 644))
......@@ -176,9 +174,9 @@ source/show_env.ml:
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.2 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.20 644))
(TODO (lurette/d/22_TODO 1.21 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.6 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.8 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.9 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.2 744))
(share/plot (lurette/e/35_plot 1.3 744))
......@@ -281,7 +279,7 @@ source/show_env.ml:
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.24 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.18 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.19 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.17 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.16 644))
......
#
-include ../share/lucky_init.sh
# Non regression test
......
......@@ -3,26 +3,26 @@
# (sh syntax)
export LURETTE_PATH=@LURETTEPATH@
export PIXMAP_DIR=@PIXMAP_DIR@
set LURETTE_PATH=@LURETTEPATH@
set PIXMAP_DIR=@PIXMAP_DIR@
export path=@LURETTEPATH@/@HOST_TYPE@/bin:$path
export PATH=@LURETTEPATH@/@HOST_TYPE@/bin:$PATH
set path=@LURETTEPATH@/@HOST_TYPE@/bin:$path
set PATH=@LURETTEPATH@/@HOST_TYPE@/bin:$PATH
export PS_VIEWER=@GV@
export DOT=@LURETTEPATH@/@HOST_TYPE@/bin/dot
export LUS2EC=@LUS2EC@
export EC2C=@EC2C@
export SIM2CHRO=@LURETTEPATH@/@HOST_TYPE@/bin/sim2chrogtk
export HOST_TYPE=@HOST_TYPE@
set PS_VIEWER=@GV@
set DOT=@LURETTEPATH@/@HOST_TYPE@/bin/dot
set LUS2EC=@LUS2EC@
set EC2C=@EC2C@
set SIM2CHRO=@LURETTEPATH@/@HOST_TYPE@/bin/sim2chrogtk
set HOST_TYPE=@HOST_TYPE@
# scade
export SCADE2LUSTRE=@SCADE2LUSTRE@
export SCADE_CG=@SCADE_CG@
export LUSTRE2C=@LUSTRE2C@
export SCADE_INSTALL_DIR=@SCADE_INSTALL_DIR@
set SCADE2LUSTRE=@SCADE2LUSTRE@
set SCADE_CG=@SCADE_CG@
set LUSTRE2C=@LUSTRE2C@
set SCADE_INSTALL_DIR=@SCADE_INSTALL_DIR@
export SCADE_COMPIL_OPTION=" -noexp @ALL@ "
set SCADE_COMPIL_OPTION=" -noexp @ALL@ "
# Other options migth also work.
# e.g., " -exp @ALL@ " also works, but not " -blockexp "
......@@ -567,12 +567,13 @@ test-bin-release:
LUSTRE_MISC=/usr/local/tools/lustre-misc
install-misc:
cd $(LUSTRE_MISC); \
rm -rf lurette-*; \
rm -rf lurette; \
cp $(HOME)/lurette/test/luretteV2-$(HOST_TYPE)-$(VERSION).tgz . ; \
tar xvfz luretteV2-$(HOST_TYPE)-$(VERSION).tgz ;\
cd lurette-$(HOST_TYPE)-$(VERSION)/share ; \
./configure --prefix $(LUSTRE_MISC)/lurette-$(HOST_TYPE)-$(VERSION) ; cd ..;\
cp -f $(LUSTRE_MISC)/lurette-$(HOST_TYPE)-$(VERSION)/$(HOST_TYPE)/lucky_init.* ../init
rm luretteV2-$(HOST_TYPE)-$(VERSION).tgz ;\
mv lurette-$(HOST_TYPE)-$(VERSION) lurette; \
cd lurette/share ; \
./configure --prefix $(LUSTRE_MISC)/lurette
conf:
cd $(HOME)/lurette ; autoconf; \
......
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