(Module): IMACHSETUPVERSION added

diff --git a/src/Makefile b/src/Makefile
index e9c0368088d423814dbaf6cf73bafee7d53c9a0a..6a22c8c71f112c1fc36b0f168347f1e0952c0e34 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -55,7 +55,7 @@ TMPSCRIPTIN=setup.iss.in
 APPNAME=IMaCh\r
 VERSION=0.98b\r
 GNUPLOTVERSION=4.0\r
-IMACHSETUPVERSION=1\r
+IMACHSETUPVERSION=2\r
 LICENSE=Copying\r
 COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité\r
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe\r
@@ -66,6 +66,7 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
        $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \\r
                s/@NOTINNOREG@//g; \\r
                s/@NOREG@//g; \\r
+               s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \\r
                s/@VERSION@/$(VERSION)/g; \\r
                s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \\r
                s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \\r
@@ -81,6 +82,7 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
        $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \\r
                s/@NOTINNOREG@/\\;/g; \\r
                s/@NOREG@/noreg-/g; \\r
+               s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \\r
                s/@VERSION@/$(VERSION)/g; \\r
                s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \\r
                s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \\r

diff --git a/src/setup.iss.in b/src/setup.iss.in
index 5f50066ec84413a03ff7e5155793f18c3c553d0b..609a55c9bb2a930cbc35b346bfacc1b1fd3b9f6b 100644 (file)
--- a/src/setup.iss.in
+++ b/src/setup.iss.in
@@ -2,6 +2,9 @@
 ; $Id$\r
 ;  $State$\r
 ;  $Log$
+;  Revision 1.6  2006/01/27 20:19:13  brouard
+;  noreg added
+;
 ;  Revision 1.5  2005/09/30 18:02:25  lievre
 ;  unix2dos added
 ;\r
@@ -22,7 +25,7 @@ AppVerName=@APPNAME@ Version @VERSION@
 AppCopyright=@COPYRIGHT@\r
 DefaultDirName={pf}\IMaCh\r
 DefaultGroupName=IMaCh\r
-OutputBaseFilename=imach-@VERSION@-@NOREG@setup\r
+OutputBaseFilename=imach-@VERSION@-@NOREG@setup@IMACHSETUPVERSION@\r
 UninstallDisplayIcon={app}\imach.exe\r
 InfoBeforeFile=@INFOBEFOREFILE@\r
 ;;SetupIconFile={app}\imach.exe\r
@@ -83,7 +86,7 @@ Source: ..\html\doc\biaspar\varpijgrbiaspar121-13.png; DestDir: {app}\doc\biaspa
 Source: ..\html\doc\biaspar\varpijgrbiaspar123-13.png; DestDir: {app}\doc\biaspar\\r
 Source: ..\html\doc\biaspar\varpijgrbiaspar123-21.png; DestDir: {app}\doc\biaspar\\r
 Source: ..\html\doc\biaspar\varmuptjgr-stablbased-biaspar1.png; DestDir: {app}\doc\biaspar\\r
-Source: ..\html\doc\mydata.txt; DestDir: {app}\doc\r
+Source: ..\html\doc\data\mydata.txt; DestDir: {app}\doc\r
 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc\r
 Source: ..\html\doc\data1.txt; DestDir: {app}\doc\r
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps:\r