From: N. Brouard Date: Sun, 11 Sep 2022 07:59:43 +0000 (+0000) Subject: Summary: Version 0.99r38 X-Git-Tag: imach-099s7~73 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=9566b982c52aa51ff15222fa0026a6dce6d3ad2e;p=.git Summary: Version 0.99r38 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 37ee45b..b97f558 100644 --- 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 69592fb..0436c33 100644 --- a/distributions/osx/IMaChInfo.plist.in +++ b/distributions/osx/IMaChInfo.plist.in @@ -30,13 +30,11 @@ CFBundleExecutable - imach + imach.sh CFBundleIconFile IMaCh CFBundleTypeExtensions - imach - CFBundleShortVersionString @VERSION@ CFBundleVersion diff --git a/distributions/osx/createdmg4.sh b/distributions/osx/createdmg4.sh index aad4070..bc04e72 100755 --- 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 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 7173572..9bd01ba 100644 --- a/html/doc/rbiaspar.imach +++ b/html/doc/rbiaspar.imach @@ -1,5 +1,5 @@ -#IMaCh 0.99r19 -#0.99r10 +#IMaCh 0.99r24 +#0.99r24 #Number of iterations & function calls = 33 & 6007, -2 Log likelihood = 46617.105944307616 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 ff148d1..c97944b 100644 --- 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 189ea3a..7433226 100644 --- a/src/setup.iss +++ b/src/setup.iss @@ -55,13 +55,13 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES! [Setup] -AppName=IMaCh-0.99r34 -AppVerName=IMaCh-0.99r34 Version 0.99r34 +AppName=IMaCh-0.99r36 +AppVerName=IMaCh-0.99r36 Version 0.99r36 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 -DefaultDirName={pf}\IMaCh-0.99r34 +DefaultDirName={pf}\IMaCh-0.99r36 DefaultGroupName=IMaCh -OutputManifestFile=imach-0.99r34-icl-filelist.txt -OutputBaseFilename=imach-0.99r34-icl-setup +OutputManifestFile=imach-0.99r36-icl-filelist.txt +OutputBaseFilename=imach-0.99r36-icl-setup UninstallDisplayIcon={app}\imach.exe Compression=lzma2 SolidCompression=yes @@ -82,12 +82,12 @@ ArchitecturesInstallIn64BitMode=x64 ChangesAssociations=yes [Files] -; Install IMaCh-x640.99r34.exe if running in 64-bit mode (x64; see above), +; Install IMaCh-x640.99r36.exe if running in 64-bit mode (x64; see above), ; IMaCh.exe otherwise. -;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" Source: ..\html\doc\imach.htm; DestDir: {app}\doc Source: README.txt; DestDir: {app}; Flags: isreadme @@ -172,8 +172,8 @@ Source: ..\tests\data\data2.txt; DestDir: {app}\tests\data ;P.S. -silent is recommended for use in install scripts [Icons] -Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r34 0.99r34; IconFilename: {app}\imach.ico -Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r34 0.99r34; Flags: runmaximized +Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r36 0.99r36; IconFilename: {app}\imach.ico +Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r36 0.99r36; 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 @@ -189,7 +189,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url ;;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: 0.99r34; Flags: uninsdeletekeyifempty +Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.99r36; 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: 5.1; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app} diff --git a/src/version.h b/src/version.h index 8350ff7..549ef21 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,7 @@ -#define __IMACH_VERSION_MAJOR__ 0 -#define __IMACH_VERSION_MINOR__ 99r34 -#define __IMACH_VERSION_PATCH__ 0 - -#define __IMACH_VERSION__ "0.99r34" + +#define __IMACH_VERSION_MAJOR__ 0 +#define __IMACH_VERSION_MINOR__ 99r38 +#define __IMACH_VERSION_PATCH__ 0 + +#define __IMACH_VERSION__ "0.99r38"