--- imach/src/Makefile	2019/05/22 19:44:04	1.86
+++ imach/src/Makefile	2019/05/22 20:26:16	1.87
@@ -7,7 +7,7 @@ OSTYPE = $(shell echo $$OSTYPE)
 DRIVEG=f:
 #DIRG is the corresponding build directory for Virtual Windows
 DIRG=\imach\cvs\imach\build
-COPYRIGHT=Copyright (C)  2002-2016 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-18
+COPYRIGHT=Copyright (C)  2002-2019 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-19
 IMACHSETUPVERSION=icl
 # This is for Windows only
 #IMACHSETUPVERSION=mvc
@@ -67,7 +67,8 @@ IMACHSETUPVERSION=icl
 #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/HRS/RAND_HRS/imachb.imach
+#TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb.imach
+TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb-r18.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
@@ -690,6 +691,8 @@ imachdmg : imachopt.o ../distributions/o
 	mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
 	mkdir -p imach$(VERSION).app/Contents/Resources/lib;\
 	mkdir -p imach$(VERSION).app/Contents/Resources/doc;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/tests;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/tests/data;\
 	cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
 	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;\
@@ -702,6 +705,11 @@ imachdmg : imachopt.o ../distributions/o
 	cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/doc ;\
 	cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/doc ;\
 	cp ../../src/README.txt  imach$(VERSION).app/Contents/Resources/doc ;\
+	cp ../../tests/testV1V2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/rtestV1V2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/testV2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/rtestV2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/data/data2.txt  imach$(VERSION).app/Contents/Resources/tests/data ;\
 	rm -f imach$(VERSION).dmg ;\
 	pwd ;\
 	cp ../../distributions/osx/createdmg4.sh . ;\
@@ -722,9 +730,9 @@ 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.99r19-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-#	rsync -v Output/imach0.99r19.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-	rsync -v Output/imach-0.99r19-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/imach-0.99r19-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/imach0.99r19.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r19-1.x86_64.rpm 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