*** empty log message ***

diff --git a/src/setup.iss b/src/setup.iss
index bce53b4e0ac25611a1aa4acbe54547137c7002f3..a3d830c4ba7f011c13f3674bbddedf9b42c87be3 100644 (file)
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -2,6 +2,9 @@
 ; $Id$\r
 ;  $State$\r
 ;  $Log$
+;  Revision 1.11  2014/09/15 20:57:31  brouard
+;  *** empty log message ***
+;
 ;  Revision 1.10  2009/10/29 13:20:46  brouard
 ;  0.98l
 ;\r
@@ -34,14 +37,24 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
-AppName=IMaCh-0.98nR\r
-AppVerName=IMaCh-0.98nR Version 0.98nR\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)\r
-DefaultDirName={pf}\IMaCh-0.98nR\r
+AppName=IMaCh-0.98p0\r
+AppVerName=IMaCh-0.98p0 Version 0.98p0\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.98p0\r
 DefaultGroupName=IMaCh\r
-OutputBaseFilename=imach-0.98nR-1-setup\r
+OutputBaseFilename=imach-0.98p0-ilc-setup\r
 UninstallDisplayIcon={app}\imach.exe\r
+Compression=lzma2\r
+SolidCompression=yes\r
 InfoBeforeFile=README.txt\r
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be\r
+; done in "64-bit mode" on x64, meaning it should use the native\r
+; 64-bit Program Files directory and the 64-bit view of the registry.\r
+; On all other architectures it will install in "32-bit mode".\r
+ArchitecturesInstallIn64BitMode=x64\r
+; Note: We don't set ProcessorsAllowed because we want this\r
+; installation to run on all architectures (including Itanium,\r
+; since it's capable of running 32-bit code too).\r
 ;;SetupIconFile={app}\imach.exe\r
 ;;UninstallIconFile={app}\imach.ico\r
 ; uncomment the following line if you want your installation to run on NT 3.51 too.\r
@@ -50,17 +63,22 @@ InfoBeforeFile=README.txt
 ChangesAssociations=yes\r
 \r
 [Files]\r
-Source: imach.exe; DestDir: {app}\bin\r
+; Install IMaCh-x640.98p0.exe if running in 64-bit mode (x64; see above),\r
+; IMaCh.exe otherwise.\r
+Source: "IMaCh-ilc64-0.98p0.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode\r
+Source: "IMaCh-ilc32-0.98p0.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode\r
+;Source: "IMaCh.chm"; DestDir: "{app}\bin"\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
 Source: README.txt; DestDir: {app}; Flags: isreadme\r
 Source: imach.ico; DestDir: {app}\bin\r
-Source: gnuplot.exe; DestDir: {app}\bin\r
-Source: wgnuplot.hlp; DestDir: {app}\bin\r
+;;Source: gnuplot.exe; DestDir: {app}\bin
+Source: gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
+;;Source: wgnuplot.hlp; DestDir: {app}\bin\r
 Source: website.url; DestDir: {app}\r
 \r
 ;; win95\r
 ;;Source: ModifyAutoexec.exe; DestDir: {tmp}\r
-Source: wgnuplot.mnu; DestDir: {app}\bin\r
+;;Source: wgnuplot.mnu; DestDir: {app}\bin\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
 Source: ..\html\doc\biaspar.gp; DestDir: {app}\doc\r
 Source: ..\html\doc\biaspar.htm; DestDir: {app}\doc\r
@@ -124,8 +142,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.98nR 0.98nR; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98nR 0.98nR; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98p0 0.98p0; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98p0 0.98p0; 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
@@ -141,9 +159,9 @@ 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.98nR; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98p0; 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: 4.0; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 4.6; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
 \r
 Root: HKCR; Subkey: .gp; ValueType: string; ValueName: ; ValueData: gnuplot.exe; Flags: uninsdeletevalue\r