From 52b32d2d5aeef2eca4046f08ed79c3251042cc3e Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Fri, 20 Apr 2018 17:18:27 +0000 Subject: [PATCH] Summary: imach 0.99r16 --- src/Makefile | 25 ++++++++++++------------- src/README.txt | 39 ++++++++++++++++++++++----------------- src/setup.iss | 28 ++++++++++++++-------------- 3 files changed, 48 insertions(+), 44 deletions(-) diff --git a/src/Makefile b/src/Makefile index 9719059..8b42fe6 100644 --- 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 a4df93b..2adc521 100755 --- 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 simplifications of use: -- On Windows, you can click on the imach.exe -icon (which opens a DOS window) and drag your parameter file into the -DOS windows and enter return. But with the newly installable version -(>0.97) you can use the right click (once your mouse cursor is on an -foo.imach file) to either edit the parameter file (with wordpad) or +- On Windows, you can click on the imach.exe icon (which opens a DOS +window) and drag your parameter file into the DOS windows and enter +return. You can use the right click (once your mouse cursor is on an +foo.imach file) to either edit the parameter file (with notepad) or execute this parameter file via imach. At the end of the run, your are asked to enter a character and the terminal will not disappear. -- On OSX, you can click on the IMaCh application and terminal will be - open: either type in the name and path of your parameter file or +- On OSX, you can click on the IMaCh application and a terminal window will be + opened: either type in the name and path of your parameter file or drag it from the finder. -The output of your run is a lot of text files which are grouped into a -sub-directory having the name of your parameter file as well as an -other text file foo.gp which is a gnuplot file. This gnuplot is run by -imach and creates a lot of graphs from the various results text files. -An other important file named foo.htm can be opened by your browser -and it will display various hyperlinks to most of your results as well -as your graphs. +The output of your run consists in many text files which are grouped +into a sub-directory having the same name as of your parameter +filename 'foo'. In addition, you will find two other important files +on the same directory as your parameter file: -You can edit this file, customize it at your will and run it to get -additional figures or modified figures to be published. Just click on -gnuplot.exe and type "load foo.gp" for example. +-1- a text file named 'foo.gp' which is a gnuplot file. This gnuplot +is automatically runned by imach in order to create the graphs from +the various result text files. + +You can edit this gnuplot file, customize it at your will and run it +to get additional figures or modified figures to be published. Just +click on gnuplot executable and type "load foo.gp" for example. Gnuplot is a well known grapher under the GPL license too. As it is changing often, the OS/X and Windows installers are providing binaries for gnuplot 2.6.5. +-2- a text file named 'foo.htm' which is an html file. It can be +opened by your browser and it will display various hyperlinks to most +of your results as well as your graphs. + + Since the era of 64bit processors and their wide use on OS/X and Windows 7, 8 or 10, we discovered that our usual GNU compiler were not efficient on Windows 64 and current binaries are compiled with the diff --git a/src/setup.iss b/src/setup.iss index c5aea68..95538be 100644 --- a/src/setup.iss +++ b/src/setup.iss @@ -52,13 +52,13 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES! [Setup] -AppName=IMaCh-0.98r7 -AppVerName=IMaCh-0.98r7 Version 0.98r7 -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 -DefaultDirName={pf}\IMaCh-0.98r7 +AppName=IMaCh-0.99r16 +AppVerName=IMaCh-0.99r16 Version 0.99r16 +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 +DefaultDirName={pf}\IMaCh-0.99r16 DefaultGroupName=IMaCh -OutputManifestFile=imach-0.98r7-icl-filelist.txt -OutputBaseFilename=imach-0.98r7-icl-setup +OutputManifestFile=imach-0.99r16-icl-filelist.txt +OutputBaseFilename=imach-0.99r16-icl-setup UninstallDisplayIcon={app}\imach.exe Compression=lzma2 SolidCompression=yes @@ -79,12 +79,12 @@ ArchitecturesInstallIn64BitMode=x64 ChangesAssociations=yes [Files] -; Install IMaCh-x640.98r7.exe if running in 64-bit mode (x64; see above), +; Install IMaCh-x640.99r16.exe if running in 64-bit mode (x64; see above), ; IMaCh.exe otherwise. -;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" Source: ..\html\doc\imach.htm; DestDir: {app}\doc Source: README.txt; DestDir: {app}; Flags: isreadme @@ -164,8 +164,8 @@ Source: ..\html\doc\data1.txt; DestDir: {app}\doc ;P.S. -silent is recommended for use in install scripts [Icons] -Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98r7 0.98r7; IconFilename: {app}\imach.ico -Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98r7 0.98r7; Flags: runmaximized +Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r16 0.99r16; IconFilename: {app}\imach.ico +Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r16 0.99r16; Flags: runmaximized Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url ; NOTE: Most apps do not need registry entries to be pre-created. If you @@ -181,7 +181,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url ;;Root: HKCU; Subkey: "Software\EuroREVES_INED\IMaCh"; Flags: uninsdeletekey ;;Root: HKLM; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty -Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98r7; Flags: uninsdeletekeyifempty +Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.99r16; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app} Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 5.1; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app} -- 2.43.0