*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f8fb6cf07943b2d9a87474218925121e3e09705..ffdfc12146115f47501e20fd90acc99449cfc0af 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 98r4)
+SET(IMACH_VERSION_MINOR 98r7)
 SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
@@ -253,4 +253,4 @@ if(UNIX)
       COMMENT "Generating IMaCh documentation with Doxygen" VERBATIM
       )
   endif()
-endif()
\ No newline at end of file
+endif()

diff --git a/src/Makefile b/src/Makefile
index 727b49e7b2042dd4c44d7a2c585d0621e6140e08..a1918b176a7e2e890f76b8a601b10e249761b68e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -57,7 +57,11 @@ IMACHSETUPVERSION=icl
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach
-TESTFILE=$(HOME)//Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3c.imach
+#TESTFILE=$(HOME)//Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3c.imach
+#TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Yao/rhrs-yao-test-back.imach
+#TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/saito-12-feb-2016/rHRS_relig_import_M_NB.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
@@ -541,8 +545,10 @@ md5:
        ls Output/* | xargs md5sum
 upload:
 #      rsync -v Output/imach-0.98r4-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/IMaCh-0.98r4-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach0.98r4.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/IMaCh-0.99a3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99a3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/IMaCh-0.98r7-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o

diff --git a/src/setup.iss b/src/setup.iss
index c193c8fcd9af1fd722c6ccc89bd116a728acb24b..c5aea682ed5e8c3937149e7112e87d1376a22840 100644 (file)
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -2,6 +2,15 @@
 ; $Id$\r
 ;  $State$\r
 ;  $Log$
+;  Revision 1.16  2015/10/27 19:51:28  brouard
+;  Summary: some new subdirs
+;
+;  Revision 1.15  2015/10/27 17:36:40  brouard
+;  Summary: Adding gnuplot 5.1 with bin and etc for pango fonts
+;
+;  Revision 1.14  2015/08/18 23:18:16  brouard
+;  *** empty log message ***
+;
 ;  Revision 1.13  2015/08/04 07:18:28  brouard
 ;  *** empty log message ***
 ;
@@ -43,12 +52,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
-AppName=IMaCh-0.98q5\r
-AppVerName=IMaCh-0.98q5 Version 0.98q5\r
+AppName=IMaCh-0.98r7\r
+AppVerName=IMaCh-0.98r7 Version 0.98r7\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.98q5\r
+DefaultDirName={pf}\IMaCh-0.98r7\r
 DefaultGroupName=IMaCh\r
-OutputBaseFilename=imach-0.98q5-icl-setup\r
+OutputManifestFile=imach-0.98r7-icl-filelist.txt
+OutputBaseFilename=imach-0.98r7-icl-setup\r
 UninstallDisplayIcon={app}\imach.exe\r
 Compression=lzma2\r
 SolidCompression=yes\r
@@ -69,18 +79,22 @@ ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes\r
 \r
 [Files]\r
-; Install IMaCh-x640.98q5.exe if running in 64-bit mode (x64; see above),\r
+; Install IMaCh-x640.98r7.exe if running in 64-bit mode (x64; see above),\r
 ; IMaCh.exe otherwise.\r
-;Source: "IMaCh-icl64-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-Source: "..\build\icl64\Release\IMaCh-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-;Source: "IMaCh-icl32-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
-Source: "..\build\icl32\Release\IMaCh-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+;Source: "IMaCh-icl64-0.98r7.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-0.98r7.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-icl32-0.98r7.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-0.98r7.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
 Source: imach.ico; DestDir: {app}\bin\r
-;;Source: gnuplot.exe; DestDir: {app}\bin
-Source: ..\distributions\windows\gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
+;;Source: gnuplot.exe; DestDir: {app}\bin\r
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\bin\*; DestDir: {app}\bin\r
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\pango\*; DestDir: {app}\etc\pango\r
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\pango\1.6.0\modules\*; DestDir: {app}\etc\pango\1.6.0\modules\r
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\fonts\fonts.conf; DestDir: {app}\etc\fonts\fonts.conf\r
+Source: ..\distributions\windows\gnuplot_bin\gnuplot_bin_501\etc\fonts\conf.d\*; DestDir: {app}\etc\fonts\conf.d\r
 ;;Source: wgnuplot.hlp; DestDir: {app}\bin\r
 Source: website.url; DestDir: {app}\r
 \r
@@ -150,8 +164,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.98q5 0.98q5; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q5 0.98q5; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98r7 0.98r7; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98r7 0.98r7; 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
@@ -167,9 +181,9 @@ 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.98q5; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98r7; 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: Current Version; ValueData: 5.1; Flags: uninsdeletekeyifempty\r
 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

diff --git a/src/version.h b/src/version.h
index 12f2a9decb62afaeea6503298db5348b54792efd..139d73840d166d9be495339a8da8ec9742ba405a 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
-#define __IMACH_VERSION_MAJOR__ 0\r
-#define __IMACH_VERSION_MINOR__ 98r3\r
-#define __IMACH_VERSION_PATCH__ 0\r
-\r
-#define __IMACH_VERSION__ "0.98r3"\r
+#define __IMACH_VERSION_MAJOR__ 0
+#define __IMACH_VERSION_MINOR__ 98r7
+#define __IMACH_VERSION_PATCH__ 0
+
+#define __IMACH_VERSION__ "0.98r7"