--- imach/src/setup.iss	2014/06/10 21:25:04	1.11
+++ imach/src/setup.iss	2015/03/11 13:28:49	1.12
@@ -1,9 +1,12 @@
 ; -- IMaCh.iss --
-; $Id: setup.iss,v 1.11 2014/06/10 21:25:04 brouard Exp $
+; $Id: setup.iss,v 1.12 2015/03/11 13:28:49 brouard Exp $
 ;  $State: Exp $
 ;  $Log: setup.iss,v $
-;  Revision 1.11  2014/06/10 21:25:04  brouard
-;  Author: Nicolas Brouard
+;  Revision 1.12  2015/03/11 13:28:49  brouard
+;  *** empty log message ***
+;
+;  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
@@ -37,14 +40,24 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
 [Setup]
-AppName=IMaCh-0.98nR
-AppVerName=IMaCh-0.98nR Version 0.98nR
-AppCopyright=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)
-DefaultDirName={pf}\IMaCh-0.98nR
+AppName=IMaCh-0.98p0
+AppVerName=IMaCh-0.98p0 Version 0.98p0
+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.98p0
 DefaultGroupName=IMaCh
-OutputBaseFilename=imach-0.98nR-1-setup
+OutputBaseFilename=imach-0.98p0-ilc-setup
 UninstallDisplayIcon={app}\imach.exe
+Compression=lzma2
+SolidCompression=yes
 InfoBeforeFile=README.txt
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
+; done in "64-bit mode" on x64, meaning it should use the native
+; 64-bit Program Files directory and the 64-bit view of the registry.
+; On all other architectures it will install in "32-bit mode".
+ArchitecturesInstallIn64BitMode=x64
+; Note: We don't set ProcessorsAllowed because we want this
+; installation to run on all architectures (including Itanium,
+; since it's capable of running 32-bit code too).
 ;;SetupIconFile={app}\imach.exe
 ;;UninstallIconFile={app}\imach.ico
 ; uncomment the following line if you want your installation to run on NT 3.51 too.
@@ -53,17 +66,22 @@ InfoBeforeFile=README.txt
 ChangesAssociations=yes
 
 [Files]
-Source: imach.exe; DestDir: {app}\bin
+; Install IMaCh-x640.98p0.exe if running in 64-bit mode (x64; see above),
+; IMaCh.exe otherwise.
+Source: "IMaCh-ilc64-0.98p0.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "IMaCh-ilc32-0.98p0.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
 Source: imach.ico; DestDir: {app}\bin
-Source: gnuplot.exe; DestDir: {app}\bin
-Source: wgnuplot.hlp; DestDir: {app}\bin
+;;Source: gnuplot.exe; DestDir: {app}\bin
+Source: gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
+;;Source: wgnuplot.hlp; DestDir: {app}\bin
 Source: website.url; DestDir: {app}
 
 ;; win95
 ;;Source: ModifyAutoexec.exe; DestDir: {tmp}
-Source: wgnuplot.mnu; DestDir: {app}\bin
+;;Source: wgnuplot.mnu; DestDir: {app}\bin
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc
 Source: ..\html\doc\biaspar.gp; DestDir: {app}\doc
 Source: ..\html\doc\biaspar.htm; DestDir: {app}\doc
@@ -127,8 +145,8 @@ Source: ..\html\doc\data1.txt; DestDir:
 ;P.S. -silent is recommended for use in install scripts
 
 [Icons]
-Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98nR 0.98nR; IconFilename: {app}\imach.ico
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98nR 0.98nR; Flags: runmaximized
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98p0 0.98p0; IconFilename: {app}\imach.ico
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98p0 0.98p0; 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
@@ -144,9 +162,9 @@ Name: {group}\Visit the IMaCh web site;
 ;;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.98nR; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98p0; 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: 4.0; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 4.6; Flags: uninsdeletekeyifempty
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}
 
 Root: HKCR; Subkey: .gp; ValueType: string; ValueName: ; ValueData: gnuplot.exe; Flags: uninsdeletevalue