Summary: imach 0.99r16

diff --git a/src/Makefile b/src/Makefile
index 9719059ce252d1a0f5a5f26f39173f70610375b2..8b42fe6b85cf7409639b87b181c104aa95feee02 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -649,7 +649,7 @@ imachrpm : 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
+imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg4.sh ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns  ../distributions/osx/TXT.rtf
        pwd
        (cd ../build && rm -r osx && mkdir osx && cd osx ;\
        pwd ;\
@@ -660,12 +660,12 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        mkdir -p imach$(VERSION).app;\
        mkdir -p imach$(VERSION).app/Contents;\
        mkdir -p imach$(VERSION).app/Contents/MacOS;\
-       cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\
+       cp ../../distributions/osx/imach imach$(VERSION).app/Contents/MacOS;\
        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;\
+       mkdir -p imach$(VERSION).app/Contents/Resources/doc;\
        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;\
@@ -673,18 +673,17 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        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 ;\
        cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\
-       cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns ;\
-       cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\
-       cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\
-       cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html ;\
-       cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html ;\
-       cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html ;\
+       cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/IMaCh.icns ;\
+       cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/doc ;\
+       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 ;\
        rm -f imach$(VERSION).dmg ;\
        pwd ;\
-       cp ../../distributions/osx/createdmg3.sh . ;\
+       cp ../../distributions/osx/createdmg4.sh . ;\
        cp ../../distributions/osx/Background.png .;\
        pwd ;\
-       ./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
+       ./createdmg4.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
        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)
@@ -699,8 +698,8 @@ 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.99r14-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach0.99r14.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach-0.99r16-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach0.99r16.dmg 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
 

diff --git a/src/README.txt b/src/README.txt
index a4df93b9ef84f915c1a59b26d8821b8ce64d6f23..2adc521af90a3967c7f3d10b1e9d8ae87e809c01 100755 (executable)
--- a/src/README.txt
+++ b/src/README.txt
@@ -42,34 +42,39 @@ file which is also a text file.
 Even if it is command line program, most operating systems offer\r
 simplifications of use:\r
 \r
-- On Windows, you can click on the imach.exe\r
-icon (which opens a DOS window) and drag your parameter file into the\r
-DOS windows and enter return. But with the newly installable version\r
-(>0.97) you can use the right click (once your mouse cursor is on an\r
-foo.imach file) to either edit the parameter file (with wordpad) or\r
+- On Windows, you can click on the imach.exe icon (which opens a DOS\r
+window) and drag your parameter file into the DOS windows and enter\r
+return. You can use the right click (once your mouse cursor is on an\r
+foo.imach file) to either edit the parameter file (with notepad) or\r
 execute this parameter file via imach. At the end of the run, your are\r
 asked to enter a character and the terminal will not disappear.\r
 \r
-- On OSX, you can click on the IMaCh application and terminal will be\r
-  open: either type in the name and path of your parameter file or\r
+- On OSX, you can click on the IMaCh application and a terminal window will be\r
+  opened: either type in the name and path of your parameter file or\r
   drag it from the finder.\r
 \r
-The output of your run is a lot of text files which are grouped into a\r
-sub-directory having the name of your parameter file as well as an\r
-other text file foo.gp which is a gnuplot file. This gnuplot is run by\r
-imach and creates a lot of graphs from the various results text files.\r
-An other important file named foo.htm can be opened by your browser\r
-and it will display various hyperlinks to most of your results as well\r
-as your graphs.\r
+The output of your run consists in many text files which are grouped\r
+into a sub-directory having the same name as of your parameter\r
+filename 'foo'. In addition, you will find two other important files\r
+on the same directory as your parameter file:\r
 \r
-You can edit this file, customize it at your will and run it to get\r
-additional figures or modified figures to be published. Just click on\r
-gnuplot.exe and type "load foo.gp" for example.\r
+-1- a text file named 'foo.gp' which is a gnuplot file. This gnuplot\r
+is automatically runned by imach in order to create the graphs from\r
+the various result text files.\r
+\r
+You can edit this gnuplot file, customize it at your will and run it\r
+to get additional figures or modified figures to be published. Just\r
+click on gnuplot executable and type "load foo.gp" for example.\r
 \r
 Gnuplot is a well known grapher under the GPL license too. As it is\r
 changing often, the OS/X and Windows installers are providing binaries\r
 for gnuplot 2.6.5.\r
 \r
+-2- a text file named 'foo.htm' which is an html file. It can be\r
+opened by your browser and it will display various hyperlinks to most\r
+of your results as well as your graphs.\r
+\r
+\r
 Since the era of 64bit processors and their wide use on OS/X and\r
 Windows 7, 8 or 10, we discovered that our usual GNU compiler were not\r
 efficient on Windows 64 and current binaries are compiled with the\r

diff --git a/src/setup.iss b/src/setup.iss
index c5aea682ed5e8c3937149e7112e87d1376a22840..95538be7c77cba12190d665b1195fea4cef1fea9 100644 (file)
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -52,13 +52,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
-AppName=IMaCh-0.98r7\r
-AppVerName=IMaCh-0.98r7 Version 0.98r7\r
-AppCopyright=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\r
-DefaultDirName={pf}\IMaCh-0.98r7\r
+AppName=IMaCh-0.99r16\r
+AppVerName=IMaCh-0.99r16 Version 0.99r16\r
+AppCopyright=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\r
+DefaultDirName={pf}\IMaCh-0.99r16\r
 DefaultGroupName=IMaCh\r
-OutputManifestFile=imach-0.98r7-icl-filelist.txt
-OutputBaseFilename=imach-0.98r7-icl-setup\r
+OutputManifestFile=imach-0.99r16-icl-filelist.txt
+OutputBaseFilename=imach-0.99r16-icl-setup\r
 UninstallDisplayIcon={app}\imach.exe\r
 Compression=lzma2\r
 SolidCompression=yes\r
@@ -79,12 +79,12 @@ ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes\r
 \r
 [Files]\r
-; Install IMaCh-x640.98r7.exe if running in 64-bit mode (x64; see above),\r
+; Install IMaCh-x640.99r16.exe if running in 64-bit mode (x64; see above),\r
 ; IMaCh.exe otherwise.\r
-;Source: "IMaCh-icl64-0.98r7.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-Source: "..\build\icl64\Release\IMaCh-0.98r7.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-;Source: "IMaCh-icl32-0.98r7.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
-Source: "..\build\icl32\Release\IMaCh-0.98r7.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+;Source: "IMaCh-icl64-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-icl32-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
 ;Source: "IMaCh.chm"; DestDir: "{app}\bin"\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
 Source: README.txt; DestDir: {app}; Flags: isreadme\r
@@ -164,8 +164,8 @@ Source: ..\html\doc\data1.txt; DestDir: {app}\doc
 ;P.S. -silent is recommended for use in install scripts\r
 \r
 [Icons]\r
-Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98r7 0.98r7; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98r7 0.98r7; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r16 0.99r16; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r16 0.99r16; Flags: runmaximized\r
 Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url\r
 \r
 ; NOTE: Most apps do not need registry entries to be pre-created. If you\r
@@ -181,7 +181,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 ;;Root: HKCU; Subkey: "Software\EuroREVES_INED\IMaCh"; Flags: uninsdeletekey\r
 ;;Root: HKLM; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98r7; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.99r16; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 5.1; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r