--- imach/src/setup.iss.in	2014/09/15 20:57:31	1.11
+++ imach/src/setup.iss.in	2022/03/15 18:40:36	1.17
@@ -1,7 +1,25 @@
 ; -- IMaCh.iss --
-; $Id: setup.iss.in,v 1.11 2014/09/15 20:57:31 brouard Exp $
+; $Id: setup.iss.in,v 1.17 2022/03/15 18:40:36 brouard Exp $
 ;  $State: Exp $
 ;  $Log: setup.iss.in,v $
+;  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 ***
 ;
@@ -42,9 +60,20 @@ AppVerName=@APPNAME@ Version @VERSION@
 AppCopyright=@COPYRIGHT@
 DefaultDirName={pf}\@APPNAME@
 DefaultGroupName=IMaCh
+OutputManifestFile=imach-@VERSION@-@IMACHSETUPVERSION@-filelist.txt
 OutputBaseFilename=imach-@VERSION@-@IMACHSETUPVERSION@-@NOREG@setup
 UninstallDisplayIcon={app}\imach.exe
+Compression=lzma2
+SolidCompression=yes
 InfoBeforeFile=@INFOBEFOREFILE@
+; "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,12 +82,22 @@ InfoBeforeFile=@INFOBEFOREFILE@
 @NOTINNOREG@ChangesAssociations=yes
 
 [Files]
-Source: imach.exe; DestDir: {app}\bin
+; Install IMaCh-x64@VERSION@.exe if running in 64-bit mode (x64; see above),
+; IMaCh.exe otherwise.
+;Source: "IMaCh-@APPCOMPILATIONMODE@64-@VERSION@.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-@VERSION@.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-@APPCOMPILATIONMODE@32-@VERSION@.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-@VERSION@.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: gnuplot_bin\windows-265\bin\*; 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}
 
@@ -107,6 +146,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]