From: Agnès Lièvre <agnes.lievre@education.gouv.fr>
Date: Thu, 9 Feb 2006 14:29:39 +0000 (+0000)
Subject: (Module): IMACHSETUPVERSION added
X-Git-Tag: imach-099s7~528
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=af4067cbe4290406113c0da01fbe440986dc8936;p=.git

(Module): IMACHSETUPVERSION added
---

diff --git a/src/Makefile b/src/Makefile
index e9c0368..6a22c8c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -55,7 +55,7 @@ TMPSCRIPTIN=setup.iss.in
 APPNAME=IMaCh
 VERSION=0.98b
 GNUPLOTVERSION=4.0
-IMACHSETUPVERSION=1
+IMACHSETUPVERSION=2
 LICENSE=Copying
 COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
@@ -66,6 +66,7 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
 		s/@NOTINNOREG@//g; \
 		s/@NOREG@//g; \
+		s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
 		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
@@ -81,6 +82,7 @@ $(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
 		s/@NOTINNOREG@/\\;/g; \
 		s/@NOREG@/noreg-/g; \
+		s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
 		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
diff --git a/src/setup.iss.in b/src/setup.iss.in
index 5f50066..609a55c 100644
--- a/src/setup.iss.in
+++ b/src/setup.iss.in
@@ -2,6 +2,9 @@
 ; $Id$
 ;  $State$
 ;  $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
 ;
@@ -22,7 +25,7 @@ AppVerName=@APPNAME@ Version @VERSION@
 AppCopyright=@COPYRIGHT@
 DefaultDirName={pf}\IMaCh
 DefaultGroupName=IMaCh
-OutputBaseFilename=imach-@VERSION@-@NOREG@setup
+OutputBaseFilename=imach-@VERSION@-@NOREG@setup@IMACHSETUPVERSION@
 UninstallDisplayIcon={app}\imach.exe
 InfoBeforeFile=@INFOBEFOREFILE@
 ;;SetupIconFile={app}\imach.exe
@@ -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\
 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
 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: