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

Diff for /imach/src/Makefile between versions 1.68 and 1.73

version 1.68, 2015/09/09 16:54:10 version 1.73, 2015/10/27 19:51:42
Line 1 Line 1
 #Version has to be set in ../CMakeLists.txt too.  #Version has to be set in ../CMakeLists.txt too.
 VERSION=0.98q6  #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 51  IMACHSETUPVERSION=icl Line 54  IMACHSETUPVERSION=icl
 #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/ADL0w_V2c.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 244  TMPSCRIPTIN=setup.iss.in Line 248  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 311  imachICL-build: imach.c Line 315  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 457  ifdef _linux64onosx Line 461  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
   
Line 468  imachUB : imach32 imach64 Line 472  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
 #       $(CC) $(LFLAGSOPT) -o imach imachopt.o  #       $(CC) $(LFLAGSOPT) -o imach imachopt.o
         #hdiutil detach /Volumes/IMaCh\ $(VERSION)          #hdiutil detach /Volumes/IMaCh\ $(VERSION)
   #       cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
   
 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  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
         pwd          pwd
         (cd ../build && rm -r osx && mkdir osx && cd osx ;\          (cd ../build && rm -r osx && mkdir osx && cd osx ;\
         pwd ;\          pwd ;\
         cmake ../..;\          cmake ../..;\
         cmake --build . ; \          cmake --build . ; \
           echo $(OSTYPE);\
         rm -rf imach$(VERSION).app;\          rm -rf imach$(VERSION).app;\
         mkdir -p imach$(VERSION).app;\          mkdir -p imach$(VERSION).app;\
         mkdir -p imach$(VERSION).app/Contents;\          mkdir -p imach$(VERSION).app/Contents;\
Line 484  imachdmg : imachopt.o ../distributions/o Line 491  imachdmg : imachopt.o ../distributions/o
         mkdir -p imach$(VERSION).app/Contents/Resources/bin;\          mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
         mkdir -p imach$(VERSION).app/Contents/Resources/html;\          mkdir -p imach$(VERSION).app/Contents/Resources/html;\
         cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\          cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
         cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\          cp ../../distributions/osx/gnuplot_bin/gnuplot_5_1_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
         mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\          mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
         cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\          cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
         $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\          $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
Line 508  imachdmg : imachopt.o ../distributions/o Line 515  imachdmg : imachopt.o ../distributions/o
 md5:  md5:
         ls Output/* | xargs md5sum          ls Output/* | xargs md5sum
 upload:  upload:
         rsync -v Output/IMaCh-0.98q6-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download          rsync -v Output/IMaCh-0.98r2-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
         rsync -v Output/imach0.98q6.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download          rsync -v Output/imach0.98r2.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.68  
changed lines
  Added in v.1.73

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