Commit d7c686be authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Reorganize a little bit distributed files.

parent 7d82c4e9
......@@ -23,12 +23,15 @@ build: gen_version
cd GBDDML && make clean && make && make all && make cp && cd ..&&\
cd source && make clean && make install&& cd ..&&\
ln -sf pre_release/$(HOSTTYPE) && \
ln -sf pre_release/$(HOSTTYPE)/bin && \
ln -sf pre_release/$(HOSTTYPE)/lib && \
ln -sf pre_release/$(HOSTTYPE)/include && \
cd install && autoconf && cd .. &&\
make lus2lic && \
./RUN_ME
lus2lic:
cp `which lus2lic` $(BIN_INSTALL_DIR)
cp `which lus2lic$(EXE)` $(BIN_INSTALL_DIR)
clean:
......
......@@ -24,7 +24,7 @@ qu () {
echo "Lurette installation procedure"
INSTALL_DIR=$PWD/$HOSTTYPE
INSTALL_DIR=$PWD/
qu "Where do you want to install files (absolute path)?" INSTALL_DIR
echo "
......
......@@ -12,10 +12,6 @@ test-lucky:
cd xlurette/fault-tolerant-heater/ && make test ;
cd xlurette/heater/ && make test ;
cd luckyDraw/ocaml/ && make test ;
# cd luckyDraw/c/ && make test ;
cd lucky/C && make test ;
cd lucky/lustre && make test
cd lucky/luciole && make test ;
cd ocaml/xlurette && make test ;
ifneq ($(HOST_TYPE),mac)
# cd xlurette/Sildex/ && make test ;
......
......@@ -7,7 +7,7 @@ CFLAGS = \
-I../../../include
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl -lstdc++
LUC2C=../../../$(HOSTTYPE)/bin/luc2c
LUC2C=../../../bin/luc2c
ifeq ($(HOSTTYPE),mac)
LINKER=g++ -g
......@@ -17,12 +17,12 @@ endif
ifeq ($(HOSTTYPE),cross-win32)
EXE=
CFLAGS = \
-L../../../$(HOSTTYPE)/lib \
-I../../../$(HOSTTYPE)/include \
-L../../../lib \
-I../../../include \
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ -lole32
LUC2C=../../../$(HOSTTYPE)/bin/luc2c$(EXE)
LUC2C=../../../bin/luc2c$(EXE)
LINKER=i586-mingw32msvc-gcc
CC= i586-mingw32msvc-cc
endif
......@@ -30,12 +30,12 @@ endif
ifeq ($(HOSTTYPE),cross-win32)
EXE=
CFLAGS = \
-L../../../$(HOSTTYPE)/lib \
-I../../../$(HOSTTYPE)/include \
-L../../../lib \
-I../../../include \
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ -mno-cygwin -lole32
LUC2C=../../../$(HOSTTYPE)/bin/luc2c$(EXE)
LUC2C=../../../bin/luc2c$(EXE)
endif
ifeq ($(HOSTTYPE),cygwin)
......@@ -46,7 +46,7 @@ ifeq ($(HOSTTYPE),cygwin)
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
LUC2C=../../../$(HOSTTYPE)/bin/luc2c$(EXE)
LUC2C=../../../bin/luc2c$(EXE)
endif
......
......@@ -60,11 +60,11 @@ $(OBJDIR)/%.o : $(OBJDIR) $(SRCDIR)/%.c
call_external_c_code.luc_pp:call_external_c_code.luc
../../../$(HOSTTYPE)/bin/lucky_cpp call_external_c_code.luc call_external_c_code.luc_pp $(LD_ARCH)
../../../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 && \
../../../$(HOSTTYPE)/bin/lucky$(EXE) -l 10 $(OPT) -seed 834966010 \
../../../bin/lucky$(EXE) -l 10 $(OPT) -seed 834966010 \
call_external_c_code.luc_pp | sed -e "s/^M//" | grep -v " Lucky Version" > test.rif
rm -f test.res && diff -u -i test.rif.exp test.rif > test.res
[ ! -s test.res ] && make clean
......
......@@ -4,7 +4,7 @@
export LURETTE_PATH=../../..
go:
../../../$(HOSTTYPE)/bin/luc2c --luciole foo.luc
../../../bin/luc2c --luciole foo.luc
test: go
make -f Makefile.foo && make clean
......
......@@ -3,21 +3,21 @@ LD = gcc -g
EXE=
CFLAGS = \
-L../../../$(HOSTTYPE)/lib \
-I../../../$(HOSTTYPE)/include
-L../../../lib \
-I../../../include
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl -lstdc++
LUC2C=../../../$(HOSTTYPE)/bin/luc2c
LUC2C=../../../bin/luc2c
ifeq ($(HOSTTYPE),win32)
EXE=.exe
CFLAGS = \
-L../../../$(HOSTTYPE)/lib -L/cygdrive/c/TEMP/MinGW/lib \
-I../../../$(HOSTTYPE)/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=../../../$(HOSTTYPE)/bin/luc2c$(EXE)
LUC2C=../../../bin/luc2c$(EXE)
endif
ifeq ($(HOSTTYPE),mac)
LD = g++ -g
......
......@@ -4,7 +4,7 @@ ifeq ($(HOSTTYPE),win32)
EXE=.exe
endif
LUCKY=../../../$(HOSTTYPE)/bin/lucky$(EXE) -seed 1
LUCKY=../../../bin/lucky$(EXE) -seed 1
test1 :
......
......@@ -3,7 +3,7 @@ ifeq ($(HOSTTYPE),win32)
EXE=.exe
endif
LUCKY=../../../$(HOSTTYPE)/bin/lucky$(EXE)
LUCKY=../../../bin/lucky$(EXE)
test:
$(LUCKY) -l 10 $(OPT) -seed 1 \
simpler.luc | sed -e "s/^M//" | grep -v " Lucky Version" > test.rif && \
......
MAIN=draw-ex
LUCKYDRAW_INSTALL_DIR=../../../$(HOSTTYPE)/lib
LUCKYDRAW_INSTALL_DIR=../../../lib
CLIBS=-cclib -lluckyDraw
MLLIBS= str.cmxa unix.cmxa nums.cmxa bdd.cmxa polka.cmxa luckyDraw.cmxa
......
......@@ -8,10 +8,10 @@ CFLAGS = \
-I../../../include $(DEBUG)
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl -lstdc++
LUT2C=../../../$(HOSTTYPE)/bin/lutin --2c-4c -seed 42
LUT2CSOCK=../../../$(HOSTTYPE)/bin/lutin --2c-4c-socks 127.0.0.1 -seed 42
CALLVIASOCKET=../../../$(HOSTTYPE)/bin/call-via-socket -addr 127.0.0.1 -port 2001
LUTIN=../../../$(HOSTTYPE)/bin/lutin -seed 42 -only-outputs -exe
LUT2C=../../../bin/lutin$(EXE) --2c-4c -seed 42
LUT2CSOCK=../../../bin/lutin --2c-4c-socks 127.0.0.1 -seed 42
CALLVIASOCKET=../../../bin/call-via-socket -addr 127.0.0.1 -port 2001
LUTIN=../../../bin/lutin -seed 42 -only-outputs -exe
ifeq ($(HOSTTYPE),mac)
LINKER=g++ -g
......@@ -28,8 +28,8 @@ ifneq (,$(findstring win32,$(HOSTTYPE)))
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ -lole32
LIBSSOCK = -lws2_32 -lole32
LUT2C=../../../$(HOSTTYPE)/bin/lutin.exe --2c-4c
LUT2CSOCK=../../../$(HOSTTYPE)/bin/lutin.exe --2c-4c-socks 127.0.0.1 -seed 42
LUT2C=../../../bin/lutin.exe --2c-4c
LUT2CSOCK=../../../bin/lutin.exe --2c-4c-socks 127.0.0.1 -seed 42
endif
ifeq ($(HOSTTYPE),cygwin)
EXE=.exe
......@@ -39,7 +39,7 @@ ifeq ($(HOSTTYPE),cygwin)
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
LUT2C=../../../$(HOSTTYPE)/bin/lutin --2c-4c-socks 127.0.0.1 -seed 42
LUT2C=../../../bin/lutin --2c-4c-socks 127.0.0.1 -seed 42
endif
......
export OCAMLOPT=ocamlopt
LTOP=../../../$(HOSTTYPE)/bin/lurettetop
LIB=../../../$(HOSTTYPE)/lib
LTOP=../../../bin/lurettetop$(EXE)
LIB=../../../lib
MAIN=rabbit
......
......@@ -63,18 +63,18 @@ $(OBJDIR)/%.o : $(OBJDIR) $(SRCDIR)/%.c
run: $(OBJDIR)/$(MAIN).$(DLEXT)
../../../$(HOSTTYPE)/bin/lutin call_external_c_code.lut -m Fun_Call -L libm.so -L obj/foo.so \
../../../bin/lutin$(EXE) call_external_c_code.lut -m Fun_Call -L libm.so -L obj/foo.so \
-l 10
test1: clean $(OBJDIR)/$(MAIN).$(DLEXT)
../../../$(HOSTTYPE)/bin/lutin call_external_c_code.lut -m Fun_Call -L libm.so -L obj/foo.so \
../../../bin/lutin$(EXE) call_external_c_code.lut -m Fun_Call -L libm.so -L obj/foo.so \
-l 10 -seed 834966010 | sed -e "s/^M//" | grep -v " Version" > test1.rif
rm -f test1.res && diff -u -i -B test1.rif.exp test1.rif > test1.res || true
cat test1.res
[ ! -s test1.res ] && make clean
test2:
echo "1.0 1.0" | ../../../$(HOSTTYPE)/bin/lutin -l 1 -L libm.so polar.lut -m cartesian \
echo "1.0 1.0" | ../../../bin/lutin$(EXE) -l 1 -L libm.so polar.lut -m cartesian \
-seed 1 | grep -v " Version" > test2.rif
rm -f test2.res && diff -u -i -B test2.rif.exp test2.rif > test2.res || true
cat test2.res
......
LUTIN=../../../$(HOSTTYPE)/bin/lutin
LUTIN=../../../bin/lutin$(EXE)
-include Makefile.env
export LURETTE_PATH=../../..
......
......@@ -3,21 +3,21 @@ LD = gcc -g
EXE=
CFLAGS = \
-L../../../$(HOSTTYPE)/lib \
-I../../../$(HOSTTYPE)/include
-L../../../lib \
-I../../../include
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl -lstdc++
LUTIN=../../../$(HOSTTYPE)/bin/lutin
LUTIN=../../../bin/lutin
ifeq ($(HOSTTYPE),win32)
EXE=.exe
CFLAGS = \
-L../../../$(HOSTTYPE)/lib -L/cygdrive/c/TEMP/MinGW/lib \
-I../../../$(HOSTTYPE)/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++
LUTIN=../../../$(HOSTTYPE)/bin/lutin(EXE)
LUTIN=../../../bin/lutin$(EXE)
endif
ifeq ($(HOSTTYPE),mac)
LD = g++ -g
......
......@@ -2,7 +2,7 @@
CMXA_LIB = unix.cmxa nums.cmxa str.cmxa bdd.cmxa polka.cmxa luc4ocaml.cmxa
CMA_LIB=luc4ocaml.cma
LUC4OCAML_INSTALL_DIR = -I ../../../$(HOSTTYPE)/lib
LUC4OCAML_INSTALL_DIR = -I ../../../lib
# LUC4OCAML_INSTALL_DIR = -I +lucky
......
......@@ -7,7 +7,7 @@ ifeq ($(HOSTTYPE),cross-win32)
EXE=.exe
endif
LUTIN=../../../$(HOSTTYPE)/bin/lutin$(EXE) -seed 1 -boot --load-mem
LUTIN=../../../bin/lutin$(EXE) -seed 1 -boot --load-mem
test : test1 test2 clear
......
......@@ -4,7 +4,7 @@ ifeq ($(HOSTTYPE),win32)
EXE=.exe
endif
LUTIN=../../../$(HOSTTYPE)/bin/lucky$(EXE) -seed 13
LUTIN=../../../bin/lutin$(EXE) -seed 13
test: test1 testexe
......
......@@ -4,7 +4,7 @@ ifeq ($(HOSTTYPE),win32)
endif
%_lut.luc: simple.lut
lutin -o $@ $< -main $*
lutin$(EXE) -o $@ $< -main $*
run_simple: simple_lut.luc
......
......@@ -4,7 +4,7 @@ ifeq ($(HOSTTYPE),win32)
EXE=.exe
endif
LUTIN=../../../$(HOSTTYPE)/bin/lutin$(EXE) -seed 1
LUTIN=../../../bin/lutin$(EXE) -seed 1
......
Supports Markdown
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