noreg added

diff --git a/src/Makefile b/src/Makefile
index de13b35a549f9df8c0dbecce463c6890eee0fbd2..9c3d1ea0270b63c8d1089646d8a438412bfed484 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,26 +2,27 @@
 CC= gcc\r
 \r
 # Mac OS/X version\r
-LFLAGS= -O3 -lm -DUNIX\r
-CFLAGS= -O3 -DUNIX\r
-UNIX2DOS= echo "Unix2dos " \r
+#MACOSX#_LFLAGS= -O3 -lm -DUNIX\r
+#MACOSX#_CFLAGS= -O3 -DUNIX\r
+#MACOSX#_UNIX2DOS= echo "Unix2dos " \r
 # Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg\r
 # ./createdmg.sh imach imach098panther ./imach098Panther\r
 # and directory ./imach098Panther contains package file imach098Panther.pkg\r
 \r
 # Windows cygwin version\r
-#LFLAGS= -g -mno-cygwin\r
-#CFLAGS= -g\r
-\r
-#LFLAGS= -O3 -mno-cygwin\r
-#CFLAGS= -O3 -mno-cygwin\r
-#LFLAGS= -g -lm\r
-#CFLAGS= -g \r
-#UNIX2DOS= unix2dos\r
+#WINDOWS#_\r
+LFLAGS= -g -mno-cygwin\r
+CFLAGS= -g -mno-cygwin\r
+LFLAGSOPT= -O3 -mno-cygwin\r
+CFLAGSOPT= -O3 -mno-cygwin\r
+UNIX2DOS= unix2dos\r
 \r
 # Linux version\r
-#LFLAGS= -O3 -lm\r
-#CFLAGS= -O3 \r
+#LINUX#_\r
+#LINUX#_CFLAGS= -g -DUNIX\r
+#LINUX#_LFLAGS= -g -lm\r
+#LINUX#_CFLAGSOPT= -O3 -DUNIX -lm\r
+#LINUX#_LFLAGSOPT= -O3 -lm\r
 #UNIX2DOS= unix2dos\r
 \r
 SED= sed\r
@@ -37,30 +38,34 @@ PROGRAM=IMaCh
 \r
 #SETUPCOMP= echo \r
 # Linux\r
-#SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"\r
+#LINUX#_SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"\r
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"\r
+\r
 #Windows cygwin\r
 # make imachcyg\r
-# make imach-setupe.exe\r
-# sortie dans Outpu/setup.exe\r
-# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 3/Compil32.exe /usr/local/bin/Compil32\r
+# make imach-setup.exe\r
+# sortie dans Output/setup.exe\r
+# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32\r
 ##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"\r
+\r
 SETUPCOMP= Compil32 \r
 TMPSETUPSCRIPT=setup.iss\r
+TMPNOREGSETUPSCRIPT=noreg-setup.iss\r
 TMPSCRIPTIN=setup.iss.in\r
 APPNAME=IMaCh\r
-VERSION=0.98\r
+VERSION=0.98b\r
 GNUPLOTVERSION=4.0\r
-IMACHSETUPVERSION=2\r
+IMACHSETUPVERSION=1\r
 LICENSE=Copying\r
-COPYRIGHT=Copyright (C)  2002-2003-2004-2005 INED-EUROREVES-Institut de longévité\r
-#TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe\r
-TMPSETUPEXE=imach-setup.exe\r
+COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité\r
+TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe\r
 LICENSEFILE=$(LICENSE)\r
-INFOBEFOREFILE=Readme.txt\r
+INFOBEFOREFILE=README.txt\r
 \r
 $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)\r
        $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \\r
+               s/@NOTINNOREG@//g; \\r
+               s/@NOREG@//g; \\r
                s/@VERSION@/$(VERSION)/g; \\r
                s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \\r
                s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \\r
@@ -72,20 +77,47 @@ $(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
                $(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)\r
        $(UNIX2DOS) $(TMPSETUPSCRIPT)\r
 \r
+$(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)\r
+       $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \\r
+               s/@NOTINNOREG@/\\;/g; \\r
+               s/@NOREG@/noreg-/g; \\r
+               s/@VERSION@/$(VERSION)/g; \\r
+               s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \\r
+               s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \\r
+               s/@LICENSEFILE@/$(LICENSEFILE)/g; \\r
+               s/@PACKAGE@/$(PACKAGE)/g; \\r
+               s/@DICTLANG@/$(DICTLANG)/g; \\r
+               s/@VERMAJOR@/$(VERMAJOR)/g; \\r
+               s/@COPYRIGHT@/$(COPYRIGHT)/g;" \\r
+               $(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)\r
+       $(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)\r
+\r
 $(TMPSETUPEXE): $(TMPSETUPSCRIPT)\r
        $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)\r
 \r
+$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)\r
+       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)\r
+\r
 PARAM=mypar1\r
 \r
+imachcyg-setup : imachcygopt imachcygopt.o setup.iss.in $(TMPSETUPEXE)\r
+\r
+# imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)\r
+imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)\r
+\r
 imach : imach.o \r
        $(CC) $(LFLAGS) -o imach imach.o\r
 imach.o : imach.c \r
        $(CC) $(CFLAGS) -c imach.c\r
 \r
-imachcyg : imachcyg.o  $(TMPSETUPSCRIPT) \r
-       $(CC) -mno-cygwin -o imach imachcyg.o\r
+imachcyg : imachcyg.o  \r
+       $(CC) $(LFLAGS) -o imach imachcyg.o\r
 imachcyg.o : imach.c \r
-       $(CC) -mno-cygwin -c -o imachcyg.o imach.c\r
+       $(CC) $(CFLAGS)  -c -o imachcyg.o imach.c\r
+imachcygopt : imachcygopt.o  \r
+       $(CC) $(LFLAGSOPT) -o imach.exe imachcygopt.o\r
+imachcygopt.o : imach.c \r
+       $(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c\r
 \r
 imachw32.o : imach.c\r
        i386-mingw32-gcc -c imach.c -o imachw32.o\r
@@ -93,8 +125,9 @@ imach.exe : imachw32.o
        i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o\r
        i386-mingw32-strip imach.exe\r
 \r
-$(PARAM).htm: imach $(PARAM).txt data1.txt\r
-       ./imach $(PARAM).txt\r
+\r
+$(PARAM).htm: imach $(PARAM).imach data1.txt\r
+       ./imach $(PARAM).imach\r
 \r
 clean: \r
        rm or$(PARAM).txt er$(PARAM).txt pijr$(PARAM).txt plr$(PARAM).txt \\r

diff --git a/src/setup.iss.in b/src/setup.iss.in
index 83bf8fc0bfcf15f75d18157ffbbb84f2dc48fcfe..5f50066ec84413a03ff7e5155793f18c3c553d0b 100644 (file)
--- a/src/setup.iss.in
+++ b/src/setup.iss.in
@@ -1,7 +1,10 @@
 ; -- IMaCh.iss --\r
 ; $Id$\r
 ;  $State$\r
-;  $Log$\r
+;  $Log$
+;  Revision 1.5  2005/09/30 18:02:25  lievre
+;  unix2dos added
+;\r
 ;  Revision 1.4  2005/09/30 17:39:58  lievre\r
 ;  The files mypar.txt and data1.txt added\r
 ;\r
@@ -19,18 +22,20 @@ AppVerName=@APPNAME@ Version @VERSION@
 AppCopyright=@COPYRIGHT@\r
 DefaultDirName={pf}\IMaCh\r
 DefaultGroupName=IMaCh\r
+OutputBaseFilename=imach-@VERSION@-@NOREG@setup\r
 UninstallDisplayIcon={app}\imach.exe\r
 InfoBeforeFile=@INFOBEFOREFILE@\r
 ;;SetupIconFile={app}\imach.exe\r
 ;;UninstallIconFile={app}\imach.ico\r
 ; uncomment the following line if you want your installation to run on NT 3.51 too.\r
 ; MinVersion=4,3.51\r
-ChangesAssociations=yes\r
+\r
+@NOTINNOREG@ChangesAssociations=yes\r
 \r
 [Files]\r
 Source: imach.exe; DestDir: {app}\bin\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
-Source: Readme.txt; DestDir: {app}; Flags: isreadme\r
+Source: README.txt; DestDir: {app}; Flags: isreadme\r
 Source: imach.ico; DestDir: {app}\bin\r
 Source: gnuplot.exe; DestDir: {app}\bin\r
 Source: wgnuplot.hlp; DestDir: {app}\bin\r
@@ -103,7 +108,7 @@ Source: ..\html\doc\data1.txt; DestDir: {app}\doc
 \r
 [Icons]\r
 Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: @APPNAME@ @VERSION@; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: @APPNAME@@ @VERSION@; Flags: runmaximized\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: @APPNAME@ @VERSION@; Flags: runmaximized\r
 Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url\r
 \r
 ; NOTE: Most apps do not need registry entries to be pre-created. If you\r
@@ -118,22 +123,22 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 ;;Root: HKCU; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty\r
 ;;Root: HKCU; Subkey: "Software\EuroREVES_INED\IMaCh"; Flags: uninsdeletekey\r
 ;;Root: HKLM; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: @VERSION@; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
-Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: @GNUPLOTVERSION@; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty\r
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: @VERSION@; Flags: uninsdeletekeyifempty\r
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: @GNUPLOTVERSION@; Flags: uninsdeletekeyifempty\r
+@NOTINNOREG@Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
 \r
-Root: HKCR; Subkey: .gp; ValueType: string; ValueName: ; ValueData: gnuplot.exe; Flags: uninsdeletevalue\r
-Root: HKCR; Subkey: gnuplot.exe; ValueType: string; ValueName: ; ValueData: Gnuplot File; Flags: uninsdeletekey\r
-Root: HKCR; Subkey: gnuplot.exe\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\gnuplot.exe"" ""%1"""\r
-Root: HKCR; Subkey: gnuplot.exe\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\gnuplot.exe,0\r
+@NOTINNOREG@Root: HKCR; Subkey: .gp; ValueType: string; ValueName: ; ValueData: gnuplot.exe; Flags: uninsdeletevalue\r
+@NOTINNOREG@Root: HKCR; Subkey: gnuplot.exe; ValueType: string; ValueName: ; ValueData: Gnuplot File; Flags: uninsdeletekey\r
+@NOTINNOREG@Root: HKCR; Subkey: gnuplot.exe\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\gnuplot.exe"" ""%1"""\r
+@NOTINNOREG@Root: HKCR; Subkey: gnuplot.exe\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\gnuplot.exe,0\r
 ;\r
-Root: HKCR; Subkey: .imach; ValueType: string; ValueName: ; ValueData: IMaChFile; Flags: uninsdeletevalue\r
-Root: HKCR; Subkey: IMaChFile; ValueType: string; ValueName: ; ValueData: IMaCh Parameter File; Flags: uninsdeletekey\r
-Root: HKCR; Subkey: IMaChFile\shell\edit\command; ValueType: string; ValueName: ; ValueData: """notepad"" ""%1"""; Flags: uninsdeletekey\r
-Root: HKCR; Subkey: IMaChFile\shell\execute\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\imach.exe"" ""%1"""; Flags: uninsdeletekey\r
-Root: HKCR; Subkey: IMaChFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\imach.ico\r
+@NOTINNOREG@Root: HKCR; Subkey: .imach; ValueType: string; ValueName: ; ValueData: IMaChFile; Flags: uninsdeletevalue\r
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile; ValueType: string; ValueName: ; ValueData: IMaCh Parameter File; Flags: uninsdeletekey\r
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile\shell\edit\command; ValueType: string; ValueName: ; ValueData: """notepad"" ""%1"""; Flags: uninsdeletekey\r
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile\shell\execute\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\imach.exe"" ""%1"""; Flags: uninsdeletekey\r
+@NOTINNOREG@Root: HKCR; Subkey: IMaChFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\bin\imach.ico\r
 ;;HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment; MinVersion: 0,1\r
 ;;User-specific environment variables are located at:\r
 ;\r