Commit 78921d81 authored by Erwan Jahier's avatar Erwan Jahier

lurette scade_gui.2 Wed, 23 Aug 2006 11:31:39 +0200 by jahier

Parent-Version:      scade_gui.1
Version-Log:

lurette.prj
OcamlMakefile
source/Makefile.lurettetop
source/Makefile.show_luc
source/Makefile.lucky
source/Makefile.gen_stubs
source/Makefile
polka/caml/Makefile
polka/C/cherni.c
polka/Makefile.config
xlurette/Scade/Makefile
examples/rml/Makefile
source/Makefile.lutinlib

Je n'ai pas reussi à compiler le bouzin sur le nouveau portable, à
cause de camlidl. le README de camlidl dit qu'il faut mvc++ sous
win32, c'est bizzare parce que ca a eu marché (???).

Je sauvegarde donc l'état courant et je tente une compilation via mvc++.

Project-Description: Lurette
parent 7cd28455
......@@ -20,7 +20,6 @@
(examples/xlurette/Scade-sparc/liblinear.saofdm 1301 1137765987 l/15_liblinear. 1.1)
(doc/tutorial/wearing_sensors.tex 1621 1138032075 q/24_wearing_se 1.1)
(examples/xlurette/Scade-win32/regulation.saofd 15074 1137765987 l/29_regulation 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 89243 1137765987 c/15_xlurette_g 1.36)
(source/Makefile.luckydraw.src 968 1137765987 n/31_Makefile.l 1.1)
(xlurette/Scade/Images/luset.bmp 822 1122044801 i/21_luset.bmp 1.1)
(xlurette/Scade/Images/lugenor.bmp 822 1122044801 i/24_lugenor.bm 1.1)
......@@ -32,10 +31,9 @@
(test/time-moucherotte.exp 4182 1088412276 e/37_time-mouch 1.23)
(polka/C/internal.c 883 1071844798 e/8_internal.c 1.2)
(source/Makefile.gnuplot-rif 207 1137765987 i/33_Makefile.g 1.2)
(polka/C/cherni.c 30685 1122044801 e/9_cherni.c 1.5)
(polka/C/cherni.c 30691 1156325499 e/9_cherni.c 1.6)
(source/parse_sildex.ml 7741 1137765987 h/36_parse_sild 1.4)
(xlurette/Scade/rif.ini 2117 1122044801 j/11_rif.ini 1.1)
(ihm/xlurette/xlurette.glade 115318 1127735479 c/13_xlurette.g 1.38)
(polka/C/internal.h 916 1071844798 e/0_internal.h 1.2)
(examples/xlurette/tram/time-joly.res 25174 1138025047 o/12_time-joly. 1.1)
(examples/xlurette/fault-tolerant-heater/test.rif.exp 35339 1138025047 n/48_test.rif.e 1.1)
......@@ -83,7 +81,7 @@
(examples/xlurette/Sildex/sut_sildex.h 1434 1138025047 o/22_sut_sildex 1.1)
(source/lurette_debug.ml 19050 1137765987 n/36_lurette_de 1.1)
(source/var.ml 7224 1137765987 g/49_var.ml 1.14)
(OcamlMakefile 21304 1127735479 17_OcamlMakef 1.54)
(OcamlMakefile 21260 1156325499 17_OcamlMakef 1.54.1.1)
(examples/xlurette/heater/test1.rif0 1223 1149601549 m/27_test1.rif0 1.1.1.1)
(xlurette/Scade/LuretteGUILauncher.tcl 75984 1149601549 i/28_LuretteGUI 1.2)
(install/pixmaps/quit.xpm 494 1137765987 n/18_quit.xpm 1.1)
......@@ -125,7 +123,7 @@
(doc/figs/nh-gen-pict.fig 3181 1138034376 q/43_nh-gen-pic 1.1)
(examples/lucky/tut-examples/simple.luc 174 1137765987 k/27_simple.luc 1.1)
(doc/figs/nh-lurette-start.fig 2042 1138034376 q/49_nh-lurette 1.1)
(examples/rml/Makefile 742 1137765987 k/13_Makefile 1.1)
(examples/rml/Makefile 737 1156325499 k/13_Makefile 1.2)
(source/solver.mli 1793 1137765987 38_solver.mli 1.25)
(examples/xlurette/heater/Makefile 1798 1137765987 m/18_Makefile 1.1)
(xlurette/Scade/tcldemo.def 38 1122044801 j/10_tcldemo.de 1.1)
......@@ -133,7 +131,7 @@
(examples/xlurette/Sildex/Makefile 754 1138025047 o/29_Makefile 1.1)
(examples/xlurette/fault-tolerant-heater/sensors.luc 638 1137765987 h/18_sensors.lu 1.3)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/Makefile.lurettetop 586 1137765987 d/14_Makefile.l 1.9)
(source/Makefile.lurettetop 653 1156325499 d/14_Makefile.l 1.10)
(doc/figs/thick.fig 1793 1138034376 q/37_thick.fig 1.1)
(doc/tutorial/heater_control.tex 2712 1138032075 q/31_heater_con 1.1)
(examples/ocaml/crazy-rabbit/rabbit-dir-line.luc 937 1137765987 j/46_rabbit-dir 1.1)
......@@ -174,7 +172,7 @@
(polka/caml/polkaIO.ml 1651 1071844798 d/44_polkaIO.ml 1.2)
(examples/xlurette/Scade-win32/lib_pilot.vsw 435 1137765987 l/32_lib_pilot. 1.1)
(source/gnuplot-socket.ml 1773 1137765987 i/18_gnuplot-so 1.3)
(source/Makefile.lucky 4698 1149601549 b/41_Makefile.i 1.40)
(source/Makefile.lucky 4707 1156325499 b/41_Makefile.i 1.41)
(examples/lucky/other/time-joly.res 789 1137765987 k/31_time-joly. 1.1)
(examples/xlurette/tram/test11.rif0 5063 1138025047 o/8_test11.rif 1.1)
(examples/xlurette/tram/test11.rif 4763 1138025047 o/3_test11.rif 1.1)
......@@ -184,7 +182,6 @@
(source/constraint.ml 3343 1137765987 c/19_constraint 1.14)
(examples/xlurette/Scade-sparc/Makefile 552 1137765987 l/10_Makefile 1.1)
(polka/caml/polka_lexer.mli 200 1047029868 d/41_polka_lexe 1.1)
(ihm/xlurette/xlurette_glade_main.ml 73731 1137765987 c/12_xlurette_g 1.49)
(source/solver.ml 11994 1137765987 39_solver.ml 1.66)
(examples/xlurette/tram/test1.rif 4763 1138025047 o/1_test1.rif 1.1)
(examples/ocaml/crazy-rabbit/rabbit-dir-obstacle.luc 1849 1137765987 j/48_rabbit-dir 1.1)
......@@ -253,8 +250,8 @@
(examples/xlurette/Sildex/env.luc 1183 1138025047 o/30_env.luc 1.1)
(source/run_aut.mli 3254 1137765987 b/46_automata.m 1.15)
(source/graph.mli 2451 1088432998 13_graph.mli 1.15)
(install/pixmaps/stop.bmp 238 1137765987 m/42_stop.bmp 1.1)
(source/parser.mly 6912 1137765987 h/19_parser.mly 1.4)
(install/pixmaps/stop.bmp 238 1137765987 m/42_stop.bmp 1.1)
(examples/ocaml/crazy-rabbit/rabbit-speed.luc 1150 1137765987 k/1_rabbit-spe 1.1)
(doc/tutorial/tutorial.tex 23076 1138032075 q/25_tutorial.t 1.1)
(source/luckyCapi.idl 2104 1137765987 n/39_luckyCapi. 1.1)
......@@ -323,7 +320,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 19544 1149601549 c/20_Makefile 1.46.1.1)
(source/Makefile 19610 1156325499 c/20_Makefile 1.46.1.2)
(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)
(examples/xlurette/Scade-win32/MyConsts.saofd 153 1137765987 l/48_MyConsts.s 1.1)
......@@ -360,7 +357,7 @@
(source/Makefile.release 12993 1149601549 n/41_Makefile.r 1.1.1.1)
(source/socket_client_serveur.ml 1844 1122044801 i/42_socket_cli 1.1)
(xlurette/Scade/LuretteTcl.c 752 1122044801 j/15_LuretteTcl 1.1)
(source/Makefile.lutinlib 1691 1138025047 n/44_Makefile.l 1.1)
(source/Makefile.lutinlib 1736 1156325499 n/44_Makefile.l 1.2)
(examples/xlurette/Scade-win32/Pilot_type.saofd 962 1137765987 l/50_Pilot_type 1.1)
(examples/ocaml/crazy-rabbit/rabbit-obstacle.luc 865 1137765987 j/51_rabbit-obs 1.1)
(examples/ocaml/crazy-rabbit/rabbit.out 31899 1137765987 k/0_rabbit.out 1.1)
......@@ -370,7 +367,7 @@
(source/sorted_list.ml 1191 1137765987 j/33_sorted_lis 1.1)
(examples/xlurette/heater/time-joly.res 13086 1137765987 m/17_time-joly. 1.1)
(source/socket_server.ml 1155 1122044801 i/40_socket_ser 1.1)
(source/Makefile.show_luc 1266 1138025047 b/40_Makefile.s 1.20)
(source/Makefile.show_luc 1235 1156325499 b/40_Makefile.s 1.21)
(examples/lucky/tut-solution/test.rif 0 1137765987 k/16_test.rif 1.1)
(i386-linux-gcc3/include/config.h 506 1138025047 o/34_config.h 1.1)
(polka/C/polka.c 5608 1071844798 e/6_polka.c 1.2)
......@@ -389,14 +386,13 @@
(source/gen_stubs_poc.ml 8793 1127735479 f/3_gen_stubs_ 1.6)
(examples/xlurette/Gyro/test.res 0 1137765987 m/37_test.res 1.1)
(source/thickness.ml 1769 1122044801 g/51_thickness. 1.5)
(ihm/xlurette/makefile 4613 1137765987 c/16_makefile 1.27)
(examples/lucky/tut-solution/test.res 0 1137765987 k/15_test.res 1.1)
(source/rif.mli 719 1080290901 h/28_rif.mli 1.1)
(examples/xlurette/Gyro/test.rif.exp 11483 1149601549 m/34_test.rif.e 1.1.1.1)
(examples/xlurette/tram/passager.luc 390 1138025047 o/18_passager.l 1.1)
(install/pixmaps/luset.bmp 822 1137765987 m/49_luset.bmp 1.1)
(examples/xlurette/heater/window.luc 4333 1137765987 m/28_window.luc 1.1)
(source/Makefile.gen_stubs 1623 1137765987 b/42_Makefile.g 1.15)
(source/Makefile.gen_stubs 1624 1156325499 b/42_Makefile.g 1.16)
(README-luckyDraw 1338 1137765987 j/36_README-luc 1.1)
(install/pixmaps/linegraph.xpm 697 1137765987 n/3_linegraph. 1.1)
(source/command_line.ml 5724 1122044801 b/20_command_li 1.24)
......@@ -408,7 +404,7 @@
(install/pixmaps/lurun.bmp 822 1137765987 m/50_lurun.bmp 1.1)
(doc/figs/logo-ist.eps 19564 1138034376 r/3_logo-ist.e 1.1)
(examples/xlurette/tram/test1.rif0 5127 1149601549 o/2_test1.rif0 1.1.1.1)
(polka/caml/Makefile 6587 1137765987 d/45_Makefile 1.8)
(polka/caml/Makefile 6617 1156325499 d/45_Makefile 1.9)
(polka/caml/polka.mli 856 1071844798 d/38_polka.mli 1.2)
(examples/xlurette/Scade-sparc/exo1.vsp 2123 1137765987 l/17_exo1.vsp 1.1)
(examples/lucky/tut-solution/test.rif.exp 430143 1137765987 k/14_test.rif.e 1.1)
......@@ -421,7 +417,7 @@
(source/lutin_caml.mli 3222 1122044801 i/35_lutin_caml 1.1)
(examples/lucky/other/losange-3d.luc 570 1137765987 k/46_losange-3d 1.1)
(examples/lucky/other/test1.rif.exp 33449 1137765987 k/41_test1.rif. 1.1)
(polka/Makefile.config 2289 1138025047 e/20_Makefile.c 1.10)
(polka/Makefile.config 2233 1156325499 e/20_Makefile.c 1.11)
(examples/xlurette/Scade-sparc/exo1.vsw 400 1137765987 l/16_exo1.vsw 1.1)
(examples/xlurette/fault-tolerant-heater/degradable-sensors.luc 1382 1137765987 h/15_wearing-se 1.3)
(examples/lucky/external_code/Makefile 1169 1137765987 j/24_Makefile 1.2)
......@@ -454,7 +450,6 @@
(examples/lucky/external_code/test.res 0 1137765987 k/21_test.res 1.1)
(source/Makefile.bug 548 1122044801 j/9_Makefile.b 1.1)
(doc/figs/gen-pict.fig 3816 1138034376 r/9_gen-pict.f 1.1)
(examples/xlurette/Scade-win32/.lurette_rc 551 1137765987 m/4_.lurette_r 1.1)
(polka/C/vector.c 17843 1071844798 e/3_vector.c 1.2)
(i386-linux-gcc3/include/ocaml2c.h 2480 1138025047 o/33_ocaml2c.h 1.1)
(source/store.ml 29889 1137765987 b/27_rnumsolver 1.46)
......@@ -493,7 +488,7 @@
(source/util2.ml 7738 1137765987 n/35_util2.ml 1.1)
(examples/lucky/other/infinite_weight.luc 1116 1137765987 k/49_infinite_w 1.1)
(install/lurettetop.sh.in 144 1137765987 g/25_lurettetop 1.4)
(xlurette/Scade/Makefile 1963 1149601549 j/13_Makefile 1.3)
(xlurette/Scade/Makefile 2827 1156325499 j/13_Makefile 1.4)
(examples/xlurette/Scade-win32/Pilot_cst.saofd 788 1137765987 l/43_Pilot_cst. 1.1)
(examples/ocaml/crazy-rabbit/synchron2005.pdf 241697 1137765987 j/47_synchron20 1.1)
(install/pixmaps/close.xpm 803 1137765987 n/24_close.xpm 1.1)
......@@ -507,7 +502,6 @@
(source/exp.ml 10797 1137765987 g/47_exp.ml 1.13)
(doc/tutorial/figs/lucky-ex.fig 1531 1138032075 q/34_lucky-ex.f 1.1)
(examples/xlurette/heater/test3.res 0 1137765987 m/24_test3.res 1.1)
(Makefile.common.source 2122 1149601549 e/33_Makefile.c 1.15.1.1)
(xlurette/makefile 4587 1138032075 q/21_makefile 1.1)
(doc/figs/nh-lurette-try.fig 2045 1138034376 q/41_nh-lurette 1.1)
(install/pixmaps/halt.xpm 511 1137765987 n/21_halt.xpm 1.1)
......
#
# Makefile.common for building binaries
#
#
OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
LURETTE_PATH = $(HOME)/lurette
ifeq ($(HOST_TYPE),win32)
OCAML_LIB="c:\TEMP\ocaml\lib"
OCAMLOPT = /cygdrive/c/TEMP/ocaml/bin/ocamlopt
OCAMLC = /cygdrive/c/TEMP/ocaml/bin/ocamlc
OCAML = /cygdrive/c/TEMP/ocaml/bin/ocaml
CPP_COMPILER=g++ -mno-cygwin
CPP_LINKER=g++ -mno-cygwin
CC=gcc -mno-cygwin -Wall -g -DWIN32 -I "c:\TEMP\ocaml\lib"
OCAMLLIB = "c:\TEMP\ocaml\lib"
INCDIRS = u:\\cygwin\\lib c:\\TEMP\\ocaml\\lib
LIBDIRS = u:\\cygwin\\lib c:\\TEMP\\ocaml\\lib
CAML_INSTALL_DIR=/cygdrive/c/TEMP/ocaml
SYNCHRONE_DIR=//ARPONT/www-verimag/SYNCHRONE
SYNCHRONE_LURETTE_DIR=//ARPONT/www-verimag/SYNCHRONE/lurette/
EXE := .exe
HOSTTYPE32=win32
DWIN32 = -DWIN32 -mno-cygwin -I "c:\TEMP\ocaml\lib" -L "c:\TEMP\ocaml\lib"
else
ifeq ($(HOST_TYPE),sparc-sun)
EXE :=
INCDIRS = $(HOME)/$(HOSTTYPE)/lib $(SCADE_INSTALL_DIR)/lib /usr/local/soft/ocaml/3.08/lib/ocaml
LIBDIRS = $(HOME)/$(HOSTTYPE)/lib $(SCADE_INSTALL_DIR)/lib /usr/local/soft/ocaml/3.08/lib/ocaml
OCAMLLIB = /usr/local/soft/ocaml/3.08/lib/ocaml
CAML_INSTALL_DIR=/usr/local/soft/ocaml/current
SYNCHRONE_DIR=/usr/local/www/SYNCHRONE
SYNCHRONE_LURETTE_DIR=/usr/local/www/SYNCHRONE/lurette/
EXE := #
HOSTTYPE32=$(HOST_TYPE)
DWIN32 =
else
ifeq ($(HOST_TYPE),mac)
HOSTTYPE=mac
HOST_TYPE=mac
EXE :=
INCDIRS = /usr/local/lib
LIBDIRS = /usr/local/lib
OCAMLLIB = /usr/local/lib/ocaml
CAML_INSTALL_DIR=/usr/local/lib/
HOSTTYPE32=$(HOST_TYPE)
DWIN32 =
OCAMLMAKEFILE = /Applications/lucky-src/OcamlMakefile
else
# LINUX quoi ...
EXE :=
# XXX si je met des choses la, elles se retrouvent dans les .cmxa gnrs, ce qui n'est pas de bonne augure...
INCDIRS = $(HOME)/$(HOSTTYPE)/lib
LIBDIRS = $(HOME)/$(HOSTTYPE)/lib
OCAMLLIB = /usr/local/soft/ocaml/3.09.0/lib/ocaml
CAML_INSTALL_DIR=/import/linux/soft/ocaml/3.09.0/
SYNCHRONE_DIR=/usr/local/www/SYNCHRONE
SYNCHRONE_LURETTE_DIR=/usr/local/www/SYNCHRONE/lurette/
EXE := #
HOSTTYPE32=$(HOST_TYPE)
DWIN32 =
endif
endif
endif
......@@ -5,7 +5,7 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.54 Mon, 26 Sep 2005 13:51:19 +0200 jahier $
# $Id: OcamlMakefile 1.54.1.1 Wed, 23 Aug 2006 11:31:39 +0200 jahier $
#
###########################################################################
......@@ -172,7 +172,7 @@ endif
export OCAMLCP
ifndef OCAMLDEP
OCAMLDEP := ocamldep
OCAMLDEP := ocamldep
endif
export OCAMLDEP
......@@ -190,7 +190,7 @@ endif
export OCAMLYACC
ifndef CAMLIDL
CAMLIDL := camlidl.opt
CAMLIDL := camlidl
endif
export CAMLIDL
......@@ -787,9 +787,9 @@ $(MLDEPDIR)/%.d: %.ml
$(QUIET)if [ ! -d $(@D) ]; then mkdir -p $(@D); fi
$(QUIET)pp=`sed -n -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
if [ -z "$$pp" ]; then \
$(OCAMLDEP) $(INCFLAGS) $< > $@; \
$(OCAMLDEP) $< > $@; \
else \
$(OCAMLDEP) -pp "$$pp" $(INCFLAGS) $< > $@; \
$(OCAMLDEP) -pp "$$pp" $< > $@; \
fi
$(BCDIDIR)/%.di $(NCDIDIR)/%.di: %.mli
......@@ -797,10 +797,10 @@ $(BCDIDIR)/%.di $(NCDIDIR)/%.di: %.mli
$(QUIET)if [ ! -d $(@D) ]; then mkdir -p $(@D); fi
$(QUIET)pp=`sed -n -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
if [ -z "$$pp" ]; then \
$(OCAMLDEP) $(DEPFLAGS) $(INCFLAGS) $< > $@; \
$(OCAMLDEP) $(DEPFLAGS) $< > $@; \
else \
$(OCAMLDEP) $(DEPFLAGS) \
-pp "$$pp" $(INCFLAGS) $< > $@; \
-pp "$$pp" $< > $@; \
fi
doc/html2: $(DOC_FILES)
......
......@@ -31,7 +31,7 @@ make utest:
cp window.out window.out.exp
clean:
- rm -f window.ml *.rannot *.rzi *.cmx *.cmi *.o *~
- rm -f window.ml *.rannot *.rzi *.cm? *.o *~
real_clean: clean
- rm window
\ No newline at end of file
set_test_length 50
set_formula_nb 1
set_draw_nb 1
set_output "pilot-det_mvt_mode_env-50-10.rif"
set_sut "pilot.saofdm" "det_mvt_mode"
set_env "det_mvt_mode_env.luc"
set_oracle "" ""
set_step_by_step false
set_seed_randomly
set_draw_mode inside
set_display_sim2chro false
set_display_local_var true
set_verbose false
set_show_step true
set_sut_compiler scade
set_oracle_compiler verimag
set_extra_cfiles " u:\\lurette\\test\\cygwin-scade\\det_mvt_mode_cstext.c"
set_extra_libs ""
set_extra_libdirs ""
set_extra_includedirs ""
ifndef LURETTE_PATH
LURETTE_PATH := $(HOME)/lurette
endif
-include $(LURETTE_PATH)/Makefile.common.source
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := $(LURETTE_PATH)/bin
endif
ifeq ($(WIN32),cygwin)
EXE = .exe
else
EXE :=
endif
THREAD=
# THREAD= -I +threads threads.cmxa threads.cmxa gtkThread.cmx
LABLGTK=lablgtk
# MAKE_MODE=unix
mlglade: xlurette.glade
mlglade xlurette.glade
cat: mlglade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
| sed -e 's/~lower:666./~lower:(float_of_int min_int)/' \
| sed -e 's/~upper:666./~upper:(float_of_int max_int)/' \
> xlurette_glade_interface.ml
cmo: xlurette_glade_main.ml cat
ocamlc.opt -c -I +$(LABLGTK) -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_interface.ml
ocamlc.opt -c -I +$(LABLGTK) -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_callbacks.ml
ocamlc.opt -c -pp "camlp4o" -I +$(LABLGTK) $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib -c xlurette_glade_main.ml
do:
ocamlc.opt -verbose $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib -I /usr/local/lib \
-I +$(LABLGTK) -I +str -o xlurette_exe$(EXE) str.cma unix.cma $(LABLGTK).cma gtkInit.cmo \
xlurette_glade_callbacks.cmo xlurette_glade_interface.cmo xlurette_glade_main.cmo
# sous windows, il me faut utiliser la version mingw de ocaml parce que
# les binaires labgtk ne sont dispo que pour cette version.
# Par ailleurs, on est oblig d'utiliser la version bytecode
# pour la meme raison. Arf.
win:
OCAMLLIB=c:\\TEMP\\ocaml\\lib ;\
/cygdrive/c/TEMP/ocaml/bin/ocamlc.opt \
-I +str -I +lablgtk -o xlurette_exe$(EXE) \
str.cma unix.cma $(LABLGTK).cma gtkInit.cmo \
xlurette_glade_callbacks.cmo xlurette_glade_interface.cmo \
xlurette_glade_main.cmo
debug: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlc.opt -g -c -I +$(LABLGTK) -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_interface.ml
ocamlc.opt -g -c -I +$(LABLGTK) -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_callbacks.ml
ocamlc.opt -g -c -pp "camlp4o" -I +$(LABLGTK) $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib -c xlurette_glade_main.ml
ocamlc.opt -g $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib \
-I +$(LABLGTK) -I +str -o xlurette_debug str.cma unix.cma $(LABLGTK).cma gtkInit.cmo \
xlurette_glade_callbacks.cmo xlurette_glade_interface.cmo xlurette_glade_main.cmo
opt: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
| sed -e 's/~lower:666./~lower:(float_of_int min_int)/' \
| sed -e 's/~upper:666./~upper:(float_of_int max_int)/' \
> xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +$(LABLGTK) -labels -c xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +$(LABLGTK) -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -verbose -c -pp "camlp4o" -I +$(LABLGTK) $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -verbose -I +$(LABLGTK) -I +str -labels -o xlurette_exe$(EXE) \
str.cmxa unix.cmxa $(LABLGTK).cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
opt_static: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +$(LABLGTK) -labels -c xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +$(LABLGTK) -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -verbose -c -pp "camlp4o" -I +$(LABLGTK) $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -verbose -I +$(LABLGTK) -I +str -labels -o xlurette_exe$(EXE) str.cmxa unix.cmxa $(LABLGTK).cmxa gtkInit.cmx \
-cclib -ldl -cclib -lm -cclib -lc -ccopt -static xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
all: opt cp
cp:
ifeq ($(HOST_TYPE),cygwin)
cp xlurette_exe.exe $(HOME)/lurette/cygwin/bin
else
cp xlurette_exe $(BIN_INSTALL_DIR)/
endif
clean:
rm -f *.cm* *.o a.out xlurette_exe$(EXE) xlurette_exe.opt$(EXE) xlurette_glade_interface.ml* xlurette_glade_callbacks.ml*
dummy:
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*% $Id: cherni.c 1.5 Fri, 22 Jul 2005 17:06:41 +0200 jahier $ */
/*% $Id: cherni.c 1.6 Wed, 23 Aug 2006 11:31:39 +0200 jahier $ */
/*% Conversion from one representation to the dual one. */
......@@ -205,7 +205,7 @@ int cherni_conversion(matrix_t* con, const int start,
}
if (!redundant){ /* if not */
if (nbrows==matrix_get_maxrows(ray)){
failwith("Chernikova: out of table space\n");
/* failwith("Chernikova: out of table space\n"); */
printf("Chernikova: out of table space\n");
exit(1);
}
......
......@@ -10,14 +10,11 @@
#CAMLIDL_INSTALL = $(HOME)/$(HOSTTYPE)
#GMP_INSTALL=$(HOME)/$(HOSTTYPE)
ifeq ($(HOST_TYPE),cygwin)
ifeq ($(HOST_TYPE),win32)
# CAMLIDL_INSTALL = c:\TEMP\ocaml\lib\caml
# CAML_INSTALL = c:\\TEMP\\ocaml\\lib
# CAMLIDL_INSTALL = c:\\TEMP\\ocaml\\lib\\caml
GMP_INSTALL=$(HOME)/lurette/$(HOSTTYPE)
CC = gcc -mno-cygwin -I/usr/lib/mingw
HOME="/cygdrive/c/Documents and Settings/erwan"
GMP_INSTALL="/cygdrive/c/Documents and Settings/erwan/scade_gui/win32"
CC = gcc -mno-cygwin -I"$(OCAMLLIB)"
else
ifeq ($(HOST_TYPE),sparc-sun)
......@@ -34,9 +31,9 @@ CURDIR = $(shell pwd)
PREFIX = $(POLKA_INSTALL)
# C include and lib directories
INCDIR = $(CURDIR)/../../$(HOSTTYPE)/include
LIBDIR = $(CURDIR)/../../$(HOSTTYPE)/lib
BINDIR = $(CURDIR)/../../$(HOSTTYPE)/bin
INCDIR = "$(CURDIR)/../../$(HOSTTYPE)/include"
LIBDIR = "$(CURDIR)/../../$(HOSTTYPE)/lib"
BINDIR = "$(CURDIR)/../../$(HOSTTYPE)/bin"
#
......@@ -51,8 +48,8 @@ GMP_PREFIX = $(GMP_INSTALL)
# in $(CAML_PREFIX)/lib/ocaml)
# (The same for Camlidl)
CAML_PREFIX = `ocamlc -where`
CAMLIDL_PREFIX = `ocamlc -where`
CAML_PREFIX ="$(OCAMLLIB)"
CAMLIDL_PREFIX ="$(OCAMLLIB)"
#---------------------------------------
# Programs
......
include ../Makefile.config
SRCDIR = $(shell pwd)
SRCDIR = "$(shell pwd)"
#---------------------------------------
# FILES
......@@ -60,7 +60,7 @@ rung: polkarung
polkatop%: polka.cma libpolka%_caml.a ../C/libpolka%.a
$(OCAMLMKTOP) $(MLFLAGS) -o $@ -custom $^ -cclib "-L$(CAMLIDL_PREFIX)/lib/ocaml -lcamlidl -L$(GMP_PREFIX)/lib -lgmp"
$(OCAMLMKTOP) -verbose $(MLFLAGS) -o $@ -custom $^ -cclib -L$(CAMLIDL_PREFIX)/lib/ocaml -cclib -lcamlidl -cclib -L$(GMP_PREFIX)/lib -cclib -lgmp
polkarun%: polka.cma libpolka%_caml.a ../C/libpolka%.a
$(OCAMLC) $(MLFLAGS) -o $@ -make-runtime $^ -cclib "-L$(CAMLIDL_PREFIX)/lib/ocaml -lcamlidl -L$(GMP_PREFIX)/lib -lgmp"
......
......@@ -2,8 +2,8 @@
-include ../Makefile.common.source
LURETTE_PATH = $(shell pwd)/..
OCAMLMAKEFILE = ../OcamlMakefile
# LURETTE_PATH = $(shell pwd)/..
# OCAMLMAKEFILE = ../OcamlMakefile
-include $(LURETTE_PATH)/VERSION
......@@ -17,6 +17,11 @@ LIB_INSTALL_DIR = ../$(HOST_TYPE)/lib
INC_INSTALL_DIR = ../$(HOST_TYPE)/include
show_var:
echo "OCAMLMAKEFILE=$(OCAMLMAKEFILE)"
echo "LURETTE_PATH=$(LURETTE_PATH)"
# C'est le meme que le liblurette_nc, mais sans libasmrun car il est
# destin a etre appelle depuis ocaml uniquement.
liblucky_nc.a:
......@@ -581,8 +586,6 @@ strtop:
ocamlmktop -o strtop str.cma unix.cma graph.cma
unixtop:
ocamlmktop -o unixtop unix.cma str.cma
unixtop:
ocamlmktop -o unixtop unix.cma str.cma
clean_exe:
rm -f gen_stubs_exe lucky lurettetop_exe lurette_lib.* \
......@@ -603,6 +606,8 @@ clean: clean_exe
make -k clean -f Makefile.luc2c ; \
make -k clean -f Makefile.show_luc
clean_junk:
rm *~ \#*
cp:
......
......@@ -70,3 +70,4 @@ LIBS = str unix
-include $(OCAMLMAKEFILE)
......@@ -23,7 +23,7 @@ ifdef STATIC
else
OCAMLLDFLAGS= -cclib -lstdc++ \
-cclib -lpolkag_caml \
-cclib -lpolkag -cclib -lgmp
-cclib -lpolkag -cclib -lgmp -verbose
endif
......
......@@ -32,6 +32,7 @@ RESULT = ./lurettetop_exe
v:
ocamlc.opt -v
echo "OCAMLLIB=$(OCAMLLIB) "
echo "OCAMLLIBPATH=$(OCAMLLIBPATH) "
-include $(OCAMLMAKEFILE)
......@@ -14,10 +14,11 @@
#-----------------------------------------------------
# Directories
SRCDIR=./src
OBJDIR=./obj$(CPU)
SRCDIR=./
ifeq ($(CPU),linux)
OBJDIR=./obj$(HOSTTYPE)
ifeq ($(HOSTTYPE),linux)
#settings for Linux (and other posix suystems ?)
DLEXT=so
EXE=
......@@ -26,19 +27,21 @@ CC=gcc
MKDLLFLAGS=
LFLAGS=-ldl
endif
ifeq ($(CPU),win32)
ifeq ($(HOSTTYPE),win32)
#settings for WIN32
DLEXT=dll
EXE=.exe
LD=gcc -DWIN32
CC=gcc -DWIN32
LD=gcc -mno-cygwin -DWIN32
CC=gcc -mno-cygwin -DWIN32
MKDLLFLAGS=-Wl,--out-implib,$(OBJDIR)/liblutin.a
LFLAGS=
endif
all: $(OBJDIR)/liblutin.$(DLEXT) \
$(OBJDIR)/test_dll$(EXE) \
$(OBJDIR)/test_dyn$(EXE)
all: $(OBJDIR)/liblutin.$(DLEXT)
# \
# $(OBJDIR)/test_dll$(EXE) \
# $(OBJDIR)/test_dyn$(EXE)
$(OBJDIR):
mkdir $(OBJDIR)
......
......@@ -21,7 +21,7 @@ USE_CAMLP4 = yes
HERE=$(LURETTE_PATH)/source/
HERE=./
SOURCES_OCAML = \
SOURCES = \
$(HERE)/Ezdl_c.c \
$(HERE)/Ezdl.ml \
$(HERE)/Ezdl.mli \
......@@ -45,10 +45,11 @@ SOURCES_OCAML = \
$(HERE)/show_env.mli $(HERE)/show_env.ml \
$(HERE)/show_luc.ml
SOURCES = $(SOURCES_OCAML)
RESULT = show_luc
-include $(OCAMLMAKEFILE)
LURETTE_PATH=$(HOME)/lurette
LURETTE_PATH=$(HOME)/scade_gui
-include $(LURETTE_PATH)/VERSION
LuretteTcl.dll:
dllwrap --dllname LuretteTcl.dll -def LuretteTcl.def c:/PROGRA~1/ESTERE~1/SCADE/bin/tcl847t.dll LuretteTcl.c
# -I c:/TEMP/MinGw/include
# dllwrap --dllname LuretteTcl.dll -def LuretteTcl.def c:/PROGRA~1/ESTERE~1/SCADE/tcl/bin/tcl84t.dll LuretteTcl.c
SCADE_DIR=/cygdrive/c/PROGRA~1/ESTERE~1/SCADE
LURETTE_SCADE_DIR=$(SCADE_DIR)/lurette
#SCADE_DIR=c:\PROGRA~1\ESTERE~1\SCADE\lurette
# La premiere fois qu'on installe lurette-scade sur une machine, il convient de creer
# les repertoires o on va ranger les bidules.
#
# J'en profite pour faire une copie de $(SCADE_DIR)/scripts/GenMake_l4sim.tcl que je