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

Diff for /imach/src/Makefile between versions 1.61 and 1.62

version 1.61, 2015/05/05 08:54:59 version 1.62, 2015/08/04 07:17:13
Line 1 Line 1
 VERSION=0.98q2  VERSION=0.98q4
 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  IMACHSETUPVERSION=icl
 # This is for Windows only  # 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
   
Line 21  IMACHSETUPVERSION=ilc Line 21  IMACHSETUPVERSION=ilc
 #  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 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 299  imachcyg-noreg-setup: imachcygopt.exe no Line 299  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 mybuildicl64.bat mybuildicl32.bat
         pwd          pwd
         $(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 mybuildicl64.bat
         touch setup.iss.in          rm -rf ../build/icl64  && mkdir ../build/icl64
         $(CP) IMaCh-ilc32-$(VERSION).exe imach.exe          cp 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" "g:\imachcvs\NetBeans\imach\build\icl64\mybuildicl64.bat" "$(VERSION)"
   
   ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c mybuildicl32.bat
           rm -rf ../build/icl32 && mkdir -p ../build/icl32
           cp 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" "g:\imachcvs\NetBeans\imach\build\icl32\mybuildicl32.bat" "$(VERSION)"
   
   ../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
   
   imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl32.bat
   
   imachVS32-setup: ../build/vs32/Release/IMaCh-$(VERSION).exe setup.iss mybuildvs32.bat
   
 imachILC32-noreg-setup: IMaCh-ilc32.exe noreg-setup.iss  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 434  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 460  imachdmg : imachopt.o create-dmg applet Line 493  imachdmg : imachopt.o create-dmg applet
 md5:  md5:
         ls Output/* | xargs md5sum          ls Output/* | xargs md5sum
 upload:  upload:
         rsync -v Output/imach-0.98q2-ilc-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/          rsync -v Output/IMaCh-0.98q4-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/          rsync -v Output/imach0.98q4.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.61  
changed lines
  Added in v.1.62

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