--- imach/src/Makefile 2010/04/30 09:00:45 1.30 +++ imach/src/Makefile 2014/09/01 17:51:01 1.42 @@ -1,33 +1,54 @@ -VERSION=0.98m -COPYRIGHT=Copyright (C) 2002-2010 INED-EUROREVES-Institut de longevite +VERSION=0.98nY +COPYRIGHT=Copyright (C) 2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) IMACHSETUPVERSION=1 -# make _windowsonlinux=1 imachcygopt.exe -# make _windowsonlinux=1 imachcyg-setup (touch setup.iss.in) - +# Linux # make _linux=1 imachopt # make _linux=1 imach +# +# make _linux32onosx=1 imachopt +# make _linux64onosx=1 imachopt +# OS/X # make _macosx=1 imach # 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 # Windows +# make imachMVC-setup (touch setup.iss.in) +# make imachMVC-noreg-setup +# # make _windows=1 imachcyg # make _windows=1 imachcyg-setup (touch setup.iss.in) # make _windows=1 imachcyg-noreg-setup +# +# make _windowsonlinux=1 imachcyg-setup (touch setup.iss.in) +# make _windowsonlinux=1 imachcyg-noreg-setup +# +# make _windowscl=1 imachclopt + +# # sortie dans Output/setup.exe # ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32 ##SETUPCOMP= "C:\Program Files\Inno Setup 3\Compil32.exe" - +#TESTFILE=$$HOME/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach +TESTFILE=$(HOME)/Documents/Recherches/REVES/carol/carol-june2014/educadlmwt24.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 #CC= gcc -v CC=$(GCC) GCC= gcc ifdef _macosx # Mac OS/X version -LFLAGS= -O3 -lm -DUNIX -CFLAGS= -O3 -DUNIX +LFLAGS= -g -lm -DUNIX +CFLAGS= -g -DUNIX -DOSX +LFLAGSOPT= -O3 -lm -DUNIX +CFLAGSOPT= -O3 -DUNIX UNIX2DOS= echo "Unix2dos " +DSYMUTIL= dsymutil +STRIP= strip +BINVERSION=OSX # Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg # ./createdmg.sh imach imach098panther ./imach098Panther # ./createdmg.sh imach imach098leopard ./imach098Leopard @@ -46,6 +67,7 @@ LFLAGSOPT= -O3 -mno-cygwin CFLAGSOPT= -O3 -mno-cygwin UNIX2DOS= unix2dos CP= copy +BINVERSION=CYGWIN #SETUPCOMP= Compil32 ##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe" # cygwin SETUPCOMP= "C:\Program Files\Inno Setup 4\Compil32.exe" @@ -61,18 +83,69 @@ CFLAGSOPT= -O3 CP= cp UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" +BINVERSION=WINDOWSonLINUX +endif + +ifdef _windowsonosx +#GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc +# w64 outputs bigger executables +#GCC=/usr/local/cross-tools/bin/i686-w64-mingw32-gcc +GCC=/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-gcc-4.8.0 +STRIP=/usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-strip +LFLAGS= -g +CFLAGS= -g +LFLAGSOPT= -O3 -s +CFLAGSOPT= -O3 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +BINVERSION=WIN32onOSX +endif + +ifdef _windowscl +rem "C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvas32.bat" +endif + +ifdef _linux64onosx +GCC=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc +STRIP=/usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-strip +LFLAGS= -g +CFLAGS= -g +LFLAGSOPT= -O3 -lm -s +CFLAGSOPT= -O3 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +BINVERSION=linux-x86-64-bin +endif + +ifdef _linux32onosx +#GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc +# w64 outputs bigger executables +#GCC=/usr/local/cross-tools/bin/i686-w64-mingw32-gcc +GCC=/usr/local/gcc-4.8.1-for-linux32/bin/i586-pc-linux-gcc +STRIP=/usr/local/gcc-4.8.1-for-linux32/bin/i586-pc-linux-strip +LFLAGS= -g +CFLAGS= -g +LFLAGSOPT= -O3 -s -lm +CFLAGSOPT= -O3 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +BINVERSION=linux-i586-bin endif ifdef _linux #CFLAGS= -g -DUNIX -DDEBUGHESS -CFLAGS= -g -DUNIX -LFLAGS= -g -lm +CFLAGS= -g -DUNIX -DLINUX +LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas -CFLAGSOPT= -O3 -DUNIX -LFLAGSOPT= -O3 -lm +CFLAGSOPT= -O3 -DUNIX -DLINUX +LFLAGSOPT= -O3 -lm -s UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" +BINVERSION=LINUXnative endif SED= sed @@ -80,7 +153,6 @@ PACKAGE=imach PROGRAM=IMaCh - TMPSETUPSCRIPT=setup.iss TMPNOREGSETUPSCRIPT=noreg-setup.iss TMPSCRIPTIN=setup.iss.in @@ -89,10 +161,11 @@ APPNAME=$(APPLICATION)-$(VERSION) GNUPLOTVERSION=4.0 LICENSE=Copying TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe +TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe LICENSEFILE=$(LICENSE) INFOBEFOREFILE=README.txt -$(TMPSETUPSCRIPT): $(TMPSCRIPTIN) +setup.iss: setup.iss.in $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \ s/@NOTINNOREG@//g; \ s/@NOREG@//g; \ @@ -105,7 +178,7 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN) s/@DICTLANG@/$(DICTLANG)/g; \ s/@VERMAJOR@/$(VERMAJOR)/g; \ s/@COPYRIGHT@/$(COPYRIGHT)/g;" \ - $(TMPSCRIPTIN) > $(TMPSETUPSCRIPT) + setup.iss.in > setup.iss $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN) $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \ @@ -132,13 +205,32 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRI PARAM=mypar1 imachcyg-setup: imachcygopt.exe setup.iss + touch setup.iss.in $(CP) imachcygopt.exe imach.exe - $(SETUPCOMP) /cc $(TMPSETUPSCRIPT) + $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe + $(SETUPCOMP) /cc setup.iss + cp Output/$(TMPSETUPEXE) imachcyg-setup # imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE) imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss + touch setup.iss.in $(CP) imachcygopt.exe imach.exe + $(CP) imachcygopt.exe imach$(VERSION)-$(BINVERSION).exe $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) + cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup + +imachMVC-setup: imachMVC.exe setup.iss + touch setup.iss.in + $(CP) imachMVC.exe imach.exe + $(SETUPCOMP) /cc setup.iss + $(CP) Output/$(TMPSETUPEXE) imachcyg-setup + +# imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE) +imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss + touch setup.iss.in + $(CP) imachMVC.exe imach.exe + $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) + $(CP) Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup simach : simach.o $(CC) $(LFLAGS) $(LGSL) -o simach simach.o @@ -147,9 +239,22 @@ simach.o : simach.c imach : imach.o $(CC) $(LFLAGS) -o imach imach.o +ifdef _macosx + $(DSYMUTIL) imach +endif + imach.o : imach.c $(CC) $(CFLAGS) -DPOWELL -c imach.c +# http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx +imachcl: imach.c + cl /O2 /MT /o imach.exe imach.c + +imach097b : imach097b.o + $(CC) $(LFLAGS) -o imach097b imach097b.o +imach097b.o : imach097b.c + $(CC) $(CFLAGS) -DPOWELL -c imach097b.c + imachsimplified : imachsimplified.o $(CC) $(LFLAGSOPT) -o imachsimplified imachsimplified.o @@ -164,14 +269,58 @@ imachgsl.o : imach.c imachopt : imachopt.o $(CC) $(LFLAGSOPT) -o imachopt imachopt.o ln -f imachopt imach +ifdef _macosx + $(STRIP) imach + cp imach ../bin +endif +ifdef _linux32onosx + $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) + cp -f imach ../bin + (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt) +endif +ifdef _linux64onosx + $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) + cp -f imach ../bin + (cd .. && gnutar jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt) +endif + imachopt.o : imach.c $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c -imachdmg : imachopt.o create-dmg +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 - cp imach imach098Leopard/bin - ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach098Leopard - + #hdiutil detach /Volumes/IMaCh\ $(VERSION) + rm -rf imach$(VERSION).app + mkdir -p imach$(VERSION).app + mkdir -p imach$(VERSION).app/Contents + mkdir -p imach$(VERSION).app/Contents/MacOS + cp applet imach$(VERSION).app/Contents/MacOS + mkdir -p imach$(VERSION).app/Contents/Resources + mkdir -p imach$(VERSION).app/Contents/Resources/Scripts + mkdir -p imach$(VERSION).app/Contents/Resources/bin + mkdir -p imach$(VERSION).app/Contents/Resources/html + cp imach imach$(VERSION).app/Contents/Resources/bin + cp gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot + mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd + cp -p TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd + $(SED) -e "s/@VERSION@/$(VERSION)/g;" \ + IMaChInfo.plist.in >imach$(VERSION).app/Contents/Info.plist + cp -p IMaChPkgInfo.in imach$(VERSION).app/Contents/PkgInfo + cp -p IMaCh.icns imach$(VERSION).app/Contents/Resources/applet.icns + cp -r -p main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt + cp IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc + 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 + ./createdmg3.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) + mv imach$(VERSION).dmg Output/ +# ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app +# ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) + +upload: + ls Output/* | xargs md5sum + rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/ imachcyg : imachcyg.o strsep.o $(CC) $(LFLAGS) -o imach imachcyg.o strsep.o @@ -190,6 +339,10 @@ imach.exe : imachw32.o i386-mingw32-gcc -mwindows -o imach.exe -lm imachw32.o i386-mingw32-strip imach.exe +valgrind-test : imach $(TESTFILE) + valgrind --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach $(TESTFILE) +test: imach $(TESTFILE) + gdb ./imach $(TESTFILE) $(PARAM).htm: imach $(PARAM).imach data1.txt ./imach $(PARAM).imach