[BACK]Return to Makefile CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/Makefile between versions 1.63 and 1.80

version 1.63, 2015/08/18 23:17:28 version 1.80, 2016/02/19 09:28:06
Line 1 Line 1
 #Version has to be set in ../CMakeLists.txt too.  #Version has to be set in ../CMakeLists.txt too.
 VERSION=0.98q5  #VERSION=0.98r2
   #VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`)
   VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" }  { print $$3 }'`)
   OSTYPE = $(shell echo $$OSTYPE)
 # DRIVEG is for VirtualBox Windows 64bit   # DRIVEG is for VirtualBox Windows 64bit 
 DRIVEG=g:  DRIVEG=f:
 #DIRG is the corresponding build directory for Virtual Windows  #DIRG is the corresponding build directory for Virtual Windows
 DIRG=\imach\cvs\imach\build  DIRG=\imach\cvs\imach\build
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015  COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
Line 12  IMACHSETUPVERSION=icl Line 15  IMACHSETUPVERSION=icl
 #       Linux  #       Linux
 # make _linux=1 imachopt  # make _linux=1 imachopt
 # make _linux=1 imach  # make _linux=1 imach
 # cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM  # make _linux=1 imachrpm
   # cd to build/gnulinux ; cmake ../..; cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM
 # make _linux32onosx=1 imachopt  # make _linux32onosx=1 imachopt
 # make _linux64onosx=1 imachopt  # make _linux64onosx=1 imachopt
   
Line 50  IMACHSETUPVERSION=icl Line 54  IMACHSETUPVERSION=icl
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach
 TESTFILE=$(HOME)/Documents/Recherches/REVES/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach
   #TESTFILE=$(HOME)//Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3c.imach
   #TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Yao/rhrs-yao-test-back.imach
   #TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
   #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
   TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/saito-12-feb-2016/rHRS_relig_import_M_NB.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.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  #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v  #CC= gcc -v
Line 243  TMPSCRIPTIN=setup.iss.in Line 254  TMPSCRIPTIN=setup.iss.in
 APPLICATION=IMaCh  APPLICATION=IMaCh
 APPNAME=$(APPLICATION)-$(VERSION)  APPNAME=$(APPLICATION)-$(VERSION)
 APPCOMPILATIONMODE=$(IMACHSETUPVERSION)  APPCOMPILATIONMODE=$(IMACHSETUPVERSION)
 GNUPLOTVERSION=4.6  GNUPLOTVERSION=5.1
 LICENSE=Copying  LICENSE=Copying
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe  TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe  TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe
Line 310  imachICL-build: imach.c Line 321  imachICL-build: imach.c
 #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"  #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe  #  /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.  # 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   
   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 
         pwd          pwd
         touch setup.iss.in          touch setup.iss.in
         $(SETUPCOMP) /cc setup.iss          $(SETUPCOMP) /cc setup.iss
Line 332  imachICL64-noreg-setup: IMaCh-icl64-$(VE Line 344  imachICL64-noreg-setup: IMaCh-icl64-$(VE
         cp ../distributions/windows/mybuildicl64.bat ../build/icl64/          cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
         cd ../build/icl64          cd ../build/icl64
         VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \          VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
         --username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"   --username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR"
   
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR" 
   #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
   #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
   #       --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
   
 ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat  ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
         rm -rf ../build/icl32 && mkdir -p ../build/icl32          rm -rf ../build/icl32 && mkdir -p ../build/icl32
         cp ../distributions/windows/mybuildicl32.bat ../build/icl32/          cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
         cd ../build/icl32          cd ../build/icl32
         VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \          VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
         --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"    --username brouard  --verbose --wait-exit --wait-stdout -- "/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)"
   
 ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat  ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
         rm -rf ../build/vs32 && mkdir -p ../build/vs32          rm -rf ../build/vs32 && mkdir -p ../build/vs32
         cp mybuildvs32.bat ../build/vs32/          cp mybuildvs32.bat ../build/vs32/
         cd ../build/vs32          cd ../build/vs32
         VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \          VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
         --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"          --username brouard  --verbose  --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
 # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"  # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"
 #WORK   --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"  #WORK   --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"
 #       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"  #       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"
Line 456  ifdef _linux64onosx Line 479  ifdef _linux64onosx
         (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)          (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif  endif
   
 imachopt.o : imach.c  imachopt.o : imach.c version.h
         $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c          $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
 #       $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c  #       $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
   
 imachUB : imach32 imach64  imachUB : imach32 imach64
         lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)          lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)
   
   imachrpm : imachopt.o 
           pwd
           (cd ../build && rm -r gnulinux && mkdir gnulinux && cd gnulinux ;\
           pwd ;\
           cmake ../..;\
           cmake --build . ; \
           echo $(OSTYPE);\
           cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM;\
           cp  imach-$(VERSION)-*.rpm ../../src/Output/ ;)
   
 #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf  #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
 imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf  #       $(CC) $(LFLAGSOPT) -o imach imachopt.o
         $(CC) $(LFLAGSOPT) -o imach imachopt.o  
         #hdiutil detach /Volumes/IMaCh\ $(VERSION)          #hdiutil detach /Volumes/IMaCh\ $(VERSION)
         rm -rf imach$(VERSION).app  #       cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
         mkdir -p imach$(VERSION).app  
         mkdir -p imach$(VERSION).app/Contents  imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg3.sh ../distributions/osx/applet ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns ../distributions/osx/main.scpt.in ../distributions/osx/IMaCh-ecrandemarrage.rsrc ../distributions/osx/TXT.rtf
         mkdir -p imach$(VERSION).app/Contents/MacOS          pwd
         cp applet imach$(VERSION).app/Contents/MacOS          (cd ../build && rm -r osx && mkdir osx && cd osx ;\
         mkdir -p imach$(VERSION).app/Contents/Resources          pwd ;\
         mkdir -p imach$(VERSION).app/Contents/Resources/Scripts          cmake ../..;\
         mkdir -p imach$(VERSION).app/Contents/Resources/bin          cmake --build . ; \
         mkdir -p imach$(VERSION).app/Contents/Resources/html          echo $(OSTYPE);\
         cp imach imach$(VERSION).app/Contents/Resources/bin          rm -rf imach$(VERSION).app;\
         cp gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot          mkdir -p imach$(VERSION).app;\
         mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd          mkdir -p imach$(VERSION).app/Contents;\
         cp -p TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd          mkdir -p imach$(VERSION).app/Contents/MacOS;\
         $(SED) -e "s/@VERSION@/$(VERSION)/g;" \          cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\
         IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist          mkdir -p imach$(VERSION).app/Contents/Resources;\
         cp -p IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo          mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
         cp -p IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns          mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
         cp -r -p main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt          mkdir -p imach$(VERSION).app/Contents/Resources/lib;\
         cp IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc          mkdir -p imach$(VERSION).app/Contents/Resources/html;\
         cp ../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html          cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
         cp ../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html          cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
         cp ../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html          cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
         rm -f imach$(VERSION).dmg          mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
         ./createdmg3.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)          cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
         mv  imach$(VERSION).dmg Output/          $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
 #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app          cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\
           cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns ;\
           cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\
           cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\
           cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html ;\
           cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html ;\
           cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html ;\
           rm -f imach$(VERSION).dmg ;\
           pwd ;\
           cp ../../distributions/osx/createdmg3.sh . ;\
           cp ../../distributions/osx/Background.png .;\
           pwd ;\
           ./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
           cp  imach$(VERSION).dmg ../../src/Output/ ;)
   #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)  #       ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
   
 md5:  md5:
         ls Output/* | xargs md5sum          ls Output/* | xargs md5sum
 upload:  upload:
         rsync -v Output/IMaCh-0.98q4-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download  #       rsync -v Output/imach-0.98r4-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
         rsync -v Output/imach0.98q4.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download  #       rsync -v Output/IMaCh-0.99a3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   #       rsync -v Output/imach0.99a3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
           rsync -v Output/IMaCh-0.98r7-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
           rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #       rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download  #       rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   
 imachcyg : imachcyg.o  imachcyg : imachcyg.o
Removed from v.1.63  
changed lines
  Added in v.1.80

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>