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

Diff for /imach/src/Makefile between versions 1.84 and 1.88

version 1.84, 2019/05/09 15:19:47 version 1.88, 2019/05/28 14:01:27
Line 7  OSTYPE = $(shell echo $$OSTYPE) Line 7  OSTYPE = $(shell echo $$OSTYPE)
 DRIVEG=f:  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-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  IMACHSETUPVERSION=icl
 # This is for Windows only  # This is for Windows only
 #IMACHSETUPVERSION=mvc  #IMACHSETUPVERSION=mvc
Line 67  IMACHSETUPVERSION=icl Line 67  IMACHSETUPVERSION=icl
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2b4V4V3V5.imach  #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/Yao/Yao-19-jan-2016/Vn1b.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Saito-PAA-2018/rrLvngArrgJapan-two-1b.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/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-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
Line 423  ifdef _macosx Line 424  ifdef _macosx
 endif  endif
   
 imach: imach.o   imach: imach.o 
         $(CC) $(LFLAGS) -o imach imach.o          $(CC)  -o imach $(LFLAGS) imach.o
 ifdef _macosx  ifdef _macosx
         $(DSYMUTIL) imach          $(DSYMUTIL) imach
 endif  endif
Line 655  imachrpm : imachopt.o Line 656  imachrpm : imachopt.o
         cmake ../..;\          cmake ../..;\
         cmake --build . ; \          cmake --build . ; \
         echo $(OSTYPE);\          echo $(OSTYPE);\
         cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM;\          cpack  --debug --verbose -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM;\
           cp  imach-$(VERSION)-*.rpm ../../src/Output/ ;)
   
   imachsrcrpm : imachopt.o 
           pwd
           (cd ../build && rm -r gnulinux && mkdir gnulinux && cd gnulinux ;\
           pwd ;\
           cmake ../..;\
           cmake --build . ; \
           echo $(OSTYPE);\
           cpack --debug --verbose -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM --config ./CPackSourceConfig.cmake;\
         cp  imach-$(VERSION)-*.rpm ../../src/Output/ ;)          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
Line 680  imachdmg : imachopt.o ../distributions/o Line 691  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/lib;\          mkdir -p imach$(VERSION).app/Contents/Resources/lib;\
         mkdir -p imach$(VERSION).app/Contents/Resources/doc;\          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 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/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
         cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\          cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
Line 692  imachdmg : imachopt.o ../distributions/o Line 705  imachdmg : imachopt.o ../distributions/o
         cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/doc ;\          cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../html/doc/biaspar.imach  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 ../../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 ;\          rm -f imach$(VERSION).dmg ;\
         pwd ;\          pwd ;\
         cp ../../distributions/osx/createdmg4.sh . ;\          cp ../../distributions/osx/createdmg4.sh . ;\
Line 712  upload: Line 730  upload:
 #       rsync -v Output/imach0.98r7.dmg 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/imach-0.99r9-icl-setup.exe 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/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/imach-0.99r19-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/imach0.99r19.dmg 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/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  #       rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
   
Removed from v.1.84  
changed lines
  Added in v.1.88

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