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

Diff for /imach/src/Makefile between versions 1.81 and 1.83

version 1.81, 2018/02/21 07:58:13 version 1.83, 2018/12/05 16:12:50
Line 1 Line 1
 #Version has to be set in ../CMakeLists.txt too.  #Version has to be set in ../CMakeLists.txt too.
 #VERSION=0.98r2  #VERSION=0.98r6
 #VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`)  #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 }'`)  VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" }  { print $$3 }'`)
 OSTYPE = $(shell echo $$OSTYPE)  OSTYPE = $(shell echo $$OSTYPE)
Line 65  IMACHSETUPVERSION=icl Line 65  IMACHSETUPVERSION=icl
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-0.98r-powellf1f3linmnb-zeroes.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-0.98r-powellf1f3linmnb-zeroes.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2V4V3V5.imach  #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2V4V3V5.imach
 #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/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 619  ifdef _intel64onosx Line 620  ifdef _intel64onosx
 endif  endif
 ifdef _macosx  ifdef _macosx
         $(STRIP) imach          $(STRIP) imach
           $(STRIP) imachopt
 endif  endif
 ifdef _linux32onosx  ifdef _linux32onosx
         (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)
Line 649  imachrpm : imachopt.o Line 651  imachrpm : 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;\  #       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/createdmg4.sh ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns  ../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 ;\
Line 660  imachdmg : imachopt.o ../distributions/o Line 662  imachdmg : imachopt.o ../distributions/o
         mkdir -p imach$(VERSION).app;\          mkdir -p imach$(VERSION).app;\
         mkdir -p imach$(VERSION).app/Contents;\          mkdir -p imach$(VERSION).app/Contents;\
         mkdir -p imach$(VERSION).app/Contents/MacOS;\          mkdir -p imach$(VERSION).app/Contents/MacOS;\
         cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\          cp ../../distributions/osx/imach imach$(VERSION).app/Contents/MacOS;\
         mkdir -p imach$(VERSION).app/Contents/Resources;\          mkdir -p imach$(VERSION).app/Contents/Resources;\
         mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\          mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
         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/html;\          mkdir -p imach$(VERSION).app/Contents/Resources/doc;\
         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 673  imachdmg : imachopt.o ../distributions/o Line 675  imachdmg : imachopt.o ../distributions/o
         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 ;\
         cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\          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 -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/IMaCh.icns ;\
         cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\          cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\          cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html ;\          cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html ;\          cp ../../src/README.txt  imach$(VERSION).app/Contents/Resources/doc ;\
         cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html ;\  
         rm -f imach$(VERSION).dmg ;\          rm -f imach$(VERSION).dmg ;\
         pwd ;\          pwd ;\
         cp ../../distributions/osx/createdmg3.sh . ;\          cp ../../distributions/osx/createdmg4.sh . ;\
         cp ../../distributions/osx/Background.png .;\          cp ../../distributions/osx/Background.png .;\
         pwd ;\          pwd ;\
         ./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\          ./createdmg4.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
         cp  imach$(VERSION).dmg ../../src/Output/ ;)          cp  imach$(VERSION).dmg ../../src/Output/ ;)
 #       ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app   #       ./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)
Line 699  upload: Line 700  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.99r14-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download          rsync -v Output/imach-0.99r16-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
         rsync -v Output/imach0.99r14.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download          rsync -v Output/imach0.99r16.dmg 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.81  
changed lines
  Added in v.1.83

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