--- imach/src/setup.iss.in	2005/05/04 17:21:23	1.1
+++ imach/src/setup.iss.in	2015/03/11 13:28:31	1.12
@@ -1,5 +1,40 @@
 ; -- IMaCh.iss --
-;  
+; $Id: setup.iss.in,v 1.12 2015/03/11 13:28:31 brouard Exp $
+;  $State: Exp $
+;  $Log: setup.iss.in,v $
+;  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
+;
+;  Revision 1.9  2006/02/09 20:10:37  lievre
+;  (Module): IMACHSETUPVERSION added
+;
+;  Revision 1.8  2006/02/09 15:21:55  lievre
+;  * setup.iss.in (Module): IMACHSETUPVERSION added
+;
+;  * noreg-setup.iss (Module): added to cvs tree
+;
+;  Revision 1.7  2006/02/09 14:29:39  lievre
+;  (Module): IMACHSETUPVERSION added
+;
+;  Revision 1.6  2006/01/27 20:19:13  brouard
+;  noreg added
+;
+;  Revision 1.5  2005/09/30 18:02:25  lievre
+;  unix2dos added
+;
+;  Revision 1.4  2005/09/30 17:39:58  lievre
+;  The files mypar.txt and data1.txt added
+;
+;  Revision 1.3  2005/05/04 17:32:58  brouard
+;  Set version
+;
+;
 ;
 
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
@@ -8,28 +43,45 @@
 AppName=@APPNAME@
 AppVerName=@APPNAME@ Version @VERSION@
 AppCopyright=@COPYRIGHT@
-DefaultDirName={pf}\IMaCh
+DefaultDirName={pf}\@APPNAME@
 DefaultGroupName=IMaCh
+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.
 ; MinVersion=4,3.51
-ChangesAssociations=yes
+
+@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: "IMaCh-@APPCOMPILATIONMODE@32-@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: 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
@@ -69,8 +121,9 @@ Source: ..\html\doc\biaspar\varpijgrbias
 Source: ..\html\doc\biaspar\varpijgrbiaspar123-13.png; DestDir: {app}\doc\biaspar\
 Source: ..\html\doc\biaspar\varpijgrbiaspar123-21.png; DestDir: {app}\doc\biaspar\
 Source: ..\html\doc\biaspar\varmuptjgr-stablbased-biaspar1.png; DestDir: {app}\doc\biaspar\
-Source: ..\html\doc\mydata.txt; DestDir: {app}\doc
+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
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps:
 
 [Run]
@@ -93,7 +146,7 @@ Source: ..\html\doc\mypar.imach; DestDir
 
 [Icons]
 Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: @APPNAME@ @VERSION@; IconFilename: {app}\imach.ico
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: @APPNAME@@ @VERSION@; Flags: runmaximized
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: @APPNAME@ @VERSION@; 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
@@ -108,22 +161,22 @@ Name: {group}\Visit the IMaCh web site;
 ;;Root: HKCU; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty
 ;;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: @VERSION@; 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: @GNUPLOTVERSION@; 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
-Root: HKCR; Subkey: gnuplot.exe; ValueType: string; ValueName: ; ValueData: Gnuplot File; Flags: uninsdeletekey
-Root: HKCR; Subkey: gnuplot.exe\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\gnuplot.exe"" ""%1"""
-Root: HKCR; Subkey: gnuplot.exe\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\gnuplot.exe,0
-;
-Root: HKCR; Subkey: .imach; ValueType: string; ValueName: ; ValueData: IMaChFile; Flags: uninsdeletevalue
-Root: HKCR; Subkey: IMaChFile; ValueType: string; ValueName: ; ValueData: IMaCh Parameter File; Flags: uninsdeletekey
-Root: HKCR; Subkey: IMaChFile\shell\edit\command; ValueType: string; ValueName: ; ValueData: """notepad"" ""%1"""; Flags: uninsdeletekey
-Root: HKCR; Subkey: IMaChFile\shell\execute\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\imach.exe"" ""%1"""; Flags: uninsdeletekey
-Root: HKCR; Subkey: IMaChFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\imach.ico
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: @VERSION@; Flags: uninsdeletekeyifempty
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app}
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: @GNUPLOTVERSION@; Flags: uninsdeletekeyifempty
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}
+
+@NOTINNOREG@Root: HKCR; Subkey: .gp; ValueType: string; ValueName: ; ValueData: gnuplot.exe; Flags: uninsdeletevalue
+@NOTINNOREG@Root: HKCR; Subkey: gnuplot.exe; ValueType: string; ValueName: ; ValueData: Gnuplot File; Flags: uninsdeletekey
+@NOTINNOREG@Root: HKCR; Subkey: gnuplot.exe\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\gnuplot.exe"" ""%1"""
+@NOTINNOREG@Root: HKCR; Subkey: gnuplot.exe\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\gnuplot.exe,0
+;
+@NOTINNOREG@Root: HKCR; Subkey: .imach; ValueType: string; ValueName: ; ValueData: IMaChFile; Flags: uninsdeletevalue
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile; ValueType: string; ValueName: ; ValueData: IMaCh Parameter File; Flags: uninsdeletekey
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile\shell\edit\command; ValueType: string; ValueName: ; ValueData: """notepad"" ""%1"""; Flags: uninsdeletekey
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile\shell\execute\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\imach.exe"" ""%1"""; Flags: uninsdeletekey
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\imach.ico
 ;;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment; MinVersion: 0,1
 ;;User-specific environment variables are located at:
 ;