From ba737f5de9378a4515deb74f6baaf047a89dc83f Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Wed, 22 May 2019 20:26:16 +0000 Subject: [PATCH] *** empty log message *** --- CMakeLists.txt | 2 ++ distributions/osx/createdmg4.sh | 2 +- src/Makefile | 18 +++++++++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c06d95..75fc5c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,7 @@ set(CPACK_PACKAGE_CONTACT "Nicolas Brouard") set(CPACK_PACKAGE_VENDOR "INED") SET(CPACK_PACKAGE_VENDOR "IMaCh, INED") SET(CPACK_PACKAGE_LICENSE "GPLv2") +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") SET(CPACK_PACKAGE_VERSION_MAJOR "${IMACH_VERSION_MAJOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${IMACH_VERSION_MINOR}") @@ -307,3 +308,4 @@ if(UNIXDODOXYGEN) endif (DOXYGEN_FOUND) message("Doxygen only in UNIX doxygen documentation") endif (UNIXDODOXYGEN) + diff --git a/distributions/osx/createdmg4.sh b/distributions/osx/createdmg4.sh index cdf9844..aad4070 100755 --- a/distributions/osx/createdmg4.sh +++ b/distributions/osx/createdmg4.sh @@ -124,7 +124,7 @@ echo ' set background picture of viewOptions to file ".background:'${DMG_BACKGROUND_IMG}'" set position of item "'${APP_NAME}'.app" of container window to {160, 205} set position of item "Applications" of container window to {360, 205} - set position of item "README.txt" of container window to {325, 250} + set position of item "README.txt" of container window to {360, 60} close open update without registering applications diff --git a/src/Makefile b/src/Makefile index 440c834..da3473d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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/osx/create-dmg ../distributions/osx/creat 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/osx/create-dmg ../distributions/osx/creat 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 -- 2.43.0