--- imach/src/Makefile	2015/11/21 15:11:52	1.74
+++ imach/src/Makefile	2015/12/08 16:05:35	1.75
@@ -315,6 +315,7 @@ 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 setup.iss 
 	pwd
 	touch setup.iss.in
@@ -333,17 +334,20 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VE
 	$(CP) Output/$(TMPSETUPEXE) imachICL64-noreg-setup
 
 ../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl64.bat
-	rm -rf ../build/icl64  && mkdir ../build/icl64
+#	rm -rf ../build/icl64  && mkdir ../build/icl64
 	cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
 	cd ../build/icl64
-	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+#	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
+#	rm -rf ../build/icl32 && mkdir -p ../build/icl32
 	cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
 	cd ../build/icl32
-	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+
+#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
@@ -489,9 +493,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_5_1_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 ;\
@@ -508,15 +514,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.98r2-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-	rsync -v Output/imach0.98r2.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