--- imach/src/Makefile 2014/12/23 11:17:26 1.49 +++ imach/src/Makefile 2015/05/05 08:54:59 1.61 @@ -1,6 +1,8 @@ -VERSION=0.98p -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=ilc64 +VERSION=0.98q2 +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 +IMACHSETUPVERSION=ilc +# This is for Windows only +#IMACHSETUPVERSION=mvc # Linux # make _linux=1 imachopt @@ -10,18 +12,18 @@ IMACHSETUPVERSION=ilc64 # make _linux64onosx=1 imachopt # OS/X +# make _macosx=1 imachdmg # make _intel64onosx=1 imachopt # make _intel32onosx=1 imachopt # make _intelUNBonosx=1 imachdmg # Not implemented (not useful) # make _macosx=1 imach # make _macosx=1 imachopt -# 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 _windowsonosx=1 imachILC64-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl +# make _windowsonosx=1 imachILC-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl -# make imachMVC-noreg-setup +# make _windowsonosx=1 imachMVC-noreg-setup # # Windows cross-compiled mw64 # make _mw64onsox=1 imachcyg-setup @@ -41,7 +43,9 @@ IMACHSETUPVERSION=ilc64 ##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/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/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.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 @@ -51,9 +55,12 @@ GCC= gcc ifdef _macosx # Mac OS/X version LFLAGS= -g -lm -CFLAGS= -g -DDEBUG +#CFLAGS= -g -DDEBUG +CFLAGS= -g LFLAGSOPT= -O3 -lm CFLAGSOPT= -O3 +CP= cp +CROSSCOMPILATION= -DCROSS=0 UNIX2DOS= echo "Unix2dos " DSYMUTIL= dsymutil STRIP= strip @@ -89,6 +96,7 @@ LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -lm CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 CP= cp UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" @@ -104,6 +112,7 @@ LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -s CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac CP= cp @@ -117,6 +126,7 @@ LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -lm -s CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac CP= cp @@ -133,7 +143,10 @@ ifdef _intel64onosx GCC=/opt/intel/bin/icc CFLAGS= -m64 -g -std=c99 LFLAGS= -g -m64 +#CFLAGSOPT= -O3 -m64 -g -std=c99 -no-prec-div idem +#CFLAGSOPT= -O3 -m64 -g -std=c99 -xSSSE3_ATOM 402 CFLAGSOPT= -O3 -m64 -g -std=c99 +CROSSCOMPILATION= -DCROSS=0 IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh intel64; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv") include makeenv #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld @@ -151,6 +164,7 @@ GCC=/opt/intel/bin/icc CFLAGS= -m32 -g -std=c99 LFLAGS= -g -m32 CFLAGSOPT= -O3 -m32 -g -std=c99 +CROSSCOMPILATION= -DCROSS=0 IGNORE :=$(shell bash -c "source /opt/intel/bin/iccvars.sh ia32; env | sed 's/=/:=/' | sed 's/^/export /' > makeenv") include makeenv #lipo -create -arch i386 HelloWorld_32 -arch x86_64 HelloWorld_64 -output HelloWorld @@ -163,12 +177,14 @@ BINVERSION=osx-intel-ia32-bin 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 +GCC=/usr/localold/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-gcc +STRIP=/usr/localold/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-strip LFLAGS= -g CFLAGS= -g +CROSSCOMPILATION= -DCROSS=1 LFLAGSOPT= -O3 -lm -s CFLAGSOPT= -O3 +TAR= /sw/bin/gnutar UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac CP= cp @@ -178,12 +194,14 @@ endif ifdef _linux32onosx #GCC=/usr/local/i386-mingw32-4.3.0/bin/i386-mingw32-gcc #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 +GCC=/usr/localold/gcc-4.8.1-for-linux32/bin/i586-pc-linux-gcc +STRIP=/usr/localold/gcc-4.8.1-for-linux32/bin/i586-pc-linux-strip LFLAGS= -g CFLAGS= -g LFLAGSOPT= -O3 -s -lm CFLAGSOPT= -O3 +CROSSCOMPILATION= -DCROSS=1 +TAR= /sw/bin/gnutar UNIX2DOS= unix2dos SETUPCOMP= ~/bin/InnoSetup5Playonmac CP= cp @@ -192,7 +210,9 @@ endif ifdef _linux #CFLAGS= -g -DUNIX -DDEBUGHESS -CFLAGS= -g -DDEBUG +#CFLAGS= -g -DDEBUG -DFIXMNBRAK +#CFLAGS= -g -DDEBUG +CFLAGS= -g LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas @@ -200,9 +220,11 @@ INLOPT= -I/usr/local/include LNLOPT= -lm -L/usr/local/lib -lnlopt CFLAGSOPT= -O3 -g LFLAGSOPT= -O3 -g -lm +CROSSCOMPILATION= -DCROSS=0 UNIX2DOS= unix2dos SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe" BINVERSION=LINUXnative +CP= cp endif SED= sed @@ -215,7 +237,8 @@ TMPNOREGSETUPSCRIPT=noreg-setup.iss TMPSCRIPTIN=setup.iss.in APPLICATION=IMaCh APPNAME=$(APPLICATION)-$(VERSION) -GNUPLOTVERSION=4.0 +APPCOMPILATIONMODE=$(IMACHSETUPVERSION) +GNUPLOTVERSION=4.6 LICENSE=Copying TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe @@ -227,6 +250,7 @@ setup.iss: setup.iss.in s/@NOTINNOREG@//g; \ s/@NOREG@//g; \ s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \ + s/@APPCOMPILATIONMODE@/$(APPCOMPILATIONMODE)/g; \ s/@VERSION@/$(VERSION)/g; \ s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \ s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \ @@ -256,8 +280,8 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN) $(TMPSETUPEXE): $(TMPSETUPSCRIPT) $(SETUPCOMP) /cc $(TMPSETUPSCRIPT) -$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT) - $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) +#$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT) +# $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) PARAM=mypar1 @@ -276,23 +300,40 @@ imachcyg-noreg-setup: imachcygopt.exe no $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup -imachILC64-setup: IMaCh-ilc64.exe setup.iss - touch setup.iss.in - $(CP) IMaCh-ilc64.exe imach.exe +# both 32 and 64 executables should have been built on Windows with Intel compiler. +imachILC-setup: IMaCh-ilc64-$(VERSION).exe IMaCh-ilc32-$(VERSION).exe setup.iss + pwd + $(SETUPCOMP) /cc setup.iss + $(CP) Output/$(TMPSETUPEXE) imachILC-setup + +imachILC64-setup: IMaCh-ilc64-$(VERSION).exe setup.iss + pwd + $(CP) IMaCh-ilc64-$(VERSION).exe imach.exe $(SETUPCOMP) /cc setup.iss $(CP) Output/$(TMPSETUPEXE) imachILC64-setup -imachILC64-noreg-setup: IMaCh-ilc64.exe noreg-setup.iss +imachILC64-noreg-setup: IMaCh-ilc64-$(VERSION).exe noreg-setup.iss touch setup.iss.in - $(CP) IMaCh-ilc64.exe imach.exe $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) $(CP) Output/$(TMPSETUPEXE) imachILC64-noreg-setup +imachILC32-setup: IMaCh-ilc32-$(VERSION).exe setup.iss + touch setup.iss.in + $(CP) IMaCh-ilc32-$(VERSION).exe imach.exe + $(SETUPCOMP) /cc setup.iss + $(CP) Output/$(TMPSETUPEXE) imachILC32-setup + +imachILC32-noreg-setup: IMaCh-ilc32.exe noreg-setup.iss + touch setup.iss.in + $(CP) IMaCh-ilc32.exe imach.exe + $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) + $(CP) Output/$(TMPSETUPEXE) imachILC32-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 + $(CP) Output/$(TMPSETUPEXE) imachMVC-setup # imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE) imachMVC-noreg-setup: imachMVC.exe noreg-setup.iss @@ -306,14 +347,26 @@ simach : simach.o simach.o : simach.c $(CC) $(CFLAGS) -DGSL -c simach.c -imach : imach.o +imachtest: imachtest.o + $(CC) $(LFLAGS) -o imachtest imachtest.o +ifdef _macosx + $(DSYMUTIL) imachtest +endif + +imach: imach.o $(CC) $(LFLAGS) -o imach imach.o ifdef _macosx $(DSYMUTIL) imach endif imach.o : imach.c - $(CC) $(CFLAGS) -DPOWELL -c imach.c + $(CC) $(CFLAGS) $(CROSSCOMPILATION) -c imach.c +# $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c + +imachtest.o : imach.c + $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o imachtest.o -c imach.c + +# $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DFIXMNBRAK -o imachtest.o -c imach.c # http://msdn.microsoft.com/en-us/library/abx4dbyh%28v=vs.100%29.aspx imachcl: imach.c @@ -348,9 +401,9 @@ imachBOBYQAopt.o : imach.c imachopt : imachopt.o $(CC) $(LFLAGSOPT) -o imachopt imachopt.o - ln -f imachopt imach +# ln -f imachopt imach $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) - cp -f imach ../bin + $(CP) -f imach ../bin ifdef _intel64onosx $(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION) endif @@ -358,14 +411,14 @@ ifdef _macosx $(STRIP) imach endif ifdef _linux32onosx - (cd .. && gnutar 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 ifdef _linux64onosx - (cd .. && gnutar 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 imachopt.o : imach.c - $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c + $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c # $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c imachUB : imach32 imach64 @@ -404,9 +457,11 @@ imachdmg : imachopt.o create-dmg applet # ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app # ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) -upload: +md5: ls Output/* | xargs md5sum - rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/ +upload: + rsync -v Output/imach-0.98q2-ilc-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/ +#rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/ imachcyg : imachcyg.o $(CC) $(LFLAGS) -o imach imachcyg.o