--- imach/src/Makefile 2019/05/21 15:55:06 1.85 +++ imach/src/Makefile 2022/03/15 18:40:36 1.89 @@ -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-2016 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-18 +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 IMACHSETUPVERSION=icl # This is for Windows only #IMACHSETUPVERSION=mvc @@ -30,7 +30,14 @@ IMACHSETUPVERSION=icl # 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 +# sudo xlcem make _windowsonosx=1 imachICL64-setup +# and then +# On Emacs make _windowonosx=1 imachICL-set (and not imachICL-setup) + # 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 # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl # make _windowsonosx=1 imachMVC-noreg-setup # @@ -67,7 +74,8 @@ IMACHSETUPVERSION=icl #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2b4V4V3V5.imach #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.imach +TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb-r18.imach #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 @@ -329,7 +337,7 @@ 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-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat 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 $(SETUPCOMP) /cc setup.iss @@ -367,6 +375,10 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VE cd ../build/icl32 VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \ --username brouard --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)" +# VBoxManage startvm "Windows7-64" --type headless +# VBoxManage list runningvms +# sudo xlcem VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \ +# --username brouard --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)" #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \ # --username brouard --verbose --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)" @@ -388,7 +400,7 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VE imachICL64-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat -imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl32.bat +imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl32.bat imachVS32-setup: ../build/vs32/Release/IMaCh-$(VERSION).exe setup.iss mybuildvs32.bat @@ -423,7 +435,7 @@ ifdef _macosx endif imach: imach.o - $(CC) $(LFLAGS) -o imach imach.o + $(CC) -o imach $(LFLAGS) imach.o ifdef _macosx $(DSYMUTIL) imach endif @@ -690,6 +702,8 @@ imachdmg : imachopt.o ../distributions/o mkdir -p imach$(VERSION).app/Contents/Resources/bin;\ mkdir -p imach$(VERSION).app/Contents/Resources/lib;\ 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 IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\ 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;\ @@ -702,6 +716,11 @@ imachdmg : imachopt.o ../distributions/o cp ../../html/doc/biaspar.log imach$(VERSION).app/Contents/Resources/doc ;\ cp ../../html/doc/biaspar.imach imach$(VERSION).app/Contents/Resources/doc ;\ cp ../../src/README.txt imach$(VERSION).app/Contents/Resources/doc ;\ + cp ../../tests/testV1V2.imach imach$(VERSION).app/Contents/Resources/tests ;\ + cp ../../tests/rtestV1V2.imach imach$(VERSION).app/Contents/Resources/tests ;\ + cp ../../tests/testV2.imach imach$(VERSION).app/Contents/Resources/tests ;\ + cp ../../tests/rtestV2.imach imach$(VERSION).app/Contents/Resources/tests ;\ + cp ../../tests/data/data2.txt imach$(VERSION).app/Contents/Resources/tests/data ;\ rm -f imach$(VERSION).dmg ;\ pwd ;\ cp ../../distributions/osx/createdmg4.sh . ;\ @@ -722,8 +741,18 @@ upload: # rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download # rsync -v Output/imach-0.99r9-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download # rsync -v Output/imach0.99r9.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download - rsync -v Output/imach-0.99r18-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download - rsync -v Output/imach0.99r18.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r19-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach0.99r19.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r21-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach0.99r21.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach-0.99r22-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# rsync -v Output/imach0.99r22.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download +# 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/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