Mercurial > hg > orthanc-authorization

changeset 267:ac7d3395bb80 inbox

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->inbox
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Aug 2025 17:23:38 +0200
parents 3ab100e87012 (current diff) 81e546455c16 (diff)
children 4272817fa3fd
files Plugin/Plugin.cpp Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Aug 08 17:18:35 2025 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Aug 08 17:23:38 2025 +0200
@@ -171,6 +171,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "0e971f32f4f3e4951e0f3b5de49a3da6")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.7")
         set(ORTHANC_FRAMEWORK_MD5 "f27c27d7a7a694dab1fd7f0a99d9715a")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.8")
+        set(ORTHANC_FRAMEWORK_MD5 "eb1c719234338e8277b80d3453563e9f")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
@@ -515,7 +517,6 @@
   include(${CMAKE_CURRENT_LIST_DIR}/Compiler.cmake)
   include(${CMAKE_CURRENT_LIST_DIR}/DownloadPackage.cmake)
   include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake)
-  set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py)
 
   if (ORTHANC_FRAMEWORK_USE_SHARED)
     list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
--- a/Resources/SyncOrthancFolder.py	Fri Aug 08 17:18:35 2025 +0200
+++ b/Resources/SyncOrthancFolder.py	Fri Aug 08 17:23:38 2025 +0200
@@ -11,7 +11,7 @@
 import urllib.request
 
 TARGET = os.path.join(os.path.dirname(__file__), 'Orthanc')
-PLUGIN_SDK_VERSION = '1.12.4'
+PLUGIN_SDK_VERSIONS = [ '1.11.3', '1.12.4' ]
 REPOSITORY = 'https://orthanc.uclouvain.be/hg/orthanc/raw-file'
 
 FILES = [
@@ -66,12 +66,13 @@
                       f[0],
                       os.path.join(f[1], os.path.basename(f[0])) ])
 
-for f in SDK:
-    commands.append([
-        'Orthanc-%s' % PLUGIN_SDK_VERSION, 
-        'OrthancServer/Plugins/Include/%s' % f,
-        'Sdk-%s/%s' % (PLUGIN_SDK_VERSION, f) 
-    ])
+for version in PLUGIN_SDK_VERSIONS:
+    for f in SDK:
+        commands.append([
+            'Orthanc-%s' % version,
+            'OrthancServer/Plugins/Include/%s' % f,
+            'Sdk-%s/%s' % (version, f)
+        ])
 
 
 pool = multiprocessing.Pool(10)  # simultaneous downloads