--- imach/src/Makefile 2015/03/10 20:35:56 1.56 +++ imach/src/Makefile 2015/04/29 09:11:01 1.59 @@ -1,7 +1,7 @@ -VERSION=0.98q0 -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=ilc64 -IMACHSETUPVERSION=mvc +VERSION=0.98q1 +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 @@ -20,7 +20,8 @@ IMACHSETUPVERSION=mvc # 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 imachILC64-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 _windowsonosx=1 imachMVC-noreg-setup # @@ -43,7 +44,8 @@ IMACHSETUPVERSION=mvc #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/rbiaspar-098p.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 @@ -53,9 +55,11 @@ 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 @@ -207,7 +211,8 @@ endif ifdef _linux #CFLAGS= -g -DUNIX -DDEBUGHESS #CFLAGS= -g -DDEBUG -DFIXMNBRAK -CFLAGS= -g -DDEBUG +#CFLAGS= -g -DDEBUG +CFLAGS= -g LFLAGS= -g -lm IGSL= -I/usr/include/gsl LGSL= -lgsl -lgslcblas @@ -232,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 @@ -244,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; \ @@ -273,8 +280,8 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN) $(TMPSETUPEXE): $(TMPSETUPSCRIPT) $(SETUPCOMP) /cc $(TMPSETUPSCRIPT) -$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT) - $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) +#$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT) +# $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) PARAM=mypar1 @@ -293,21 +300,26 @@ imachcyg-noreg-setup: imachcygopt.exe no $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT) cp Output/$(TMPNOREGSETUPEXE) imachcyg-noreg-setup -imachILC64-setup: IMaCh-ilc64.exe setup.iss +# 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 - $(CP) IMaCh-ilc64.exe imach.exe + $(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-XP.exe setup.iss +imachILC32-setup: IMaCh-ilc32-$(VERSION).exe setup.iss touch setup.iss.in - $(CP) IMaCh-ilc32.exe imach.exe + $(CP) IMaCh-ilc32-$(VERSION).exe imach.exe $(SETUPCOMP) /cc setup.iss $(CP) Output/$(TMPSETUPEXE) imachILC32-setup @@ -321,7 +333,7 @@ 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 @@ -348,7 +360,8 @@ ifdef _macosx endif imach.o : imach.c - $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -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 @@ -388,7 +401,7 @@ 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 ifdef _intel64onosx @@ -444,8 +457,9 @@ 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 +upload: rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/ imachcyg : imachcyg.o