# HG changeset patch # User Sebastien Jodogne # Date 1382705526 -7200 # Node ID 6008594694f6f7155e2bf7ac72f7efd0948b3faa # Parent b8f738685ad27e1602c49165a08341aa0a368926# Parent 0526d6246cc3cdc6224498f6163a35ff5502c5d3 back to mainline diff -r b8f738685ad2 -r 6008594694f6 CMakeLists.txt --- a/CMakeLists.txt Fri Oct 25 13:24:19 2013 +0200 +++ b/CMakeLists.txt Fri Oct 25 14:52:06 2013 +0200 @@ -3,7 +3,7 @@ project(Orthanc) # Version of the build, should always be "mainline" except in release branches -set(ORTHANC_VERSION "mainline") +set(ORTHANC_VERSION "0.7.0") ##################################################################### diff -r b8f738685ad2 -r 6008594694f6 NEWS --- a/NEWS Fri Oct 25 13:24:19 2013 +0200 +++ b/NEWS Fri Oct 25 14:52:06 2013 +0200 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Version 0.7.0 (2013/10/25) +========================== + Major changes ------------- diff -r b8f738685ad2 -r 6008594694f6 OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp --- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp Fri Oct 25 13:24:19 2013 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp Fri Oct 25 14:52:06 2013 +0200 @@ -1435,17 +1435,17 @@ LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetVersion() { - return "0.6"; + return "0.7"; } LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion() { - return "0.6.0.2"; + return "0.7.0.0"; } LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion() { - return "0.6.2"; + return "0.7.0"; } LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str) diff -r b8f738685ad2 -r 6008594694f6 OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h --- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h Fri Oct 25 13:24:19 2013 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h Fri Oct 25 14:52:06 2013 +0200 @@ -81,9 +81,9 @@ /* cf. http://sourceforge.net/p/predef/wiki/Architectures/ */ #ifdef __amd64__ -#define LAAW_ORTHANC_CLIENT_DEFAULT_PATH "libOrthancClient.so.0.6" +#define LAAW_ORTHANC_CLIENT_DEFAULT_PATH "libOrthancClient.so.0.7" #else -#define LAAW_ORTHANC_CLIENT_DEFAULT_PATH "libOrthancClient.so.0.6" +#define LAAW_ORTHANC_CLIENT_DEFAULT_PATH "libOrthancClient.so.0.7" #endif #define LAAW_ORTHANC_CLIENT_CALL_CONV @@ -386,7 +386,7 @@ * It is assumed that the API does not change when the revision * number (MAJOR.MINOR.REVISION) changes. **/ - if (strcmp(getVersion(), "0.6")) + if (strcmp(getVersion(), "0.7")) { throw ::OrthancClient::OrthancClientException("Mismatch between the C++ header and the library version"); } diff -r b8f738685ad2 -r 6008594694f6 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc --- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc Fri Oct 25 13:24:19 2013 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc Fri Oct 25 14:52:06 2013 +0200 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,6,0,2 - PRODUCTVERSION 0,6,0,0 + FILEVERSION 0,7,0,0 + PRODUCTVERSION 0,7,0,0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN @@ -10,16 +10,16 @@ BEGIN BLOCK "040904E4" BEGIN - VALUE "Comments", "Release 0.6.2" + VALUE "Comments", "Release 0.7.0" VALUE "CompanyName", "CHU of Liege" VALUE "FileDescription", "Native client to the REST API of Orthanc" - VALUE "FileVersion", "0.6.0.2" + VALUE "FileVersion", "0.7.0.0" VALUE "InternalName", "OrthancClient" VALUE "LegalCopyright", "(c) 2012-2013, Sebastien Jodogne, CHU of Liege" VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/" VALUE "OriginalFilename", "OrthancClient_Windows32.dll" VALUE "ProductName", "OrthancClient" - VALUE "ProductVersion", "0.6" + VALUE "ProductVersion", "0.7" END END diff -r b8f738685ad2 -r 6008594694f6 OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc --- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc Fri Oct 25 13:24:19 2013 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc Fri Oct 25 14:52:06 2013 +0200 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,6,0,2 - PRODUCTVERSION 0,6,0,0 + FILEVERSION 0,7,0,0 + PRODUCTVERSION 0,7,0,0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL BEGIN @@ -10,16 +10,16 @@ BEGIN BLOCK "040904E4" BEGIN - VALUE "Comments", "Release 0.6.2" + VALUE "Comments", "Release 0.7.0" VALUE "CompanyName", "CHU of Liege" VALUE "FileDescription", "Native client to the REST API of Orthanc" - VALUE "FileVersion", "0.6.0.2" + VALUE "FileVersion", "0.7.0.0" VALUE "InternalName", "OrthancClient" VALUE "LegalCopyright", "(c) 2012-2013, Sebastien Jodogne, CHU of Liege" VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/" VALUE "OriginalFilename", "OrthancClient_Windows64.dll" VALUE "ProductName", "OrthancClient" - VALUE "ProductVersion", "0.6" + VALUE "ProductVersion", "0.7" END END diff -r b8f738685ad2 -r 6008594694f6 OrthancCppClient/SharedLibrary/Product.json --- a/OrthancCppClient/SharedLibrary/Product.json Fri Oct 25 13:24:19 2013 +0200 +++ b/OrthancCppClient/SharedLibrary/Product.json Fri Oct 25 14:52:06 2013 +0200 @@ -4,5 +4,5 @@ "Company" : "CHU of Liege", "Copyright" : "(c) 2012-2013, Sebastien Jodogne, CHU of Liege", "Legal" : "Licensing information is available on https://code.google.com/p/orthanc/", - "Version" : "0.6.2" + "Version" : "0.7.0" }