lurette unstable.5 Mon, 03 Dec 2007 17:43:18 +0100 by jahier

Parent-Version:      unstable.4
Version-Log:         empty
Project-Description: Lurette

examples/Makefile

@@ -15,10 +15,10 @@ test:
 	cd lucky/C && make test ;
 	cd lucky/lustre && make test ;
 ifneq ($(HOST_TYPE),mac)
-	cd xlurette/Sildex/ && make test ;
+#	cd xlurette/Sildex/ && make test ;
 	cd ocaml/crazy-rabbit/ && make test ;
 endif
-#	cd rml/ && make test ;
+	cd rml/ && make test ;
 ifeq ($(HOST_TYPE),sparc-sun)
 	cd xlurette/Scade-sparc && make test ;
 else 

examples/lucky/C/Makefile

@@ -16,12 +16,22 @@ endif
 ifeq ($(HOST_TYPE),win32)
   EXE=.exe
   CFLAGS = \
-    -L../../../win32/lib -L/cygdrive/c/TEMP/MinGW/lib \
-    -I../../../win32/include \
+    -L../../../lib  \
+    -I../../../include \
     -Winline -Wimplicit-function-declaration 
 
-  LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ 
-  LUC2C=../../../win32/bin/luc2c$(EXE) 
+  LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ -mno-cygwin -lole32 
+  LUC2C=../../../bin/luc2c$(EXE) 
+endif
+ifeq ($(HOST_TYPE),cygwin)
+  EXE=.exe
+  CFLAGS = \
+    -L../../../lib  \
+    -I../../../include \
+    -Winline -Wimplicit-function-declaration 
+
+  LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
+  LUC2C=../../../bin/luc2c$(EXE) 
 endif
 
 
@@ -37,7 +47,7 @@ foo.o : foo.c
 call_foo.o: call_foo.c
 	$(CC) -c $(CFLAGS) call_foo.c
 
-foo: foo.o call_foo.o 
+foo$(EXE): foo.o call_foo.o 
 	$(LINKER) $(CFLAGS) -o $@ $^  $(LIBS) 
 
 

examples/lucky/external_code/Makefile

@@ -19,6 +19,7 @@ MKDLLFLAGS=
 LFLAGS=
 SOFLAGS=-shared
 
+
 #settings for WIN32
 ifeq ($(HOSTTYPE),win32)
 	DLEXT=dll
@@ -27,13 +28,23 @@ ifeq ($(HOSTTYPE),win32)
 	CC=gcc -DWIN32 -mno-cygwin
 	MKDLLFLAGS=-Wl,--out-implib,$(OBJDIR)/$(MAIN).a
 	LFLAGS=-lm
-else
+	LD_ARCH=-DWIN32
+endif
+ifeq ($(HOSTTYPE),cygwin)
+	DLEXT=dll
+	EXE=.exe
+	LD=gcc -DWIN32 
+	CC=gcc -DWIN32 
+	MKDLLFLAGS=-Wl,--out-implib,$(OBJDIR)/$(MAIN).a
+	LFLAGS=-lm
+	LD_ARCH=-DWIN32
+endif
+
 ifeq ($(HOSTTYPE),mac)
 	LD=g++
 	CC=gcc
 	SOFLAGS = -dynamiclib 
-	LDMAC=-DMAC
-endif
+	LD_ARCH=-DMAC
 endif
 
 all: $(OBJDIR)/$(MAIN).$(DLEXT) 
@@ -51,7 +62,7 @@ $(OBJDIR)/%.o : $(OBJDIR) $(SRCDIR)/%.c
 
 
 call_external_c_code.luc_pp:call_external_c_code.luc
-	../../../bin/lucky_cpp call_external_c_code.luc call_external_c_code.luc_pp $(LDMAC)
+	../../../bin/lucky_cpp call_external_c_code.luc call_external_c_code.luc_pp $(LD_ARCH)
 
 test: clean $(OBJDIR)/$(MAIN).$(DLEXT) call_external_c_code.luc_pp
 	rm -f test.rif0 && \

examples/lucky/external_code/call_external_c_code.luc

@@ -3,12 +3,18 @@
 --
 
 libraries {
-	foo_lib  = "./obj/foo.so";
 #ifdef MAC
+	foo_lib  = "./obj/foo.so";
 	math_lib = "libm.dylib" -- the standard C math lib (which path ougth to be in LD_LIBRARY_PATH)
 #else
+#ifdef WIN32
+	foo_lib  = "./obj/foo.dll";
+	math_lib = "libm.dll"
+#else
+	foo_lib  = "./obj/foo.so";
 	math_lib = "libm.so"
 #endif
+#endif
 }
 
 functions { 

examples/lucky/external_code/foo.c

@@ -18,3 +18,11 @@ EXPORT int rand_up_to(int min, int max){
 }
 
 
+EXPORT double msin(double x){ 
+  double res =  sin(x);
+    return res;
+};
+EXPORT double msqrt(double x) {
+  double res = sqrt(x);
+  return res ;
+};

examples/lucky/lustre/Makefile

@@ -12,12 +12,12 @@ LUC2C=../../../bin/luc2c
 ifeq ($(HOST_TYPE),win32)
   EXE=.exe
   CFLAGS = \
-    -L../../../win32/lib -L/cygdrive/c/TEMP/MinGW/lib \
-    -I../../../win32/include \
+    -L../../../lib -L/cygdrive/c/TEMP/MinGW/lib \
+    -I../../../include \
     -Winline -Wimplicit-function-declaration 
 
   LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ 
-  LUC2C=../../../win32/bin/luc2c$(EXE) 
+  LUC2C=../../../bin/luc2c$(EXE) 
 endif
 ifeq ($(HOST_TYPE),mac)
 	LD = g++ -g

examples/luckyDraw/c/Makefile

@@ -7,7 +7,7 @@ SRCDIR = $(shell pwd)
 # Installation directory prefix
 
 # XXX MODIFY IT IF NECESSARY !!!
-PREFIX =$(HOME)/lurette
+PREFIX =$(LURETTE_PATH)
 
 
 # XXX MODIFY IT IF NECESSARY !!!

examples/luckyDraw/ocaml/draw-ex.out

-x=11.7731842666 
-x=15.3993812792 
-x=11.6380492025 
-x=15.3806604998 
-x=17.4647998347 
-x=13.1055982531 
-x=14.4938445659 
-x=14.9698077408 
-x=19.694944039 
-x=13.6712249348 
-x=10.4404320878 
-x=17.078487968 
-x=19.5687136629 
-x=17.5594509133 
-x=18.1920006604 
-x=11.7047030534 
-x=11.5249154524 
-x=18.2803503743 
-x=16.9628921217 
-x=16.6986337542 
-x=10.01 
-x=10.01 
-Z=9411 z=-60 y=50 x=60 
-Z=6254 z=99 y=99 x=-148 
-Z=-10000 y=99 z=99 x=-148 
-Z=-10000 y=99 z=99 x=-148 
-Z=t y=f x=f 
+x=11.7731842666 
+x=15.3993812792 
+x=11.6380492025 
+x=15.3806604998 
+x=17.4647998347 
+x=13.1055982531 
+x=14.4938445659 
+x=14.9698077408 
+x=19.694944039 
+x=13.6712249348 
+x=10.4404320878 
+x=17.078487968 
+x=19.5687136629 
+x=17.5594509133 
+x=18.1920006604 
+x=11.7047030534 
+x=11.5249154524 
+x=18.2803503743 
+x=16.9628921217 
+x=16.6986337542 
+x=10.01 
+x=10.01 
+Z=9411 z=-60 y=50 x=60 
+Z=6254 z=99 y=99 x=-148 
+Z=-10000 y=99 z=99 x=-148 
+Z=-10000 y=99 z=99 x=-148 
+Z=t y=f x=f 

examples/ocaml/crazy-rabbit/Makefile

@@ -2,7 +2,7 @@
 
 CMXA_LIB = unix.cmxa  str.cmxa bdd.cmxa polka.cmxa luc4ocaml.cmxa 
 CMA_LIB=luc4ocaml.cma
-LUC4OCAML_INSTALL_DIR = -I ../../lib
+LUC4OCAML_INSTALL_DIR = -I ../../../lib
 # LUC4OCAML_INSTALL_DIR = -I +lucky
 
 LUCKY=../../../bin/lucky
@@ -12,6 +12,18 @@ MAIN=rabbit
 
 
 
+ifeq ($(HOSTTYPE),win32)
+	LD_ARCH=-DWIN32
+endif
+ifeq ($(HOSTTYPE),cygwin)
+	LD_ARCH=-DWIN32
+endif
+ifeq ($(HOSTTYPE),mac)
+	LD_ARCH=-DMAC
+endif
+
+
+
 $(MAIN).opt:$(MAIN).ml
 	ocamlopt.opt -cc g++ -cclib -lgmp $(LUC4OCAML_INSTALL_DIR) graphics.cmxa $(CMXA_LIB)  $(MAIN).ml -o $(MAIN).opt
 
@@ -61,7 +73,7 @@ utest:
 #
 # one can use unixisms to compose lucky programs ...
 rif:rabbit-speed.luc
-	rm -f speed.rif; $(LUCKY) -l 2000 -pp $(LUCKY)_cpp rabbit-speed.luc | \
+	rm -f speed.rif; $(LUCKY) -l 2000 -pp $(LUCKY)_cpp rabbit-speed.luc $(LD_ARCH) | \
 		grep outs | cut -d ' ' -f 2 | awk '{print $$1 " 0.0 500.0 0.0 500.0"}' | \
 		$(LUCKY) rabbit-dir.luc > speed.rif
 

examples/ocaml/crazy-rabbit/rabbit-dir-obstacle.luc

 
 
 libraries {
+#ifdef MAC
+	math_lib = "libm.dylib"
+#else
+#ifdef WIN32
+	math_lib = "libm.dll"
+#else
 	math_lib = "libm.so"
+#endif
+#endif
 }
 
+
 functions { 
 	sin : float -> float : math_lib;
 	cos : float -> float : math_lib

examples/ocaml/crazy-rabbit/rabbit.ml

@@ -177,7 +177,7 @@ let launch_demo () =
     ( 
       main_loop  
 	(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"]) 
-	(Luc4ocaml.make ["rabbit-dir-line.luc"]) 
+	(Luc4ocaml.make ~pp:"lucky_cpp"  ["rabbit-dir-line.luc"]) 
 	i
 	"0.0"; 
       ignore (Graphics.read_key ())
@@ -192,7 +192,7 @@ let launch_demo () =
     ( 
       main_loop  
 	(Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"]) 
-	(Luc4ocaml.make ["rabbit-dir-line.luc"]) 
+	(Luc4ocaml.make ~pp:"lucky_cpp"  ["rabbit-dir-line.luc"]) 
 	i
 	delay; 
       ignore (Graphics.read_key ())
@@ -207,7 +207,7 @@ let launch_demo () =
     (
       main_loop
        (Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"]) 
-       (Luc4ocaml.make ["rabbit-dir.luc"]) 
+       (Luc4ocaml.make ~pp:"lucky_cpp"  ["rabbit-dir.luc"]) 
        i
        "0.0"; 
       ignore (Graphics.read_key ())
@@ -222,8 +222,8 @@ let launch_demo () =
     (
       main_loop_obstacle
        (Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"]) 
-       (Luc4ocaml.make ["rabbit-dir-obstacle.luc"]) 
-       (Luc4ocaml.make ["obstacle.luc"]) 
+       (Luc4ocaml.make ~pp:"lucky_cpp"  ["rabbit-dir-obstacle.luc"]) 
+       (Luc4ocaml.make  ~pp:"lucky_cpp" ["obstacle.luc"]) 
        i
        "0.0";
       ignore (Graphics.read_key ())
@@ -238,7 +238,7 @@ let launch_demo () =
     (
       main_loop_obstacle
        (Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"]) 
-       (Luc4ocaml.make ["rabbit-dir-obstacle.luc"]) 
+       (Luc4ocaml.make ~pp:"lucky_cpp"  ["rabbit-dir-obstacle.luc"]) 
        (Luc4ocaml.make ~pp:"lucky_cpp" ["moving-obstacle.luc"]) 
        (i*10)
        "0.0"; 
@@ -254,7 +254,7 @@ let launch_demo () =
     (
       main_loop_obstacle
        (Luc4ocaml.make ~pp:"lucky_cpp" ["rabbit-speed.luc"]) 
-       (Luc4ocaml.make ["rabbit-dir-obstacle.luc"]) 
+       (Luc4ocaml.make ~pp:"lucky_cpp"  ["rabbit-dir-obstacle.luc"]) 
        (Luc4ocaml.make ~pp:"lucky_cpp" ["moving-obstacle3.luc"]) 
        (i*10)
        "0.0"; 
@@ -272,7 +272,7 @@ let _ =
 
       main_loop_obstacle
 	(Luc4ocaml.make ~seed:1 ~pp:"lucky_cpp" ["rabbit-speed.luc"]) 
-	(Luc4ocaml.make ~seed:1 ["rabbit-dir-obstacle.luc"]) 
+	(Luc4ocaml.make ~seed:1  ~pp:"lucky_cpp" ["rabbit-dir-obstacle.luc"]) 
 	(Luc4ocaml.make ~seed:1 ~pp:"lucky_cpp"  ["moving-obstacle3.luc"]) 
 	(int_of_string Sys.argv.(1))
 	Sys.argv.(2);

examples/rml/Makefile

@@ -11,7 +11,7 @@ window.ml: window.rml
 
 window: window.ml 
 	$(OCAMLC) -o window \
-		-I `$(RMLC) -where` -I +lucky -I ../lib \
+		-I `$(RMLC) -where` -I ../lib \
 		luc4ocaml.cma rml_interpreter.cma \
 		window.ml 
 

examples/rml/window.rml

@@ -16,7 +16,7 @@ let process outside t =
   end
 
 
-external.luc env {T:float; On: event} {t: float} = ["window.luc"]
+external.luc env {T:float; On:event} {t: float} = ["window.luc"]
 
 
 let cpt = ref 0

examples/xlurette/Sildex/Makefile

 
-LURETTETOP=../../bin/lurettetop -go -seed 1 --precision 2 
+LURETTETOP=../../../bin/lurettetop -go -seed 1 --precision 2 
 
 
 test:

examples/xlurette/fault-tolerant-heater/Makefile

 
-LURETTETOP=../../bin/lurettetop -go  --precision 2 --sut heater_control.lus \
+LTOP=../../../bin/lurettetop
+LURETTETOP=$(LTOP)  -go --precision 2 --sut heater_control.lus \
 	  --main-sut-node heater_control --oracle heater_control.lus \
 	  --main-oracle-node not_a_sauna --sut-compiler verimag \
 	  --oracle-compiler verimag --test-length 500 --thick-draw 1 \

examples/xlurette/fault-tolerant-heater/sensors.luc

-
+	
 
 -- Simulate perfect sensors that never get  worn
 inputs { Heat_on : bool }

examples/xlurette/tram/Makefile

 
-LURETTETOP=../../bin/lurettetop
+LURETTETOP=../../../bin/lurettetop
 
 CC=g++
 

install/configure.in

@@ -30,7 +30,7 @@ case `./config.guess` in
 		HOST_TYPE=i386-linux ;;
 	    esac;;
     sparc-sun-solaris2.*)	HOST_TYPE=sparc-sun  ;;
-    i*86-*-cygwin)      	HOST_TYPE=win32  ;;
+    i*86-*-cygwin)      	HOST_TYPE=cygwin  ;;
     i*86-apple*)      		HOST_TYPE=mac  ;;
     *)	AC_MSG_ERROR(Unsupported architecture);;
 esac
@@ -171,7 +171,7 @@ AC_SUBST(EC2C)
 # Scade tools
 
 case "$HOST_TYPE" in
-    win32)
+    win32|cygwin)
 
 	AC_CHECK_PROG(SCADE2LUSTREBIN,SCADE2LUSTRE.EXE,SCADE2LUSTRE.EXE,no)
 	if test "$SCADE2LUSTREBIN" = no ; then
@@ -231,6 +231,22 @@ AC_SUBST(SCADE_CG)
 AC_SUBST(SCADE_INSTALL_DIR)
 
 
+#-----------------------------------------------------------------------------#
+# test whether socket works
+
+AC_CHECK_FUNC(socket, :, [      
+  dnl hopefully we wont include too many libraries
+          AC_CHECK_LIB(socket, main)
+          AC_CHECK_LIB(net, main)
+          AC_CHECK_LIB(nsl_s, main)
+          AC_CHECK_LIB(nsl, main)
+          AC_CHECK_LIB(inet, socket)
+          AC_CHECK_LIB(gen, main)
+  ])
+
+  
+#AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
+# AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
 
 #-----------------------------------------------------------------------------#
 
@@ -341,6 +357,13 @@ AC_OUTPUT(Makefile.lurette set_env_var  xlurette.sh lurettetop.sh  gen_stubs.sh)
 
 # if the user ask to install files in a other place.
 
+[ test -d $LURETTEPATH/bin/ ] || (echo "Creating $LURETTEPATH/bin/..." && mkdir $LURETTEPATH/bin)
+[ test -d $LURETTEPATH/bin/pixmaps ] || (echo "Creating $LURETTEPATH/bin/pixmaps..." && mkdir $LURETTEPATH/bin/pixmaps)
+[ test -d $LURETTEPATH/lib/ ] || (echo "Creating $LURETTEPATH/lib/..." && mkdir $LURETTEPATH/lib)
+[ test -d $LURETTEPATH/include/ ] || (echo "Creating $LURETTEPATH/include/..." && mkdir $LURETTEPATH/include )
+
+
+
 install -D -v ../bin/* "$LURETTEPATH/bin/"
 install -D -v ../lib/* "$LURETTEPATH/lib/"
 install -D -v ../include/* "$LURETTEPATH/include/"
@@ -353,7 +376,7 @@ ln -s -v "$LURETTEPATH/include" ../examples/
 install ./Makefile.lurette "$LURETTEPATH/lib/Makefile.lurette"
 
 case "$HOST_TYPE" in
-    win32)
+    win32|cygwin)
         AC_OUTPUT(gen_stubs.bat lurettetop.bat xlurette.bat set_env_var.bat)
 	install ./lurettetop.bat "$LURETTEPATH/bin"
 	install ./xlurette.bat "$LURETTEPATH/bin"
@@ -366,10 +389,10 @@ install ../utils/getsaonodes "$LURETTEPATH/bin/"
 install ../utils/lucky_cpp "$LURETTEPATH/bin/"
 install ../utils/luckytolatex "$LURETTEPATH/bin/"
 
-install -m ug+x,ug+r,u+w ./lurettetop.sh "$LURETTEPATH/bin/lurettetop"
-install -m ug+x,ug+r,u+w ./xlurette.sh "$LURETTEPATH/bin/xlurette"
-install -m ug+x,ug+r,u+w ./gen_stubs.sh "$LURETTEPATH/bin/gen_stubs"
-install -D -d ./pixmaps "$PIXMAP_DIR"
+install -m a+x,a+r,u+w ./lurettetop.sh "$LURETTEPATH/bin/lurettetop"
+install -m a+x,a+r,u+w ./xlurette.sh "$LURETTEPATH/bin/xlurette"
+install -m a+x,a+r,u+w ./gen_stubs.sh "$LURETTEPATH/bin/gen_stubs"
+install -D -v ./pixmaps/* "$PIXMAP_DIR"
 
 
 install ./set_env_var "$LURETTEPATH/bin"
@@ -385,7 +408,7 @@ echo
 
 echo " You can put the following lines in your .emacs file:"
 
-echo "    (setq load-path (cons (expand-file-name \"$LURETTEPATH\"/utils) load-path))"
+echo "    (setq load-path (cons (expand-file-name \"$LURETTEPATH/utils\") load-path))"
 echo "    (setq auto-mode-alist (cons '(\"\\\\.luc$\"  . lucky-mode) auto-mode-alist))"
 echo "    (setq auto-mode-alist (cons '(\"\\\\.rif$\"  . rif-mode)   auto-mode-alist))"
 echo "    (autoload 'lucky-mode \"lucky\" \"Major mode for editing Lucky code\" t)"

install/set_env_var.in

@@ -9,7 +9,7 @@ if test -z "$PIXMAP_DIR" ; then
   export PIXMAP_DIR
 fi
 
-path="@LURETTEPATH@/bin":$path
+path=("@LURETTEPATH@/bin":$path)
 export path
 
 LD_LIBRARY_PATH="@LURETTEPATH@/lib":$LD_LIBRARY_PATH

lnsw

 #!/bin/sh
 
-case `uname -a` in
-    Linux*)
+case $HOSTTYPE in
+    *linux*)
 	if [ "lib" -ef "i386-linux-gcc3/lib" ]; then	 
 	    echo "Je pointe deja vers linux gcc3!"
 	else
@@ -20,7 +20,7 @@ case `uname -a` in
 	    ln -s ../i386-linux-gcc3/include ./examples/include
 	fi
 	;;
-    Darwin*)
+    mac)
 	if [ "lib" -ef "mac/lib" ]; then	 
 	    echo "Je pointe deja vers mac!"
 	else
@@ -39,7 +39,7 @@ case `uname -a` in
 	    ln -s ./mac/include ./examples/include
 	fi
 	;;
-    SunOS*)
+    sparc-sun)
 	    echo "Je fais pointer lib/bin/include vers sparc-sun"
 	    rm -f ./lib
 	    rm -f ./bin
@@ -54,7 +54,7 @@ case `uname -a` in
 	    ln -s ./sparc-sun/bin ./bin
 	    ln -s ./sparc-sun/include ./include
 	;;
-    CYGWIN*)
+    win32)
 	if [ "lib" -ef "win32/lib" ]; then	 
 	    echo "Je pointe deja vers win32 !"
 	else
@@ -77,4 +77,27 @@ case `uname -a` in
 	fi
 	echo "win32"
 	;;
+    cygwin)
+	if [ "lib" -ef "cygwin/lib" ]; then	 
+	    echo "Je pointe deja vers cygwin !"
+	else
+	    echo "Je fais pointer lib, bin, et include vers cygwin"
+	    echo "rm -f ./lib"
+	    rm -f ./lib
+	    rm -f ./bin
+	    rm -f ./include
+	    echo "ln -s ./cygwin/lib ./lib"
+	    ln -s ./cygwin/lib ./lib
+	    ln -s ./cygwin/bin ./bin
+	    ln -s ./cygwin/include ./include
+	    rm -f ./examples/lib
+	    rm -f ./examples/bin
+	    rm -f ./examples/include
+	    echo "ln -s ./cygwin/lib ./examples/lib"
+	    ln -s ./cygwin/lib ./examples/lib
+	    ln -s ./cygwin/bin ./examples/bin
+	    ln -s ./cygwin/include ./examples/include
+	fi
+	echo "cygwin"
+	;;
 esac

polka/Makefile

@@ -69,3 +69,5 @@ DISTCAML=Makefile \
 DIST=Changes Makefile Makefile.config README $(DISTDOC:%=documentation/%) $(DISTC:%=C/%) $(DISTCAML:%=caml/%) 
 dist: $(DIST)
 	(cd ..; tar zcvf $(HOME)/polka.tgz $(DIST:%=polka/%))
+
+

polka/Makefile.config

@@ -10,23 +10,23 @@
 #CAMLIDL_INSTALL = $(HOME)/$(HOSTTYPE)
 #GMP_INSTALL=$(HOME)/$(HOSTTYPE)
 
-ifeq ($(HOST_TYPE),win32)
-
-#	CAMLIDL_INSTALL = c:\TEMP\ocaml\lib\caml
-# 	CAML_INSTALL = c:\\TEMP\\ocaml\\lib
-# 	CAMLIDL_INSTALL = c:\\TEMP\\ocaml\\lib\\caml
+OCAMLLIB=($shell ocamlc -where)
+OCAMLC=($shell which ocamlc)
+OCAML_BINDIR=($shell dirname $(OCAMLC))
 
+ifeq ($(HOST_TYPE),win32)
 	GMP_INSTALL=/cygdrive/c/lurette/$(HOSTTYPE)
 	CC = gcc -mno-cygwin
-
+else
+ifeq ($(HOST_TYPE),cygwin)
+	GMP_INSTALL=/cygdrive/c/lurette/$(HOSTTYPE)
+	CC = gcc
 else
 ifeq ($(HOST_TYPE),sparc-sun)
-	CC = gcc -I /usr/local/soft/ocaml/3.08/lib/ocaml
+	CC = gcc -I$(OCAMLLIB)
 	GMP_INSTALL=$(HOME)/$(HOSTTYPE)
 else
 ifeq ($(HOST_TYPE),mac)
-	OCAMLDIR=/private/var/automount/import/macos/ocaml/3.09.3/
-	OCAMLLIB=$(OCAMLDIR)
 	CC = gcc
 	CC = gcc -I$(OCAMLLIB)  -L $(OCAMLLIB)
 	GMP_INSTALL=/sw
@@ -36,10 +36,12 @@ else
 endif
 endif
 endif
+endif
 
-CURDIR = $(shell pwd)
 
 
+CURDIR = $(shell pwd)
+
 PREFIX = $(POLKA_INSTALL)
 # C include and lib directories
 INCDIR = $(CURDIR)/../../$(HOSTTYPE)/include

source/Makefile

@@ -17,6 +17,7 @@ LIB_INSTALL_DIR = ../$(HOST_TYPE)/lib
 INC_INSTALL_DIR = ../$(HOST_TYPE)/include
 
 
+.PHONY:luc2c
 
 # C'est le meme que le liblurette_nc, mais sans libasmrun car il est
 # destin a etre appelle depuis ocaml uniquement.
@@ -55,10 +56,10 @@ liblurette_nc.a: ocaml2c_stubs.o lurette_exe.o call_lurette_main.o lurette_lib.o
 	ar q liblurette_nc.a *.o  && rm *.o  &&\
 	cp  liblurette_nc.a .. 
 
-libluc4c_nc.a: luc4c_lib.o$(EXE) luc4c_stubs.o luc4c.ml
+libluc4c_nc.a: luc4c_lib.o luc4c_stubs.o luc4c.ml
 	[ -d lurette_util ] || mkdir lurette_util && \
 	cd lurette_util && rm -f * && \
-	ar rcs  libluc4c_nc.a ../luc4c_lib.o$(EXE)   \
+	ar rcs  libluc4c_nc.a ../luc4c_lib.o   \
 		../luc4c_stubs.o && \
 	ar x $(OCAMLLIB)/libasmrun.a  &&\
 	ar q libluc4c_nc.a *.o  && rm *.o  &&\
@@ -319,7 +320,10 @@ gnuplot-rif_clean:
 
 ##############################################################################"
 lucky:
-	make -k nc -f Makefile.lucky OCAMLFLAGS="-noassert -unsafe"
+	make -k nc -f Makefile.lucky OCAMLFLAGS=""
+
+lucky_debug:
+	make -k dc -f Makefile.lucky OCAMLFLAGS=""
 
 lucky_clean:
 	make  -f Makefile.lucky clean
@@ -507,7 +511,7 @@ show_assert:
 
 ##############################################################################"
 luc2c:
-	make -k nc -f Makefile.luc2c OCAMLFLAGS="-noassert -unsafe"
+	make -k nc -f Makefile.luc2c OCAMLFLAGS="-unsafe"
 
 luc2c_clean:
 	make -k clean -f Makefile.luc2c
@@ -531,7 +535,7 @@ luc4c:
 
 luc4c_clean:
 	make -k clean -f Makefile.luc4c
-	rm -f libluc4c_nc.a luc4c_lib.o$(EXE) luc4c_stubs.o
+	rm -f libluc4c_nc.a luc4c_lib.o luc4c_stubs.o
 
 
 luc4c_debug:
@@ -639,7 +643,7 @@ all_assert: clean libnc_assert lucky_assert ltop_assert show_assert luc4ocaml_as
 check: 
 	echo "A faire dans le repertoire test, sinon, ca vaut pas !!! "
 
-allw: libnc lucky ltop show stubs gnuplot-rif gnuplot-socket gen_luc luc2c luc4c libluc4c_nc.a  draw-all luc4ocaml-all
+allw:libnc lucky ltop show stubs gnuplot-rif gnuplot-socket gen_luc luc2c luc4c libluc4c_nc.a  draw-all luc4ocaml-all
 all: libnc lucky ltop show stubs gnuplot-rif gnuplot-socket gen_luc luc2c luc4c libluc4c draw-all luc4ocaml-all 
 
 static: libnc lucky_static ltop_static show_static stubs_static  gen_luc_static
@@ -679,11 +683,6 @@ clean: clean_exe
 	make -k clean -f Makefile.show_luc ; \
 	rm -f *.a *.o
 
-xxx:
-	cp luc2c /usr/local/tools/lustre-misc/lurette/bin/
-	cp libluc4c_nc.a /usr/local/tools/lustre-misc/lurette/lib
-	cp liblucky_nc.a /usr/local/tools/lustre-misc/lurette/lib
-	cp luc4c_stubs.h /usr/local/tools/lustre-misc/lurette/include
 
 cp:
 	[ -d ../$(HOST_TYPE) ] || mkdir ../$(HOST_TYPE) && \

source/Makefile.lucky

@@ -23,7 +23,7 @@ ifdef STATIC
  OCAMLLDFLAGS =   -cclib -lstdc++ -cclib -lm -cclib -lc -ccopt -static\
  -cclib -l$(POLKA)_caml -cclib -l$(POLKA) -cclib -lgmp $(OCAMLOPTFLAG)
 else
-OCAMLLDFLAGS= -cc g++ -cclib -lstdc++ -cclib -I/usr/lib/w32api -cclib  -lole32 \
+OCAMLLDFLAGS= -cc g++ -cclib -lstdc++ -cclib -I/usr/lib/w32api \
  -cclib -l$(POLKA)_caml \
  -cclib -l$(POLKA)  -cclib -lgmp  $(OCAMLOPTFLAG) 
 endif

source/Makefile.release

@@ -82,9 +82,11 @@ lurette-scade-rel: strip
 
 LURETTE_RELEASE_NAME=lurette_$(VERSION)_$(HOSTTYPE32)
 
+#           $(LURETTE_PATH)/$(HOST_TYPE)/bin/sim2chrogtk$(EXE) \
+
 lurette-rel: strip
-	rm -rf /tmp/$(LURETTE_RELEASE_NAME)/
-	mkdir /tmp/$(LURETTE_RELEASE_NAME)/
+	rm -rf /tmp/$(LURETTE_RELEASE_NAME)
+	mkdir /tmp/$(LURETTE_RELEASE_NAME)
 	mkdir /tmp/$(LURETTE_RELEASE_NAME)/examples
 	mkdir /tmp/$(LURETTE_RELEASE_NAME)/examples/xlurette
 	mkdir /tmp/$(LURETTE_RELEASE_NAME)/bin
@@ -92,12 +94,11 @@ lurette-rel: strip
 	mkdir /tmp/$(LURETTE_RELEASE_NAME)/doc
 	\
 	cp -f $(LURETTE_PATH)/$(HOST_TYPE)/bin/lucky$(EXE) \
-           $(LURETTE_PATH)/$(HOST_TYPE)/bin/getsaonodes$(EXE) \
+           $(LURETTE_PATH)/$(HOST_TYPE)/bin/getsaonodes \
            $(LURETTE_PATH)/$(HOST_TYPE)/bin/lusinfo$(EXE) \
-           $(LURETTE_PATH)/$(HOST_TYPE)/bin/lus2ec$(EXE) \
+           $(LURETTE_PATH)/$(HOST_TYPE)/bin/lus2ec* \
            $(LURETTE_PATH)/$(HOST_TYPE)/bin/ec2c$(EXE) \
            $(LURETTE_PATH)/$(HOST_TYPE)/bin/pollux$(EXE) \
-           $(LURETTE_PATH)/$(HOST_TYPE)/bin/sim2chrogtk$(EXE) \
            $(LURETTE_PATH)/$(HOST_TYPE)/bin/lurettetop_exe$(EXE) \
            $(LURETTE_PATH)/$(HOST_TYPE)/bin/show_luc$(EXE) \
            $(LURETTE_PATH)/$(HOST_TYPE)/bin/gen_fake_lucky$(EXE) \
@@ -105,7 +106,7 @@ lurette-rel: strip
 	   $(LURETTE_PATH)/$(HOST_TYPE)/bin/gnuplot-rif$(EXE) \
 	   $(LURETTE_PATH)/$(HOST_TYPE)/bin/gnuplot-socket$(EXE) \
            $(LURETTE_PATH)/$(HOST_TYPE)/bin/xlurette_exe$(EXE) \
-	     /tmp/$(LURETTE_RELEASE_NAME)/bin 
+	     /tmp/$(LURETTE_RELEASE_NAME)/bin || true
 	\
 	rm -f $(LURETTE_PATH)/install/config.log 
 	rm -f $(LURETTE_PATH)/install/config.status 
@@ -212,8 +213,8 @@ test-lucky-rel:
 
 
 #################################################################################################"
-
-DRAW_RELEASE_NAME=luckyDraw_$(VERSION)_$(HOSTTYPE32)+ocaml-`ocamlc -v | grep version | cut -d " " -f6`
+OCAMLC_RELEASE_NAME=$(shell ocamlc -v | grep version | cut -d " " -f6)
+DRAW_RELEASE_NAME=luckyDraw_$(VERSION)_$(HOSTTYPE32)+ocaml-$(OCAMLC_RELEASE_NAME)
 
 draw-rel: 
 	rm -rf /tmp/$(DRAW_RELEASE_NAME)
@@ -223,16 +224,16 @@ draw-rel:
 	mkdir /tmp/$(DRAW_RELEASE_NAME)/doc
 	\
 	cp -rf ../examples/luckyDraw /tmp/$(DRAW_RELEASE_NAME)/examples/
-	cp -rf $(SYNCHRONE_LURETTE_DIR)/doc/luckydraw /tmp/$(DRAW_RELEASE_NAME)/doc/
+	cp -rf $(SYNCHRONE_LURETTE_DIR)/doc/luckydraw /tmp/$(DRAW_RELEASE_NAME)/doc/ || true
 	mkdir /tmp/$(DRAW_RELEASE_NAME)/lib
 	mkdir /tmp/$(DRAW_RELEASE_NAME)/bin
 	\
 	cp ../README-luckyDraw /tmp/$(DRAW_RELEASE_NAME)/
-	cp -rf $(HOME)/lurette/$(HOSTTYPE)/lib/*polka*a /tmp/$(DRAW_RELEASE_NAME)/lib
-	cp -rf $(HOME)/lurette/$(HOSTTYPE)/lib/*bdd*a /tmp/$(DRAW_RELEASE_NAME)/lib
+	cp -rf $(LURETTE_PATH)/$(HOSTTYPE)/lib/*polka*a /tmp/$(DRAW_RELEASE_NAME)/lib
+	cp -rf $(LURETTE_PATH)/$(HOSTTYPE)/lib/*bdd*a /tmp/$(DRAW_RELEASE_NAME)/lib
 	cp $(CAML_INSTALL_DIR)/libcamlidl.a  /tmp/$(DRAW_RELEASE_NAME)/lib
 	\
-	cp $(HOME)/lurette/$(HOSTTYPE)/lib/*luckyDraw*.* /tmp/$(DRAW_RELEASE_NAME)/lib
+	cp $(LURETTE_PATH)/$(HOSTTYPE)/lib/*luckyDraw*.* /tmp/$(DRAW_RELEASE_NAME)/lib
 	\