Commit e8688ee4 authored by Erwan Jahier's avatar Erwan Jahier

lurette scade_gui.3 Fri, 08 Dec 2006 11:05:05 +0100 by jahier

Parent-Version:      scade_gui.2
Version-Log:         empty
Project-Description: Lurette
parent 78921d81
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
(install/pixmaps/quit.xpm 494 1137765987 n/18_quit.xpm 1.1) (install/pixmaps/quit.xpm 494 1137765987 n/18_quit.xpm 1.1)
(examples/luckyDraw/ocaml/draw-ex.ml 545 1137765987 l/8_draw-ex.ml 1.1) (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) (examples/xlurette/heater/buggy_heater_ctrl.lus 219 1137765987 m/10_buggy_heat 1.1)
(Makefile 471 1149601549 d/13_Makefile 1.7.1.1) (Makefile 575 1165572305 d/13_Makefile 1.7.1.2)
(xlurette/Scade/Images/lurun.bmp 822 1122044801 i/22_lurun.bmp 1.1) (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) (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) (install/pixmaps/config-params.xpm 2753 1137765987 n/12_config-par 1.1)
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
(examples/xlurette/tram/test11.rif0 5063 1138025047 o/8_test11.rif 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) (examples/xlurette/tram/test11.rif 4763 1138025047 o/3_test11.rif 1.1)
(source/lurette.plot 684 1137765987 n/37_lurette.pl 1.1) (source/lurette.plot 684 1137765987 n/37_lurette.pl 1.1)
(utils/lucky.el 6657 1137765987 f/7_lucky.el 1.14) (utils/lucky.el 14222 1165572305 f/7_lucky.el 1.15)
(test/test_losange.lus 88 1149601549 r/22_test_losan 1.1) (test/test_losange.lus 88 1149601549 r/22_test_losan 1.1)
(source/constraint.ml 3343 1137765987 c/19_constraint 1.14) (source/constraint.ml 3343 1137765987 c/19_constraint 1.14)
(examples/xlurette/Scade-sparc/Makefile 552 1137765987 l/10_Makefile 1.1) (examples/xlurette/Scade-sparc/Makefile 552 1137765987 l/10_Makefile 1.1)
...@@ -417,7 +417,7 @@ ...@@ -417,7 +417,7 @@
(source/lutin_caml.mli 3222 1122044801 i/35_lutin_caml 1.1) (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/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) (examples/lucky/other/test1.rif.exp 33449 1137765987 k/41_test1.rif. 1.1)
(polka/Makefile.config 2233 1156325499 e/20_Makefile.c 1.11) (polka/Makefile.config 2428 1165572305 e/20_Makefile.c 1.12)
(examples/xlurette/Scade-sparc/exo1.vsw 400 1137765987 l/16_exo1.vsw 1.1) (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/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) (examples/lucky/external_code/Makefile 1169 1137765987 j/24_Makefile 1.2)
......
...@@ -3,21 +3,27 @@ ...@@ -3,21 +3,27 @@
# to run after a checkout in a fresh WS # to run after a checkout in a fresh WS
source: gen_version source: gen_version
./lnsw ./lnsw
cd polka; make all ; make install; cd .. cd polka; make clean; make all ; make install; cd ..
cd GBDDML; make all; make cp; cd .. cd GBDDML; make clean; make all; make cp; cd ..
cd source; make install; cd .. cd source; make clean; make install; cd ..
cd install; autoconf; cd .. cd install; autoconf; cd ..
./RUN_ME ./RUN_ME
VERSION:=$(shell prcs info ./lurette.prj | tail -n 1 | awk '{printf "%s\n", $$2}')
VERSION:=$(shell prcs info --sort date ./lurette.prj | tail -n 1 | awk '{printf "%s\n", $$2}')
gen_version: gen_version:
rm -f source/version.ml rm -f source/version.ml
echo "let str=\"$(VERSION)\"" > source/version.ml echo "let str=\"$(VERSION)\"" > source/version.ml
ci:
prcs checkin lurette.prj
make gen_version
touch: touch:
cd test && make touch cd test && make touch
log: log:
prcs info -r scade_gui -l lurette.prj prcs info -r unstable_1_43 -l lurette.prj
;; -*- Prcs -*- ;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3) (Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette") (Project-Description "Lurette")
(Project-Version lurette scade_gui 2) (Project-Version lurette scade_gui 3)
(Parent-Version lurette scade_gui 1) (Parent-Version lurette scade_gui 2)
(Version-Log " (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++.
")
(New-Version-Log "" (New-Version-Log ""
) )
(Checkin-Time "Wed, 23 Aug 2006 11:31:39 +0200") (Checkin-Time "Fri, 08 Dec 2006 11:05:05 +0100")
(Checkin-Login jahier) (Checkin-Login jahier)
(Populate-Ignore ()) (Populate-Ignore ())
(Project-Keywords) (Project-Keywords)
...@@ -141,13 +119,13 @@ Je sauvegarde donc l' ...@@ -141,13 +119,13 @@ Je sauvegarde donc l'
;; Make files ;; Make files
(utils/lucky.el (lurette/f/7_lucky.el 1.14 644)) (utils/lucky.el (lurette/f/7_lucky.el 1.15 644))
(install/config.guess (lurette/f/25_config.gue 1.1 755)) (install/config.guess (lurette/f/25_config.gue 1.1 755))
(install/configure.in (lurette/d/11_configure. 1.24.1.1 644)) (install/configure.in (lurette/d/11_configure. 1.24.1.1 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.54.1.1 644)) (OcamlMakefile (lurette/17_OcamlMakef 1.54.1.1 644))
(install/Makefile.lurette.in (lurette/b/38_Makefile.l 1.38 644)) (install/Makefile.lurette.in (lurette/b/38_Makefile.l 1.38 644))
(user-rules (lurette/c/14_myrules 1.74.1.1 644)) (user-rules (lurette/c/14_myrules 1.74.1.1 644))
(Makefile (lurette/d/13_Makefile 1.7.1.1 644)) (Makefile (lurette/d/13_Makefile 1.7.1.2 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.10 644)) (source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.10 644))
(source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.6 644)) (source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.6 644))
...@@ -219,7 +197,7 @@ Je sauvegarde donc l' ...@@ -219,7 +197,7 @@ Je sauvegarde donc l'
(polka/documentation/polka.texi (lurette/e/17_polka.texi 1.2 600)) (polka/documentation/polka.texi (lurette/e/17_polka.texi 1.2 600))
(polka/documentation/Makefile (lurette/e/18_Makefile 1.1 600)) (polka/documentation/Makefile (lurette/e/18_Makefile 1.1 600))
(polka/README (lurette/e/19_README 1.1 600)) (polka/README (lurette/e/19_README 1.1 600))
(polka/Makefile.config (lurette/e/20_Makefile.c 1.11 644)) (polka/Makefile.config (lurette/e/20_Makefile.c 1.12 644))
(polka/Makefile (lurette/e/21_Makefile 1.2 600)) (polka/Makefile (lurette/e/21_Makefile 1.2 600))
(polka/Changes (lurette/e/22_Changes 1.2 600)) (polka/Changes (lurette/e/22_Changes 1.2 600))
......
...@@ -9,20 +9,55 @@ ...@@ -9,20 +9,55 @@
#CAML_INSTALL = $(HOME)/$(HOSTTYPE) #CAML_INSTALL = $(HOME)/$(HOSTTYPE)
#CAMLIDL_INSTALL = $(HOME)/$(HOSTTYPE) #CAMLIDL_INSTALL = $(HOME)/$(HOSTTYPE)
#GMP_INSTALL=$(HOME)/$(HOSTTYPE) #GMP_INSTALL=$(HOME)/$(HOSTTYPE)
#---------------------------------------
# Flags
#---------------------------------------
# Use ICFLAGS to specify machine-independent compilation flags.
ICFLAGS = -I$(GMP_PREFIX)/include -I.. \
-Wall -Wconversion -Winline -Wimplicit-function-declaration \
-O3 -g -DNDEBUG
## xds-O3 -g -DNDEBUG
# Use XCFLAGS to specify machine-dependent compilation flags.
XCFLAGS =
# For debugging purpose
CFLAGS_DEBUG = -O0 -g -UNDEBUG
CFLAGS_PROF = -g -pg
# For the OCAML interface
MLFLAGS =
MLOPTFLAGS = -inline 20
CAML_CFLAGS_DEBUG = -O0 -g -UNDEBUG
CAML_CFLAGS_PROF = -g -pg
#---------------------------------------
# Flags
#---------------------------------------
ifeq ($(HOST_TYPE),win32) ifeq ($(HOST_TYPE),win32)
HOME="/cygdrive/c/Documents and Settings/erwan" HOME="/cygdrive/c/Documents and Settings/erwan"
GMP_INSTALL="/cygdrive/c/Documents and Settings/erwan/scade_gui/win32" GMP_INSTALL="/cygdrive/c/Documents and Settings/erwan/scade_gui/win32"
CC = gcc -mno-cygwin -I"$(OCAMLLIB)" #CC = gcc -mno-cygwin -I"$(OCAMLLIB)"
CC=cl
CFLAGS=/nologo /MT /Zi
ICFLAGS=
CFLAGS_DEBUG =
CFLAGS_PROF =
CPP=cl /nologo /E
else else
ifeq ($(HOST_TYPE),sparc-sun) ifeq ($(HOST_TYPE),sparc-sun)
CC = gcc -I /usr/local/soft/ocaml/3.08/lib/ocaml CC = gcc -I /usr/local/soft/ocaml/3.08/lib/ocaml
GMP_INSTALL=$(HOME)/$(HOSTTYPE) GMP_INSTALL=$(HOME)/$(HOSTTYPE)
CPP=gcc -E
else else
CC = gcc CC = gcc
GMP_INSTALL=$(HOME)/$(HOSTTYPE) GMP_INSTALL=$(HOME)/$(HOSTTYPE)
CPP=gcc -E
endif endif
endif endif
...@@ -59,7 +94,6 @@ CAMLIDL_PREFIX ="$(OCAMLLIB)" ...@@ -59,7 +94,6 @@ CAMLIDL_PREFIX ="$(OCAMLLIB)"
INSTALL = install INSTALL = install
INSTALLd = install -d INSTALLd = install -d
# C compiler and C preprocessor # C compiler and C preprocessor
CPP = gcc -E
# LATEX and others # LATEX and others
LATEX = latex LATEX = latex
...@@ -77,25 +111,3 @@ OCAMLMKTOP = ocamlmktop ...@@ -77,25 +111,3 @@ OCAMLMKTOP = ocamlmktop
CAMLIDL = camlidl CAMLIDL = camlidl
#---------------------------------------
# Flags
#---------------------------------------
# Use ICFLAGS to specify machine-independent compilation flags.
ICFLAGS = -I$(GMP_PREFIX)/include -I.. \
-Wall -Wconversion -Winline -Wimplicit-function-declaration \
-O3 -g -DNDEBUG
## xds-O3 -g -DNDEBUG
# Use XCFLAGS to specify machine-dependent compilation flags.
XCFLAGS =
# For debugging purpose
CFLAGS_DEBUG = -O0 -g -UNDEBUG
CFLAGS_PROF = -g -pg
# For the OCAML interface
MLFLAGS =
MLOPTFLAGS = -inline 20
CAML_CFLAGS_DEBUG = -O0 -g -UNDEBUG
CAML_CFLAGS_PROF = -g -pg
This diff is collapsed.
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