--- imach/src/Makefile 2022/03/15 18:40:36 1.89 +++ imach/src/Makefile 2022/08/31 10:29:08 1.90 @@ -7,7 +7,7 @@ OSTYPE = $(shell echo $$OSTYPE) DRIVEG=f: #DIRG is the corresponding build directory for Virtual Windows DIRG=\imach\cvs\imach\build -COPYRIGHT=Copyright (C) 2002-2019 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-19 +COPYRIGHT=Copyright (C) 2002-2022 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-19 IMACHSETUPVERSION=icl # This is for Windows only #IMACHSETUPVERSION=mvc @@ -29,12 +29,20 @@ IMACHSETUPVERSION=icl # make _macosx=1 imachopt # valgrind --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach -# Windows -# sudo xlcem make _windowsonosx=1 imachICL32-setup +# Windows should be started on VirtualBox and both 32 and 64 commands should be made +# xlcem is year month delay, doing the command make on the username and not on root +# on emacs shell: # sudo xlcem make _windowsonosx=1 imachICL64-setup -# and then -# On Emacs make _windowonosx=1 imachICL-set (and not imachICL-setup) - +# ls -l ../build/icl64/Release/ +# sudo xlcem make _windowsonosx=1 imachICL32-setup +# ls -l ../build/icl32/Release/ +# and then F: should be mounted on ~/Documents +# For an unknown reason, the exe file on /Documents/imach/cvs/imach/build/icl64/Release~or icl32 are not recognized by make which deletes +# previous work and imachICL-set +# has to be done manually: SETUPCOMP=~/bin/InnoSetup5Playonmac +# and $SETUPCOMP /cc setup.iss +# or on Emacs make _windowsonosx=1 imachICL-set (and not imachICL-setup) +# sudo date -u 082109552022 # make _windowsonosx=1 imachICL-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel # make _windowsonosx=1 imachICL64-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel # make _windowsonosx=1 imachICL32-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel @@ -75,21 +83,32 @@ IMACHSETUPVERSION=icl #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/Vn1b.imach #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Saito-PAA-2018/rrLvngArrgJapan-two-1b.imach #TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb.imach -TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb-r18.imach +#TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb-r18.imach +TESTFILE=$(HOME)/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/para3_testNB.imach +#TESTFILE=$(HOME)/home/brouard/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/rrrpara3_testNB30b.imach +# Two testfiles which should give similar results with V1=1 whatever V2 and V3. +#TESTFILE=$(HOME)/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/female_sample/para_femaleNBV2V3sexW0-ter.imach +TESTFILE=$(HOME)/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/rrpara3_testNB30sexW0-ter.htm #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/rrrV4V3V5-suite6.imach #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach #CC= gcc -v CC=$(GCC) +CCOPT=$(GCCOPT) GCC= gcc +GCCOPT= gcc ifdef _macosx +GCC= gcc-11 +GCCOPT= gcc # Mac OS/X version LFLAGS= -g -lm #CFLAGS= -g -DDEBUG CFLAGS= -g -LFLAGSOPT= -O3 -lm +LFLAGSOPT= -O3 -lm CFLAGSOPT= -O3 +# LFLAGSOPT= -O2 -lm # seems to be less effective than O3 +# CFLAGSOPT= -O2 CP= cp CROSSCOMPILATION= -DCROSS=0 UNIX2DOS= echo "Unix2dos " @@ -337,9 +356,12 @@ imachICL-build: imach.c # /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe # both 32 and 64 executables should have been built on Windows with Intel compiler. -imachICL-set: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss setup.iss +imachICL-set: ../build/icl64/Release/imach-$(VERSION).exe ../build/icl32/Release/imach-$(VERSION).exe setup.iss setup.iss pwd touch setup.iss.in + echo SETUPCOMP=$(SETUPCOMP) + echo STRIP= $(STRIP) + echo BINVERSION= $(BINVERSION) $(SETUPCOMP) /cc setup.iss $(CP) Output/$(TMPSETUPEXE) imachICL-setup @@ -626,7 +648,7 @@ imachBOBYQAopt.o : imach.c # $(CC) $(LFLAGSOPT) -o imachback imachback.o imachopt : imachopt.o - $(CC) $(LFLAGSOPT) -o imachopt imachopt.o + $(CCOPT) $(LFLAGSOPT) -o imachopt imachopt.o ln -f imachopt imach $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) $(CP) -f imach ../bin @@ -654,7 +676,7 @@ imachback.o : imachback.c version.h $(CC) $(CFLAGS) $(CROSSCOMPILATION) -c $< imachopt.o : imach.c version.h - $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c + $(CCOPT) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c # $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c imachUB : imach32 imach64 @@ -692,11 +714,11 @@ imachdmg : imachopt.o ../distributions/o cmake ../..;\ cmake --build . ; \ echo $(OSTYPE);\ + echo $(VERSION);\ rm -rf imach$(VERSION).app;\ mkdir -p imach$(VERSION).app;\ mkdir -p imach$(VERSION).app/Contents;\ mkdir -p imach$(VERSION).app/Contents/MacOS;\ - cp ../../distributions/osx/imach imach$(VERSION).app/Contents/MacOS;\ mkdir -p imach$(VERSION).app/Contents/Resources;\ mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\ mkdir -p imach$(VERSION).app/Contents/Resources/bin;\ @@ -704,7 +726,9 @@ imachdmg : imachopt.o ../distributions/o mkdir -p imach$(VERSION).app/Contents/Resources/doc;\ mkdir -p imach$(VERSION).app/Contents/Resources/tests;\ mkdir -p imach$(VERSION).app/Contents/Resources/tests/data;\ + cp ../../distributions/osx/imach.sh imach$(VERSION).app/Contents/MacOS;\ cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\ + cp ../../distributions/osx/imach-run.sh imach$(VERSION).app/Contents/Resources/bin;\ cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\ cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\ mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\ @@ -750,11 +774,23 @@ upload: # rsync -v Output/imach-0.99r23-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download # rsync -v Output/imach0.99r23.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download # rsync -v Output/imach-0.99r24-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download -# rsync -v Output/imach0.99r24.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download - rsync -v Output/imach-0.99r24-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach0.99r24.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r24-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach0.99r25.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r25-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r25-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach0.99r27.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v brouard@brouard.name:~/Documents/imach/cvs/imach/build/gnulinux/imach-0.99r33-1.x86_64.rpm Output/ +# rsync -v Output/imach-0.99r33-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r33-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach0.99r26.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r26-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r26-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download # rsync -v Output/imach-0.99r19-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download # rsync -v Output/imach0.99r12-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download # rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download + rsync -v Output/imach-0.99r34-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download + rsync -v Output/imach0.99r34.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download imachcyg : imachcyg.o $(CC) $(LFLAGS) -o imach imachcyg.o