--- imach/src/setup.iss	2014/06/10 21:25:04	1.11
+++ imach/src/setup.iss	2022/08/31 10:29:45	1.19
@@ -1,9 +1,30 @@
 ; -- IMaCh.iss --
-; $Id: setup.iss,v 1.11 2014/06/10 21:25:04 brouard Exp $
+; $Id: setup.iss,v 1.19 2022/08/31 10:29:45 brouard Exp $
 ;  $State: Exp $
 ;  $Log: setup.iss,v $
-;  Revision 1.11  2014/06/10 21:25:04  brouard
-;  Author: Nicolas Brouard
+;  Revision 1.19  2022/08/31 10:29:45  brouard
+;  *** empty log message ***
+;
+;  Revision 1.17  2022/03/15 18:40:36  brouard
+;  Summary:IMaCh-0.99r24
+;
+;  Revision 1.16  2015/10/27 19:51:28  brouard
+;  Summary: some new subdirs
+;
+;  Revision 1.15  2015/10/27 17:36:40  brouard
+;  Summary: Adding gnuplot 5.1 with bin and etc for pango fonts
+;
+;  Revision 1.14  2015/08/18 23:18:16  brouard
+;  *** empty log message ***
+;
+;  Revision 1.13  2015/08/04 07:18:28  brouard
+;  *** empty log message ***
+;
+;  Revision 1.12  2015/03/11 13:28:31  brouard
+;  Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5
+;
+;  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 +58,25 @@
 ; 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.99r34
+AppVerName=IMaCh-0.99r34 Version 0.99r34
+AppCopyright=Copyright (C)  2002-2022 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-19
+DefaultDirName={pf}\IMaCh-0.99r34
 DefaultGroupName=IMaCh
-OutputBaseFilename=imach-0.98nR-1-setup
+OutputManifestFile=imach-0.99r34-icl-filelist.txt
+OutputBaseFilename=imach-0.99r34-icl-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 +85,28 @@ InfoBeforeFile=README.txt
 ChangesAssociations=yes
 
 [Files]
-Source: imach.exe; DestDir: {app}\bin
+; Install IMaCh-x640.99r34.exe if running in 64-bit mode (x64; see above),
+; IMaCh.exe otherwise.
+;Source: "IMaCh-icl64-0.99r34.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-0.99r34.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-icl32-0.99r34.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-0.99r34.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: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\bin\*; DestDir: {app}\bin
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\pango\*; DestDir: {app}\etc\pango
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\pango\1.6.0\modules\*; DestDir: {app}\etc\pango\1.6.0\modules
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\fonts\fonts.conf; DestDir: {app}\etc\fonts\fonts.conf
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\fonts\conf.d\*; DestDir: {app}\etc\fonts\conf.d
+;;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
@@ -106,6 +149,11 @@ Source: ..\html\doc\biaspar\varmuptjgr-s
 Source: ..\html\doc\data\mydata.txt; DestDir: {app}\doc\data
 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc
 Source: ..\html\doc\data1.txt; DestDir: {app}\doc
+Source: ..\tests\testV1V2.imach; DestDir: {app}\tests
+Source: ..\tests\rtestV1V2.imach; DestDir: {app}\tests
+Source: ..\tests\testV2.imach; DestDir: {app}\tests
+Source: ..\tests\rtestV2.imach; DestDir: {app}\tests
+Source: ..\tests\data\data2.txt; DestDir: {app}\tests\data
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps:
 
 [Run]
@@ -127,8 +175,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.99r34 0.99r34; IconFilename: {app}\imach.ico
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r34 0.99r34; 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 +192,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.99r34; 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: 5.1; 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