Commit b6a14188 authored by Joseph Pallamidessi's avatar Joseph Pallamidessi

Minor aesthetic change to the install script and Makefile. Use a new weierstrass.ez

	modifié:         Makefile
	modifié:         examples/weierstrass/weierstrass.ez
	modifié:         install.sh
parent 4e22301c
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(shell uname -o 2>/dev/null),Msys) ifeq ($(shell uname -o 2>/dev/null),Msys)
OS := MINGW OS := MINGW
endif endif
EXEC = bin/easea EXEC = bin/easea
CPPFLAGS += -DUNIX_OS -Ialexyacc/include/ -g -Wno-deprecated -DDEBUG -DLINE_NUM_EZ_FILE CPPFLAGS += -DUNIX_OS -Ialexyacc/include/ -g -Wno-deprecated -DDEBUG -DLINE_NUM_EZ_FILE
LDFLAGS = LDFLAGS =
OBJ= build/EaseaSym.o build/EaseaParse.o build/EaseaLex.o alexyacc/libalex.a build/EaseaYTools.o boost/program_options.a libeasea/libeasea.a OBJ= build/EaseaSym.o build/EaseaParse.o build/EaseaLex.o alexyacc/libalex.a build/EaseaYTools.o boost/program_options.a libeasea/libeasea.a
#ifeq ($(UNAME),Darwin) #ifeq ($(UNAME),Darwin)
$(EXEC):build bin $(OBJ) $(EXEC):build bin $(OBJ)
$(CXX) $(CPPFLAGS) $(LDFLAGS) $(OBJ) -o $@ $(CXX) $(CPPFLAGS) $(LDFLAGS) $(OBJ) -o $@
ifneq ("$(OS)","") ifneq ("$(OS)","")
# #
# Congratulations ! It looks like you compiled EASEA successfully. # Congratulations ! It looks like you compiled EASEA successfully.
# #
# You can use easea from this directory by typing : # You can use easea from this directory by typing :
# For example : # For example :
# easea.exe examples\weierstrass_std\weierstrass.ez # easea.exe examples\weierstrass_std\weierstrass.ez
# Go to the target directory and type make -f weierstrass.mak # Go to the target directory and type make -f weierstrass.mak
# #
# Thanks for using EASEA. # Thanks for using EASEA.
# #
else else
# #
# Congratulations ! It looks like you compiled EASEA successfully. # Congratulations ! It looks like you compiled EASEA successfully.
# #
# You can now install easea into your system or use it from # You can now install easea into your system or use it from
# its current directory. # its current directory.
# #
# Installation: # System Installation (you need admnistration rights):
# To install EASEA into your system, type: # EASEA will be installed into /usr/local/easea/ directory,
# ". install.sh ". # including, the binary, its libraries and the templates.
# EASEA will be installed into /usr/local/easea/ directory, # Finally, environment variables will be updated (EZ_PATH and PATH),
# including, the binary, its libraries and the templates. ifeq ($(UNAME),Darwin)
# Finaly, environment variables will be updated (EZ_PATH and PATH), # into your .bash_profile file.
ifeq ($(UNAME),Darwin) else
# into your .bash_profile file. # into your .bashrc file.
else endif
# into your .bashrc file. # To install EASEA into your system, type:
endif # "source install.sh "
# #
# Local Usage: # Local Usage:
# All EASEA elements will stay in the current directory, # All EASEA elements will stay in the current directory,
# but some environment variables need to be updated into your # but some environment variables need to be updated into your
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
# .bash_profile file (EZ_PATH and). To do so type: # .bash_profile file (EZ_PATH). To do so type:
else else
# .bashrc file (EZ_PATH and). To do so type: # .bashrc file (EZ_PATH). To do so type:
endif endif
# ". install.sh local". # "source install.sh local"
# #
# Thanks for using EASEA. # Thanks for using EASEA.
# #
endif endif
# $(EXEC):EaseaSym.o EaseaParse.o EaseaLex.o alexyacc/libalex.so # $(EXEC):EaseaSym.o EaseaParse.o EaseaLex.o alexyacc/libalex.so
# $(CXX) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ # $(CXX) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
# $(EXEC)_bin:EaseaSym.o EaseaParse.o EaseaLex.o # $(EXEC)_bin:EaseaSym.o EaseaParse.o EaseaLex.o
# $(CXX) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -lalex # $(CXX) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -lalex
install: install:
mkdir -p /usr/local/easea/ /usr/local/easea/bin /usr/local/easea/tpl /usr/local/easea/libeasea/include /usr/local/easea/boost /usr/local/easea/easeagrapher/ mkdir -p /usr/local/easea/ /usr/local/easea/bin /usr/local/easea/tpl /usr/local/easea/libeasea/include /usr/local/easea/boost /usr/local/easea/easeagrapher/
cp bin/easea /usr/local/easea/bin/ cp bin/easea /usr/local/easea/bin/
cp tpl/* /usr/local/easea/tpl/ cp tpl/* /usr/local/easea/tpl/
cp libeasea/include/* /usr/local/easea/libeasea/include/ cp libeasea/include/* /usr/local/easea/libeasea/include/
cp libeasea/libeasea.a /usr/local/easea/libeasea/ cp libeasea/libeasea.a /usr/local/easea/libeasea/
cp boost/program_options.a /usr/local/easea/boost cp boost/program_options.a /usr/local/easea/boost
cp -r boost/boost/ /usr/local/easea/boost/boost/ cp -r boost/boost/ /usr/local/easea/boost/boost/
cp easeagrapher/EaseaGrapher.jar /usr/local/easea/easeagrapher/ cp easeagrapher/EaseaGrapher.jar /usr/local/easea/easeagrapher/
build: build:
@test -d build || mkdir build || echo "Cannot make dir build" @test -d build || mkdir build || echo "Cannot make dir build"
bin: bin:
@test -d bin || mkdir bin || echo "Cannot make dir bin" @test -d bin || mkdir bin || echo "Cannot make dir bin"
build/EaseaParse.o: EaseaParse.cpp EaseaLex.cpp build/EaseaParse.o: EaseaParse.cpp EaseaLex.cpp
$(CXX) $(CPPFLAGS) $< -o $@ -c -w $(CXX) $(CPPFLAGS) $< -o $@ -c -w
build/EaseaLex.o: EaseaLex.cpp build/EaseaLex.o: EaseaLex.cpp
$(CXX) $(CPPFLAGS) $< -o $@ -c -w $(CXX) $(CPPFLAGS) $< -o $@ -c -w
build/%.o:%.cpp build/%.o:%.cpp
$(CXX) $(CPPFLAGS) -c -o $@ $< $(CXX) $(CPPFLAGS) -c -o $@ $<
#compile library for alex and ayacc unix version #compile library for alex and ayacc unix version
alexyacc/libalex.so:alexyacc/*.cpp alexyacc/libalex.so:alexyacc/*.cpp
cd alexyacc && make libalex.so cd alexyacc && make libalex.so
alexyacc/libalex.a:alexyacc/*.cpp alexyacc/libalex.a:alexyacc/*.cpp
cd alexyacc && make libalex.a cd alexyacc && make libalex.a
#ifeq ($(UNAME),Darwin) #ifeq ($(UNAME),Darwin)
boost/program_options.a:boost/*.cpp boost/program_options.a:boost/*.cpp
cd boost && make program_options.a cd boost && make program_options.a
#endif #OS #endif #OS
#compile libeasea #compile libeasea
libeasea/libeasea.a:libeasea/*.cpp libeasea/libeasea.a:libeasea/*.cpp
cd libeasea && make libeasea.a cd libeasea && make libeasea.a
clean: clean:
rm -f build/*.o $(EXEC) $(EXEC)_bin rm -f build/*.o $(EXEC) $(EXEC)_bin
cd alexyacc && make clean cd alexyacc && make clean
cd libeasea && make clean cd libeasea && make clean
cd boost && make clean cd boost && make clean
#ifeq ($(UNAME),Darwin) #ifeq ($(UNAME),Darwin)
cd boost && make clean cd boost && make clean
#endif #endif
#install:$(EXEC) #install:$(EXEC)
# sudo cp $< /usr/bin/dev-easea # sudo cp $< /usr/bin/dev-easea
#ifeq ($(UNAME),Linux) #ifeq ($(UNAME),Linux)
#realclean: clean #realclean: clean
# rm -f EaseaParse.cpp EaseaParse.h EaseaLex.cpp EaseaLex.h # rm -f EaseaParse.cpp EaseaParse.h EaseaLex.cpp EaseaLex.h
# AT commented these lines, because they imply the presence of wine + programs in a specific location # AT commented these lines, because they imply the presence of wine + programs in a specific location
#EaseaParse.cpp: EaseaParse.y #EaseaParse.cpp: EaseaParse.y
# wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ayacc.exe $< -Tcpp -d # wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ayacc.exe $< -Tcpp -d
#EaseaLex.cpp: EaseaLex.l #EaseaLex.cpp: EaseaLex.l
# wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ALex.exe $< -Tcpp -i # wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ALex.exe $< -Tcpp -i
#endif #endif
...@@ -169,7 +169,7 @@ return NbMut; ...@@ -169,7 +169,7 @@ return NbMut;
\end \end
\Default run parameters : // Please let the parameters appear in this order \Default run parameters : // Please let the parameters appear in this order
Number of generations : 100 // NB_GEN Number of generations : 35 // NB_GEN
Time limit: 0 // In seconds, 0 to deactivate Time limit: 0 // In seconds, 0 to deactivate
Population size : 2048 //POP_SIZE Population size : 2048 //POP_SIZE
Offspring size : 2048 // 40% Offspring size : 2048 // 40%
...@@ -191,7 +191,7 @@ return NbMut; ...@@ -191,7 +191,7 @@ return NbMut;
Generate R script:false Generate R script:false
Plot stats:true //Default: 0 Plot stats:true //Default: 0
Remote island model: true Remote island model: false
IP file: ip.txt //File containing all the remote island's IP IP file: ip.txt //File containing all the remote island's IP
Server port : 2929 Server port : 2929
Migration probability: 0.33 Migration probability: 0.33
......
...@@ -26,6 +26,8 @@ if [ "$1" = "local" ]; then ...@@ -26,6 +26,8 @@ if [ "$1" = "local" ]; then
echo "Exporting and setting environment variables" echo "Exporting and setting environment variables"
export EZ_PATH="$PWD/" export EZ_PATH="$PWD/"
export PATH="$PATH:$PWD/bin" export PATH="$PATH:$PWD/bin"
echo >> $PROFILE
echo "# EASEA paths for compiler and library">> $PROFILE
echo "export EZ_PATH=$EZ_PATH">>$PROFILE echo "export EZ_PATH=$EZ_PATH">>$PROFILE
echo "export PATH=\$PATH:$PWD/bin" >>$PROFILE echo "export PATH=\$PATH:$PWD/bin" >>$PROFILE
...@@ -36,6 +38,8 @@ else ...@@ -36,6 +38,8 @@ else
echo "Exporting and setting environment variables" echo "Exporting and setting environment variables"
export EZ_PATH="/usr/local/easea/" export EZ_PATH="/usr/local/easea/"
export PATH="$PATH:/usr/local/easea/bin" export PATH="$PATH:/usr/local/easea/bin"
echo >> $PROFILE
echo "# EASEA paths for compiler and library">> $PROFILE
echo "export EZ_PATH=$EZ_PATH">>$PROFILE echo "export EZ_PATH=$EZ_PATH">>$PROFILE
echo "export PATH=\$PATH:/usr/local/easea/bin" >>$PROFILE echo "export PATH=\$PATH:/usr/local/easea/bin" >>$PROFILE
......
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