--- imach/src/Makefile	2015/09/02 11:39:21	1.65
+++ imach/src/Makefile	2015/12/16 06:58:09	1.76
@@ -1,7 +1,10 @@
 #Version has to be set in ../CMakeLists.txt too.
-VERSION=0.98q5
+#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=g:
+DRIVEG=f:
 #DIRG is the corresponding build directory for Virtual Windows
 DIRG=\imach\cvs\imach\build
 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
@@ -51,7 +54,9 @@ 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/ADL0w_V2c.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach
+TESTFILE=$(HOME)//Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3c.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
@@ -244,7 +249,7 @@ TMPSCRIPTIN=setup.iss.in
 APPLICATION=IMaCh
 APPNAME=$(APPLICATION)-$(VERSION)
 APPCOMPILATIONMODE=$(IMACHSETUPVERSION)
-GNUPLOTVERSION=4.6
+GNUPLOTVERSION=5.1
 LICENSE=Copying
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe
@@ -311,7 +316,8 @@ imachICL-build: imach.c
 #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
 # both 32 and 64 executables should have been built on Windows with Intel compiler.
-imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat 
+
+imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat setup.iss 
 	pwd
 	touch setup.iss.in
 	$(SETUPCOMP) /cc setup.iss
@@ -333,21 +339,32 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VE
 	cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
 	cd ../build/icl64
 	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+ --username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+
+#       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
+#       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR"
+
+#	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR" 
+#	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
+#VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+#	--username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
 	rm -rf ../build/icl32 && mkdir -p ../build/icl32
 	cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
 	cd ../build/icl32
 	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+  --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+
+#VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+# --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
 	rm -rf ../build/vs32 && mkdir -p ../build/vs32
 	cp mybuildvs32.bat ../build/vs32/
 	cd ../build/vs32
-	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
+	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+	--username brouard  --verbose  --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
 # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"
 #WORK	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"
 #	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"
@@ -457,7 +474,7 @@ ifdef _linux64onosx
 	(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
+imachopt.o : imach.c version.h
 	$(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
 #	$(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
@@ -468,12 +485,15 @@ imachUB : imach32 imach64
 #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)
+#	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/createdmg3.sh ../distributions/osx/applet ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns ../distributions/osx/main.scpt.in ../distributions/osx/IMaCh-ecrandemarrage.rsrc ../distributions/osx/TXT.rtf
 	pwd
 	(cd ../build && rm -r osx && mkdir osx && cd osx ;\
 	pwd ;\
 	cmake ../..;\
 	cmake --build . ; \
+	echo $(OSTYPE);\
 	rm -rf imach$(VERSION).app;\
 	mkdir -p imach$(VERSION).app;\
 	mkdir -p imach$(VERSION).app/Contents;\
@@ -482,9 +502,11 @@ imachdmg : imachopt.o ../distributions/o
 	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/lib;\
 	mkdir -p imach$(VERSION).app/Contents/Resources/html;\
 	cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
-	cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+	cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+	cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
 	mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
 	cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
 	$(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
@@ -501,15 +523,15 @@ imachdmg : imachopt.o ../distributions/o
 	cp ../../distributions/osx/Background.png .;\
 	pwd ;\
 	./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
-	mv  imach$(VERSION).dmg ../../src/Output/ ;)
+	cp  imach$(VERSION).dmg ../../src/Output/ ;)
 #	./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #	./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
 
 md5:
 	ls Output/* | xargs md5sum
 upload:
-	rsync -v Output/IMaCh-0.98q4-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-	rsync -v Output/imach0.98q4.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/IMaCh-0.98r3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/imach0.98r3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #	rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o