--- imach/src/Makefile 2015/09/15 17:56:37 1.70 +++ imach/src/Makefile 2015/09/30 18:35:53 1.72 @@ -1,5 +1,8 @@ #Version has to be set in ../CMakeLists.txt too. -VERSION=0.98r0 +#VERSION=0.98r2 +#VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`) +VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" } { print $$3 }'`) +OSTYPE = $(shell echo $$OSTYPE) # DRIVEG is for VirtualBox Windows 64bit DRIVEG=f: #DIRG is the corresponding build directory for Virtual Windows @@ -51,7 +54,8 @@ IMACHSETUPVERSION=icl #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/Flavia/rADL0w_V1V2b.imach +#TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach +TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.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 @@ -474,6 +478,7 @@ imachdmg : imachopt.o ../distributions/o pwd ;\ cmake ../..;\ cmake --build . ; \ + echo $(OSTYPE);\ rm -rf imach$(VERSION).app;\ mkdir -p imach$(VERSION).app;\ mkdir -p imach$(VERSION).app/Contents;\