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

Diff for /imach/src/Makefile between versions 1.59 and 1.72

version 1.59, 2015/04/29 09:11:01 version 1.72, 2015/09/30 18:35:53
Line 1 Line 1
 VERSION=0.98q1  #Version has to be set in ../CMakeLists.txt too.
   #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=f:
   #DIRG is the corresponding build directory for Virtual Windows
   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
 IMACHSETUPVERSION=ilc # This is for Windows only  IMACHSETUPVERSION=icl
   # This is for Windows only
 #IMACHSETUPVERSION=mvc  #IMACHSETUPVERSION=mvc
   
 #       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 _linux32onosx=1 imachopt  # make _linux32onosx=1 imachopt
 # make _linux64onosx=1 imachopt  # make _linux64onosx=1 imachopt
   
 #       OS/X  #       OS/X
   # make _macosx=1 imachdmg
 # make _intel64onosx=1 imachopt  # make _intel64onosx=1 imachopt
 # make _intel32onosx=1 imachopt  # make _intel32onosx=1 imachopt
 # make _intelUNBonosx=1 imachdmg # Not implemented (not useful)  # make _intelUNBonosx=1 imachdmg # Not implemented (not useful)
 # make _macosx=1 imach  # make _macosx=1 imach
 # make _macosx=1 imachopt  # make _macosx=1 imachopt
 # make _macosx=1 imachdmg  
 #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach  #  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  #        Windows
 # make _windowsonosx=1 imachILC-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel  # make _windowsonosx=1 imachICL-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
 # make _windowsonosx=1 imachILC64-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-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make _windowsonosx=1 imachMVC-noreg-setup  # make _windowsonosx=1 imachMVC-noreg-setup
 #  #
Line 45  IMACHSETUPVERSION=ilc # This is for Wind Line 53  IMACHSETUPVERSION=ilc # This is for Wind
 #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/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 299  imachcyg-noreg-setup: imachcygopt.exe no Line 309  imachcyg-noreg-setup: imachcygopt.exe no
         $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe          $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe
         $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)          $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
         cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup          cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup
   # ICL compiler 64
   imachICL-build: imach.c
           icl /GS /W3 /Zc:wchar_t /O2  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /Qipo /Zc:forScope  /MT 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"
   #  /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.
 imachILC-setup: IMaCh-ilc64-$(VERSION).exe IMaCh-ilc32-$(VERSION).exe setup.iss  imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat 
         pwd          pwd
           touch setup.iss.in
         $(SETUPCOMP) /cc setup.iss          $(SETUPCOMP) /cc setup.iss
         $(CP) Output/$(TMPSETUPEXE) imachILC-setup          $(CP) Output/$(TMPSETUPEXE) imachICL-setup
   
 imachILC64-setup: IMaCh-ilc64-$(VERSION).exe setup.iss  # imachICL64-setup: IMaCh-icl64-$(VERSION).exe setup.iss
         pwd  #       pwd
         $(CP) IMaCh-ilc64-$(VERSION).exe imach.exe  #       $(CP) IMaCh-icl64-$(VERSION).exe imach.exe
         $(SETUPCOMP) /cc setup.iss  #       $(SETUPCOMP) /cc setup.iss
         $(CP) Output/$(TMPSETUPEXE) imachILC64-setup  #       $(CP) Output/$(TMPSETUPEXE) imachICL64-setup
   
 imachILC64-noreg-setup: IMaCh-ilc64-$(VERSION).exe noreg-setup.iss  imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
         touch setup.iss.in          touch setup.iss.in
         $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)          $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
         $(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup          $(CP) Output/$(TMPSETUPEXE) imachICL64-noreg-setup
   
 imachILC32-setup: IMaCh-ilc32-$(VERSION).exe setup.iss  ../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl64.bat
         touch setup.iss.in          rm -rf ../build/icl64  && mkdir ../build/icl64
         $(CP) IMaCh-ilc32-$(VERSION).exe imach.exe          cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
         $(SETUPCOMP) /cc setup.iss          cd ../build/icl64
         $(CP) Output/$(TMPSETUPEXE) imachILC32-setup          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)"
   
   ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
           rm -rf ../build/icl32 && mkdir -p ../build/icl32
           cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
           cd ../build/icl32
           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)"
   
   ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
           rm -rf ../build/vs32 && mkdir -p ../build/vs32
           cp mybuildvs32.bat ../build/vs32/
           cd ../build/vs32
           VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
           --username brouard  --verbose --wait-exit --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"
   #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-xp  &&" "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat" "&&" "C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" "ia32" "vs2013" "&&" "msbuild imach-0.98q3.vcxproj /t:Build /p:Configuration=Release"
   #       --username brouard --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32-xp\ &&C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K ""C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" ia32 vs2013"&& msbuild imach.vcxproj >c:\users\brouard\totog.txt"
   #               --username brouard --wait-exit --wait-stdout -- "/c" "g: && dir >c:\users\brouard\totog.txt"
   #C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K ""C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" ia32 vs2013"
   #C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K ""C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" intel64 vs2013"
   
   imachICL64-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat
   
 imachILC32-noreg-setup: IMaCh-ilc32.exe noreg-setup.iss  imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl32.bat
   
   imachVS32-setup: ../build/vs32/Release/IMaCh-$(VERSION).exe setup.iss mybuildvs32.bat
   
   imachICL32-noreg-setup: IMaCh-icl32.exe noreg-setup.iss
         touch setup.iss.in          touch setup.iss.in
         $(CP) IMaCh-ilc32.exe imach.exe          $(CP) IMaCh-icl32.exe imach.exe
         $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)          $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
         $(CP) Output/$(TMPSETUPEXE) imachILC32-noreg-setup          $(CP) Output/$(TMPSETUPEXE) imachICL32-noreg-setup
   
 imachMVC-setup: imachMVC.exe setup.iss  imachMVC-setup: imachMVC.exe setup.iss
         touch setup.iss.in          touch setup.iss.in
Line 401  imachBOBYQAopt.o : imach.c Line 445  imachBOBYQAopt.o : imach.c
   
 imachopt : imachopt.o   imachopt : imachopt.o 
         $(CC) $(LFLAGSOPT) -o imachopt imachopt.o          $(CC) $(LFLAGSOPT) -o imachopt imachopt.o
 #       ln -f imachopt imach          ln -f imachopt imach
         $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)          $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
         $(CP) -f imach ../bin          $(CP) -f imach ../bin
 ifdef _intel64onosx  ifdef _intel64onosx
Line 426  imachUB : imach32 imach64 Line 470  imachUB : imach32 imach64
   
   
 #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  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          pwd
         mkdir -p imach$(VERSION).app/Contents          (cd ../build && rm -r osx && mkdir osx && cd osx ;\
         mkdir -p imach$(VERSION).app/Contents/MacOS          pwd ;\
         cp applet imach$(VERSION).app/Contents/MacOS          cmake ../..;\
         mkdir -p imach$(VERSION).app/Contents/Resources          cmake --build . ; \
         mkdir -p imach$(VERSION).app/Contents/Resources/Scripts          echo $(OSTYPE);\
         mkdir -p imach$(VERSION).app/Contents/Resources/bin          rm -rf imach$(VERSION).app;\
         mkdir -p imach$(VERSION).app/Contents/Resources/html          mkdir -p imach$(VERSION).app;\
         cp imach imach$(VERSION).app/Contents/Resources/bin          mkdir -p imach$(VERSION).app/Contents;\
         cp gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot          mkdir -p imach$(VERSION).app/Contents/MacOS;\
         mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd          cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\
         cp -p TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd          mkdir -p imach$(VERSION).app/Contents/Resources;\
         $(SED) -e "s/@VERSION@/$(VERSION)/g;" \          mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
         IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist          mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
         cp -p IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo          mkdir -p imach$(VERSION).app/Contents/Resources/html;\
         cp -p IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns          cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
         cp -r -p main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt          cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
         cp IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc          mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
         cp ../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html          cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
         cp ../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html          $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
         cp ../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html          cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\
         rm -f imach$(VERSION).dmg          cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns ;\
         ./createdmg3.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)          cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\
         mv  imach$(VERSION).dmg Output/          cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\
 #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app          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) ;\
           mv  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/* brouard@henry.ined.fr:/home/euroreves/html/imach/          rsync -v Output/IMaCh-0.98r0-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
           rsync -v Output/imach0.98r0.dmg 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
         $(CC) $(LFLAGS) -o imach imachcyg.o          $(CC) $(LFLAGS) -o imach imachcyg.o
Removed from v.1.59  
changed lines
  Added in v.1.72

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