*** empty log message ***

diff --git a/src/Makefile b/src/Makefile
index 26fbc6509549f0871608fad5913d0c12df9bc544..22b11fc138a95a872ddeb10e2d9c86fb0302b29f 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
-VERSION=0.98q1
+VERSION=0.98q2
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
-IMACHSETUPVERSION=ilc # This is for Windows only
+IMACHSETUPVERSION=ilc
+# This is for Windows only
 #IMACHSETUPVERSION=mvc
 
 #       Linux
@@ -21,7 +22,6 @@ IMACHSETUPVERSION=ilc # This is for Windows only
 
 #        Windows
 # make _windowsonosx=1 imachILC-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
-# make _windowsonosx=1 imachILC64-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
 # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make _windowsonosx=1 imachMVC-noreg-setup
 #
@@ -460,7 +460,8 @@ imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh
 md5:
        ls Output/* | xargs md5sum
 upload:
-       rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/
+       rsync -v Output/imach-0.98q2-ilc-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/
+#rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/
 
 imachcyg : imachcyg.o
        $(CC) $(LFLAGS) -o imach imachcyg.o

diff --git a/src/setup.iss b/src/setup.iss
index a3d830c4ba7f011c13f3674bbddedf9b42c87be3..945be64730cf23426c75a74510516d19e73c327a 100644 (file)
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -2,6 +2,9 @@
 ; $Id$\r
 ;  $State$\r
 ;  $Log$
+;  Revision 1.12  2015/03/11 13:28:31  brouard
+;  Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5
+;
 ;  Revision 1.11  2014/09/15 20:57:31  brouard
 ;  *** empty log message ***
 ;
@@ -37,12 +40,12 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
-AppName=IMaCh-0.98p0\r
-AppVerName=IMaCh-0.98p0 Version 0.98p0\r
+AppName=IMaCh-0.98q2\r
+AppVerName=IMaCh-0.98q2 Version 0.98q2\r
 AppCopyright=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015\r
-DefaultDirName={pf}\IMaCh-0.98p0\r
+DefaultDirName={pf}\IMaCh-0.98q2\r
 DefaultGroupName=IMaCh\r
-OutputBaseFilename=imach-0.98p0-ilc-setup\r
+OutputBaseFilename=imach-0.98q2-ilc-setup\r
 UninstallDisplayIcon={app}\imach.exe\r
 Compression=lzma2\r
 SolidCompression=yes\r
@@ -63,10 +66,10 @@ ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes\r
 \r
 [Files]\r
-; Install IMaCh-x640.98p0.exe if running in 64-bit mode (x64; see above),\r
+; Install IMaCh-x640.98q2.exe if running in 64-bit mode (x64; see above),\r
 ; IMaCh.exe otherwise.\r
-Source: "IMaCh-ilc64-0.98p0.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode\r
-Source: "IMaCh-ilc32-0.98p0.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode\r
+Source: "IMaCh-ilc64-0.98q2.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode\r
+Source: "IMaCh-ilc32-0.98q2.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode\r
 ;Source: "IMaCh.chm"; DestDir: "{app}\bin"\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
 Source: README.txt; DestDir: {app}; Flags: isreadme\r
@@ -142,8 +145,8 @@ Source: ..\html\doc\data1.txt; DestDir: {app}\doc
 ;P.S. -silent is recommended for use in install scripts\r
 \r
 [Icons]\r
-Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98p0 0.98p0; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98p0 0.98p0; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q2 0.98q2; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q2 0.98q2; 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
@@ -159,7 +162,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 ;;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: 0.98p0; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98q2; 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: 4.6; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r