lurette unstable_1_43.4 Mon, 23 Jan 2006 17:59:17 +0100 by jahier

Parent-Version:      unstable_1_43.3
Version-Log:

Ditto.

Project-Description: Lurette

.lurette.prcs_aux

@@ -97,7 +97,7 @@
 (examples/luckyDraw/ocaml/draw-ex.ml 545 1137765987 l/8_draw-ex.ml 1.1)
 (examples/xlurette/heater/buggy_heater_ctrl.lus 219 1137765987 m/10_buggy_heat 1.1)
 (doc/lurette-man/gnuplot-button.jpg 852 1138032075 p/47_gnuplot-bu 1.1)
-(Makefile 174 1138034376 d/13_Makefile 1.5)
+(Makefile 389 1138035557 d/13_Makefile 1.6)
 (xlurette/Scade/Images/lurun.bmp 822 1122044801 i/22_lurun.bmp 1.1)
 (examples/xlurette/heater/temp_float.luc 704 1137765987 m/9_temp_float 1.1)
 (install/pixmaps/config-params.xpm 2753 1137765987 n/12_config-par 1.1)
@@ -225,7 +225,7 @@
 (doc/lucky-man/lucky-syntax.tex 12491 1138032075 p/18_lucky-synt 1.1)
 (i386-linux-gcc3/include/signal4.h 6995 1138025047 o/32_signal4.h 1.1)
 (source/formula_to_bdd.mli 1358 1137765987 g/35_formula_to 1.9)
-(install/configure.in 9359 1137765987 d/11_configure. 1.24)
+(install/configure.in 9351 1138035557 d/11_configure. 1.25)
 (examples/xlurette/Scade-win32/Command.saofd 4147 1137765987 m/1_Command.sa 1.1)
 (examples/xlurette/fault-tolerant-heater/heater_control_env.luc 485 1137765987 h/16_heater_con 1.4)
 (doc/lurette-man/fault-tolerant-tut.tex 15451 1138032075 q/11_fault-tole 1.1)
@@ -360,7 +360,7 @@
 (test/test_losange-10d.lus 108 1065787303 g/41_test_losan 1.1)
 (source/gen_stubs_sildex.ml 9755 1122044801 h/38_gen_stubs_ 1.5)
 (source/gen_stubs_scade.mli 793 1122044801 f/6_gen_stubs_ 1.4)
-(source/Makefile 19362 1138032075 c/20_Makefile 1.44)
+(source/Makefile 19349 1138035557 c/20_Makefile 1.45)
 (examples/xlurette/heater/test1.rif 1074 1137765987 m/20_test1.rif 1.1)
 (examples/xlurette/Scade-win32/Pilot.vsw 431 1137765987 l/44_Pilot.vsw 1.1)
 (doc/lucky-man/call_external_c_code.tex 1677 1138032075 p/28_call_exter 1.1)

Makefile

 
 
-
-install_source:
-	lnsw
+# to run after a checkout in a fresh WS
+source: gen_version
+	./lnsw
 	cd polka; make all ; make install; cd ..
 	cd GBDDML; make all; make cp; cd ..
 	cd source; make install; cp ..
 	cd install; autoconf; cd ..
-	./RUN_ME
\ No newline at end of file
+	./RUN_ME
+
+gen_version:
+	VERSION = $(shell prcs info ../lurette.prj | tail -n 1 | awk '{printf "%s\n", $$2}')
+	rm -f source/version.ml
+	echo "let str=\"$VER\"" > source/version.ml
\ No newline at end of file

install/configure.in

@@ -359,7 +359,7 @@ cp ../utils/luckytolatex $LURETTEPATH/bin/
 mv ./lurettetop.sh $LURETTEPATH/bin/lurettetop
 mv ./xlurette.sh $LURETTEPATH/bin/xlurette
 mv ./gen_stubs.sh $LURETTEPATH/bin/gen_stubs
-cp -rf ./install/pixmaps $PIXMAP_DIR
+cp -rf ./pixmaps $PIXMAP_DIR
 
 
 mv ./set_env_var $LURETTEPATH/bin

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette unstable_1_43 3)
-(Parent-Version lurette unstable_1_43 2)
+(Project-Version lurette unstable_1_43 4)
+(Parent-Version lurette unstable_1_43 3)
 (Version-Log "
 Ditto.
+
 ")
 (New-Version-Log ""
 )
-(Checkin-Time "Mon, 23 Jan 2006 17:39:36 +0100")
+(Checkin-Time "Mon, 23 Jan 2006 17:59:17 +0100")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -123,12 +124,12 @@ Ditto.
 ;; Make files
   (utils/lucky.el (lurette/f/7_lucky.el 1.14 644))
   (install/config.guess (lurette/f/25_config.gue 1.1 755))
-  (install/configure.in (lurette/d/11_configure. 1.24 644))
+  (install/configure.in (lurette/d/11_configure. 1.25 644))
   (Makefile.common.source (lurette/e/33_Makefile.c 1.16 644))
   (OcamlMakefile (lurette/17_OcamlMakef 1.54 644))
   (install/Makefile.lurette.in (lurette/b/38_Makefile.l 1.38 644))
   (user-rules (lurette/c/14_myrules 1.75 644))
-  (Makefile (lurette/d/13_Makefile 1.5 644))
+  (Makefile (lurette/d/13_Makefile 1.6 644))
 
   (source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.9 644))
   (source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.6 644))
@@ -136,7 +137,7 @@ Ditto.
   (source/Makefile.lucky (lurette/b/41_Makefile.i 1.39 644))
   (source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.15 644))
   (source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.36 644))
-  (source/Makefile (lurette/c/20_Makefile 1.44 644))
+  (source/Makefile (lurette/c/20_Makefile 1.45 644))
 
 ;; Documentation
   (doc/Interface_draft (lurette/19_Interface_ 1.1 644))

source/Makefile

@@ -343,7 +343,7 @@ draw-install:
 draw-cp: 
 	cp luckyDraw.top ../$(HOST_TYPE)/bin
 	cp -f luckyDraw.* ../$(HOST_TYPE)/lib 
-	cp -f libluckyDraw*.a  $(HOME)/lurette/$(HOST_TYPE)/lib 
+	cp -f libluckyDraw*.a  ../$(HOST_TYPE)/lib 
 
 draw-all: draw-clean draw draw-top draw-cp draw-install draw-rel
 draw-allw: draw-clean draw  draw-cp draw-tgz