--- imach/src/setup.iss	2015/05/05 08:52:05	1.13
+++ imach/src/setup.iss	2022/03/15 18:40:36	1.18
@@ -1,8 +1,20 @@
 ; -- IMaCh.iss --
-; $Id: setup.iss,v 1.13 2015/05/05 08:52:05 brouard Exp $
+; $Id: setup.iss,v 1.18 2022/03/15 18:40:36 brouard Exp $
 ;  $State: Exp $
 ;  $Log: setup.iss,v $
-;  Revision 1.13  2015/05/05 08:52:05  brouard
+;  Revision 1.18  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
@@ -43,12 +55,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
 [Setup]
-AppName=IMaCh-0.98q2
-AppVerName=IMaCh-0.98q2 Version 0.98q2
-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.98q2
+AppName=IMaCh-0.99r24
+AppVerName=IMaCh-0.99r24 Version 0.99r24
+AppCopyright=Copyright (C)  2002-2019 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.99r24
 DefaultGroupName=IMaCh
-OutputBaseFilename=imach-0.98q2-ilc-setup
+OutputManifestFile=imach-0.99r24-icl-filelist.txt
+OutputBaseFilename=imach-0.99r24-icl-setup
 UninstallDisplayIcon={app}\imach.exe
 Compression=lzma2
 SolidCompression=yes
@@ -69,16 +82,22 @@ ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes
 
 [Files]
-; Install IMaCh-x640.98q2.exe if running in 64-bit mode (x64; see above),
+; Install IMaCh-x640.99r24.exe if running in 64-bit mode (x64; see above),
 ; IMaCh.exe otherwise.
-Source: "IMaCh-ilc64-0.98q2.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-Source: "IMaCh-ilc32-0.98q2.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+;Source: "IMaCh-icl64-0.99r24.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-0.99r24.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-icl32-0.99r24.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-0.99r24.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}
 
@@ -127,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]
@@ -148,8 +172,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.98q2 0.98q2; IconFilename: {app}\imach.ico
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q2 0.98q2; Flags: runmaximized
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r24 0.99r24; IconFilename: {app}\imach.ico
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r24 0.99r24; 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
@@ -165,9 +189,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.98q2; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.99r24; 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.6; 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