Summary: Version 0.99r38

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37ee45be44c524b22797789b81ae4779222bbc96..b97f55896cf727469803ea88cb6e1ccb9058c95d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@
 # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
 set(PACKAGE_NAME "imach")
 SET(IMACH_VERSION_MAJOR 0)
-SET(IMACH_VERSION_MINOR 99r37)
+SET(IMACH_VERSION_MINOR 99r38)
 SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})

diff --git a/distributions/osx/IMaChInfo.plist.in b/distributions/osx/IMaChInfo.plist.in
index 69592fb4cca42810eb28d70dac62d687a07f0cb8..0436c332e12aa8dcc1cc0cc1b8e7e1f5fd497ee5 100644 (file)
--- a/distributions/osx/IMaChInfo.plist.in
+++ b/distributions/osx/IMaChInfo.plist.in
@@ -30,13 +30,11 @@
                </dict>
        </array>
        <key>CFBundleExecutable</key>
-       <string>imach</string>
+       <string>imach.sh</string>
        <key>CFBundleIconFile</key>
        <string>IMaCh</string>
        <key>CFBundleTypeExtensions</key>
-       <array>
          <string>imach</string>
-       </array>
        <key>CFBundleShortVersionString</key>
        <string>@VERSION@</string>
        <key>CFBundleVersion</key>

diff --git a/distributions/osx/createdmg4.sh b/distributions/osx/createdmg4.sh
index aad40707d5794c76cb565d8176bb6fb98c70297b..bc04e728da929c16a85aa717881c0fbcebac4163 100755 (executable)
--- a/distributions/osx/createdmg4.sh
+++ b/distributions/osx/createdmg4.sh
@@ -145,8 +145,8 @@ hdiutil convert "${DMG_TMP}"  -format UDZO -imagekey zlib-level=9 -o "${DMG_FINA
 # clean up
 pwd
 sleep 2
-rm -rf "${DMG_TMP}"
-rm -rf "${STAGING_DIR}"
+##rm -rf "${DMG_TMP}"
+##rm -rf "${STAGING_DIR}"
 
 echo 'Done.'
 

diff --git a/distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX b/distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX
deleted file mode 100755 (executable)
index 522dfb0..0000000
Binary files a/distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX and /dev/null differ

diff --git a/html/doc/rbiaspar.imach b/html/doc/rbiaspar.imach
index 7173572b952b02f9861e86043e02e7b01a512bb1..9bd01bad703eaf608614725e913ccfc3907b4e26 100644 (file)
--- a/html/doc/rbiaspar.imach
+++ b/html/doc/rbiaspar.imach
@@ -1,5 +1,5 @@
-#IMaCh 0.99r19
-#0.99r10\r
+#IMaCh 0.99r24
+#0.99r24\r
 #Number of iterations & function calls = 33 & 6007, -2 Log likelihood = 46617.105944307616\r
 title=1st_example datafile=data1.txt lastobs=8600 firstpass=1 lastpass=4
 ftol=1.000000e-08 stepm=1 ncovcol=2 nqv=0 ntv=0 nqtv=0 nlstate=2 ndeath=1 maxwav=4 mle=0 weight=0

diff --git a/src/Makefile b/src/Makefile
index ff148d110e14d95045b2874a7e0991514f2b6175..c97944b81b8af3e863e83b34b954900511571b93 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -356,7 +356,7 @@ imachICL-build: imach.c
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
 # both 32 and 64 executables should have been built on Windows with Intel compiler.
 
-imachICL-set: ../build/icl64/Release/imach-$(VERSION).exe ../build/icl32/Release/imach-$(VERSION).exe setup.iss  setup.iss 
+imachICL-set: ../build/icl64/Release/imach-$(VERSION).exe ../build/icl32/Release/imach-$(VERSION).exe setup.iss
        pwd
        touch setup.iss.in
        echo SETUPCOMP=$(SETUPCOMP)
@@ -789,8 +789,8 @@ upload:
 #      rsync -v Output/imach-0.99r19-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/imach0.99r12-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach-0.99r34-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach0.99r34.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach-0.99r36-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach0.99r36.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o
        $(CC) $(LFLAGS) -o imach imachcyg.o

diff --git a/src/setup.iss b/src/setup.iss
index 189ea3ab6e9b285ea9f15b072c810d87542b9b39..743322617cfcfb25527b79502b4b45047e3f81f9 100644 (file)
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -55,13 +55,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
-AppName=IMaCh-0.99r34\r
-AppVerName=IMaCh-0.99r34 Version 0.99r34\r
+AppName=IMaCh-0.99r36\r
+AppVerName=IMaCh-0.99r36 Version 0.99r36\r
 AppCopyright=Copyright (C)  2002-2022 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-19\r
-DefaultDirName={pf}\IMaCh-0.99r34\r
+DefaultDirName={pf}\IMaCh-0.99r36\r
 DefaultGroupName=IMaCh\r
-OutputManifestFile=imach-0.99r34-icl-filelist.txt
-OutputBaseFilename=imach-0.99r34-icl-setup\r
+OutputManifestFile=imach-0.99r36-icl-filelist.txt
+OutputBaseFilename=imach-0.99r36-icl-setup\r
 UninstallDisplayIcon={app}\imach.exe\r
 Compression=lzma2\r
 SolidCompression=yes\r
@@ -82,12 +82,12 @@ ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes\r
 \r
 [Files]\r
-; Install IMaCh-x640.99r34.exe if running in 64-bit mode (x64; see above),\r
+; Install IMaCh-x640.99r36.exe if running in 64-bit mode (x64; see above),\r
 ; IMaCh.exe otherwise.\r
-;Source: "IMaCh-icl64-0.99r34.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-Source: "..\build\icl64\Release\IMaCh-0.99r34.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-;Source: "IMaCh-icl32-0.99r34.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
-Source: "..\build\icl32\Release\IMaCh-0.99r34.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+;Source: "IMaCh-icl64-0.99r36.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-0.99r36.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-icl32-0.99r36.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-0.99r36.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
 ;Source: "IMaCh.chm"; DestDir: "{app}\bin"\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
 Source: README.txt; DestDir: {app}; Flags: isreadme\r
@@ -172,8 +172,8 @@ Source: ..\tests\data\data2.txt; DestDir: {app}\tests\data
 ;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.99r34 0.99r34; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r34 0.99r34; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r36 0.99r36; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r36 0.99r36; 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
@@ -189,7 +189,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.99r34; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.99r36; 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: 5.1; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r

diff --git a/src/version.h b/src/version.h
index 8350ff78991b8958b0af90e60c99db74b6c721cd..549ef21c27ef3c79fa1af2ff452b398f0a2565e3 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,6 +1,7 @@
-#define __IMACH_VERSION_MAJOR__ 0\r
-#define __IMACH_VERSION_MINOR__ 99r34\r
-#define __IMACH_VERSION_PATCH__ 0\r
-\r
-#define __IMACH_VERSION__ "0.99r34"\r
+
+#define __IMACH_VERSION_MAJOR__ 0
+#define __IMACH_VERSION_MINOR__ 99r38
+#define __IMACH_VERSION_PATCH__ 0
+
+#define __IMACH_VERSION__ "0.99r38"