--- imach/src/Makefile 2018/12/05 16:12:50 1.83 +++ imach/src/Makefile 2019/05/09 15:19:47 1.84 @@ -66,7 +66,8 @@ IMACHSETUPVERSION=icl #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/Vn1b.imach -TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Saito-PAA-2018/rrLvngArrgJapan-two-1b.imach +#TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Saito-PAA-2018/rrLvngArrgJapan-two-1b.imach +TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb.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_magei4/radlc_often.imach @@ -609,6 +610,8 @@ imachBOBYQAopt : imachBOBYQAopt.o imachBOBYQAopt.o : imach.c $(CC) $(CFLAGS) -DNLOPT $(INLOPT) -DBOBYQA -o imachBOBYQAopt.o -c imach.c +# imachback : imachback.o +# $(CC) $(LFLAGSOPT) -o imachback imachback.o imachopt : imachopt.o $(CC) $(LFLAGSOPT) -o imachopt imachopt.o @@ -629,6 +632,15 @@ ifdef _linux64onosx (cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt) endif +imachback: imachback.o + $(CC) $(LFLAGS) -DBACKCASTWO -o imachback imachback.o +ifdef _macosx + $(DSYMUTIL) imachback +endif + +imachback.o : imachback.c version.h + $(CC) $(CFLAGS) $(CROSSCOMPILATION) -c $< + imachopt.o : imach.c version.h $(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c # $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c @@ -648,7 +660,7 @@ imachrpm : imachopt.o #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 - #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;\ 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 @@ -700,8 +712,8 @@ upload: # 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/imach0.99r9.dmg 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.99r16.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download + rsync -v Output/imach-0.99r18-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download + rsync -v Output/imach0.99r18.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/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download @@ -728,6 +740,11 @@ valgrindtototest: valgrindtoto valgrind-test : imach $(TESTFILE) valgrind --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach $(TESTFILE) # valgrind --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach-0.98r-powellf1f3linmnb $(TESTFILE) +# gdb -ex=r --args myprogram arg1 arg2 +# gdb -batch -x /tmp/cmds --args executablename arg1 arg2 arg3 +# gdb -ex=r --args imachback /Users/nbrouard/Documents/Recherches/HRS/RAND_HRS/imachb.imach +btest: imachback $(TESTFILE) + gdb ./imachback $(TESTFILE) test: imach $(TESTFILE) gdb ./imach $(TESTFILE)