--- imach/src/setup.iss.in	2005/05/04 17:32:58	1.3
+++ imach/src/setup.iss.in	2009/10/29 13:20:46	1.10
@@ -1,9 +1,32 @@
 ; -- IMaCh.iss --
-; $Id: setup.iss.in,v 1.3 2005/05/04 17:32:58 brouard Exp $
+; $Id: setup.iss.in,v 1.10 2009/10/29 13:20:46 brouard Exp $
 ;  $State: Exp $
 ;  $Log: setup.iss.in,v $
-;  Revision 1.3  2005/05/04 17:32:58  brouard
-;  Set version
+;  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
 ;
 ;
 ;
@@ -14,20 +37,22 @@
 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
 InfoBeforeFile=@INFOBEFOREFILE@
 ;;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
 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
@@ -75,8 +100,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]
@@ -99,7 +125,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
@@ -114,22 +140,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:
 ;