From 69be7b0a33a6d60c7a6cd23bee94199e18ea90aa Mon Sep 17 00:00:00 2001
From: "N. Brouard" <brouard@ined.fr>
Date: Fri, 27 Jan 2006 20:19:13 +0000
Subject: [PATCH] noreg added

---
 src/Makefile     | 89 +++++++++++++++++++++++++++++++++---------------
 src/setup.iss.in | 41 ++++++++++++----------
 2 files changed, 84 insertions(+), 46 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index de13b35..9c3d1ea 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,26 +2,27 @@
 CC= gcc
 
 # Mac OS/X version
-LFLAGS= -O3 -lm -DUNIX
-CFLAGS= -O3 -DUNIX
-UNIX2DOS= echo "Unix2dos " 
+#MACOSX#_LFLAGS= -O3 -lm -DUNIX
+#MACOSX#_CFLAGS= -O3 -DUNIX
+#MACOSX#_UNIX2DOS= echo "Unix2dos " 
 # Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg
 # ./createdmg.sh imach imach098panther ./imach098Panther
 # and directory ./imach098Panther contains package file imach098Panther.pkg
 
 # Windows cygwin version
-#LFLAGS= -g -mno-cygwin
-#CFLAGS= -g
-
-#LFLAGS= -O3 -mno-cygwin
-#CFLAGS= -O3 -mno-cygwin
-#LFLAGS= -g -lm
-#CFLAGS= -g 
-#UNIX2DOS= unix2dos
+#WINDOWS#_
+LFLAGS= -g -mno-cygwin
+CFLAGS= -g -mno-cygwin
+LFLAGSOPT= -O3 -mno-cygwin
+CFLAGSOPT= -O3 -mno-cygwin
+UNIX2DOS= unix2dos
 
 # Linux version
-#LFLAGS= -O3 -lm
-#CFLAGS= -O3 
+#LINUX#_
+#LINUX#_CFLAGS= -g -DUNIX
+#LINUX#_LFLAGS= -g -lm
+#LINUX#_CFLAGSOPT= -O3 -DUNIX -lm
+#LINUX#_LFLAGSOPT= -O3 -lm
 #UNIX2DOS= unix2dos
 
 SED= sed
@@ -37,30 +38,34 @@ PROGRAM=IMaCh
 
 #SETUPCOMP= echo 
 # Linux
-#SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
+#LINUX#_SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
+
 #Windows cygwin
 # make imachcyg
-# make imach-setupe.exe
-# sortie dans Outpu/setup.exe
-# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 3/Compil32.exe /usr/local/bin/Compil32
+# make imach-setup.exe
+# sortie dans Output/setup.exe
+# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
+
 SETUPCOMP= Compil32 
 TMPSETUPSCRIPT=setup.iss
+TMPNOREGSETUPSCRIPT=noreg-setup.iss
 TMPSCRIPTIN=setup.iss.in
 APPNAME=IMaCh
-VERSION=0.98
+VERSION=0.98b
 GNUPLOTVERSION=4.0
-IMACHSETUPVERSION=2
+IMACHSETUPVERSION=1
 LICENSE=Copying
-COPYRIGHT=Copyright (C)  2002-2003-2004-2005 INED-EUROREVES-Institut de longévité
-#TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
-TMPSETUPEXE=imach-setup.exe
+COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
+TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 LICENSEFILE=$(LICENSE)
-INFOBEFOREFILE=Readme.txt
+INFOBEFOREFILE=README.txt
 
 $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
+		s/@NOTINNOREG@//g; \
+		s/@NOREG@//g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
 		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
@@ -72,20 +77,47 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
 	$(UNIX2DOS) $(TMPSETUPSCRIPT)
 
+$(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
+	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
+		s/@NOTINNOREG@/\\;/g; \
+		s/@NOREG@/noreg-/g; \
+		s/@VERSION@/$(VERSION)/g; \
+		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
+		s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
+		s/@LICENSEFILE@/$(LICENSEFILE)/g; \
+		s/@PACKAGE@/$(PACKAGE)/g; \
+		s/@DICTLANG@/$(DICTLANG)/g; \
+	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
+		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
+		$(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)
+	$(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
+
 $(TMPSETUPEXE): $(TMPSETUPSCRIPT)
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
 
+$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
+	$(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+
 PARAM=mypar1
 
+imachcyg-setup : imachcygopt imachcygopt.o setup.iss.in $(TMPSETUPEXE)
+
+# imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)
+imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)
+
 imach : imach.o 
 	$(CC) $(LFLAGS) -o imach imach.o
 imach.o : imach.c 
 	$(CC) $(CFLAGS) -c imach.c
 
-imachcyg : imachcyg.o  $(TMPSETUPSCRIPT) 
-	$(CC) -mno-cygwin -o imach imachcyg.o
+imachcyg : imachcyg.o  
+	$(CC) $(LFLAGS) -o imach imachcyg.o
 imachcyg.o : imach.c 
-	$(CC) -mno-cygwin -c -o imachcyg.o imach.c
+	$(CC) $(CFLAGS)  -c -o imachcyg.o imach.c
+imachcygopt : imachcygopt.o  
+	$(CC) $(LFLAGSOPT) -o imach.exe imachcygopt.o
+imachcygopt.o : imach.c 
+	$(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c
 
 imachw32.o : imach.c
 	i386-mingw32-gcc -c imach.c -o imachw32.o
@@ -93,8 +125,9 @@ imach.exe : imachw32.o
 	i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
 	i386-mingw32-strip imach.exe
 
-$(PARAM).htm: imach $(PARAM).txt data1.txt
-	./imach $(PARAM).txt
+
+$(PARAM).htm: imach $(PARAM).imach data1.txt
+	./imach $(PARAM).imach
 
 clean: 
 	rm or$(PARAM).txt er$(PARAM).txt pijr$(PARAM).txt plr$(PARAM).txt \
diff --git a/src/setup.iss.in b/src/setup.iss.in
index 83bf8fc..5f50066 100644
--- a/src/setup.iss.in
+++ b/src/setup.iss.in
@@ -1,7 +1,10 @@
 ; -- IMaCh.iss --
 ; $Id$
 ;  $State$
-;  $Log$
+;  $Log$
+;  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
 ;
@@ -19,18 +22,20 @@ AppVerName=@APPNAME@ Version @VERSION@
 AppCopyright=@COPYRIGHT@
 DefaultDirName={pf}\IMaCh
 DefaultGroupName=IMaCh
+OutputBaseFilename=imach-@VERSION@-@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
@@ -103,7 +108,7 @@ Source: ..\html\doc\data1.txt; DestDir: {app}\doc
 
 [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
@@ -118,22 +123,22 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 ;;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}
+@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}
 
-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
+@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
 ;
-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: 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:
 ;
-- 
2.43.0