--- imach/src/Makefile 2014/02/10 21:31:16 1.32 +++ imach/src/Makefile 2014/08/27 19:06:49 1.40 @@ -1,9 +1,14 @@ -VERSION=0.98nR +VERSION=0.98nX 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 +# Linux # make _linux=1 imachopt # make _linux=1 imach +# +# make _linux32onosx=1 imachopt +# make _linux64onosx=1 imachopt + # make _macosx=1 imach # make _macosx=1 imachdmg @@ -17,13 +22,15 @@ IMACHSETUPVERSION=1 # make _windowsonlinux=1 imachcyg-setup (touch setup.iss.in) # make _windowsonlinux=1 imachcyg-noreg-setup # -# make _windowsonosx=1 imachcyg-setup (touch setup.iss.in) -# make _windowsonosx=1 imachcyg-noreg-setup + # # 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 @@ -31,10 +38,11 @@ GCC= gcc ifdef _macosx # Mac OS/X version LFLAGS= -g -lm -DUNIX -CFLAGS= -g -DUNIX +CFLAGS= -g -DUNIX -DOSX LFLAGSOPT= -O3 -lm -DUNIX CFLAGSOPT= -O3 -DUNIX UNIX2DOS= echo "Unix2dos " +DSYMUTIL= dsymutil # 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 @@ -71,12 +79,41 @@ SETUPCOMP= wine "C:////Program Files//// endif ifdef _windowsonosx -GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc +#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 +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 +LFLAGSOPT= -O3 -lm -s +CFLAGSOPT= -O3 +UNIX2DOS= unix2dos +SETUPCOMP= ~/bin/InnoSetup5Playonmac +CP= cp +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 @@ -85,11 +122,11 @@ endif ifdef _linux #CFLAGS= -g -DUNIX -DDEBUGHESS -CFLAGS= -g -DUNIX +CFLAGS= -g -DUNIX -DLINUX LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas -CFLAGSOPT= -O3 -DUNIX +CFLAGSOPT= -O3 -DUNIX -DLINUX LFLAGSOPT= -O3 -lm UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" @@ -153,12 +190,14 @@ $(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRI PARAM=mypar1 imachcyg-setup: imachcygopt.exe setup.iss + touch setup.iss.in $(CP) imachcygopt.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) imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss + touch setup.iss.in $(CP) imachcygopt.exe imach.exe $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup @@ -170,12 +209,12 @@ 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 -imach-1.129cvsmac : imach-1.129cvsmac.o - $(CC) $(LFLAGS) -o imach-1.129cvsmac imach-1.129cvsmac.o -imach-1.129cvsmac.o : imach-1.129cvsmac.c - $(CC) $(CFLAGS) -DPOWELL -c imach-1.129cvsmac.c imach097b : imach097b.o $(CC) $(LFLAGS) -o imach097b imach097b.o @@ -199,11 +238,40 @@ imachopt : imachopt.o 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 @@ -222,6 +290,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