Mercurial > hg > orthanc-python

changeset 244:74eab67f27fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
synchronization with orthanc-java
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 22 Jan 2025 14:32:19 +0100
parents 5845def14a56
children 435e693d8794 055a4aafbc75 6a7e91d753ae
files .hgignore Resources/Orthanc/CMake/Compiler.cmake Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/Sdk-1.10.0/ClassDocumentation.json Resources/SyncOrthancFolder.py
diffstat 5 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat Jan 18 10:06:24 2025 +0100
+++ b/.hgignore	Wed Jan 22 14:32:19 2025 +0100
@@ -6,8 +6,5 @@
 *~
 .vscode/
 i/
-*.h.orig
-*.cpp.orig
-*.py.orig
-*.pyi.orig
-CodeAnalysis/.venv/
\ No newline at end of file
+*.orig
+CodeAnalysis/.venv/
--- a/Resources/Orthanc/CMake/Compiler.cmake	Sat Jan 18 10:06:24 2025 +0100
+++ b/Resources/Orthanc/CMake/Compiler.cmake	Wed Jan 22 14:32:19 2025 +0100
@@ -239,7 +239,9 @@
   add_definitions(
     -D_XOPEN_SOURCE=1
     )
-  link_libraries(iconv)
+  
+  # Linking with iconv breaks the Universal builds on modern compilers
+  # link_libraries(iconv)
 
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
   message("Building using Emscripten (for WebAssembly or asm.js targets)")
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Sat Jan 18 10:06:24 2025 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Wed Jan 22 14:32:19 2025 +0100
@@ -167,6 +167,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "1e61779ea4a7cd705720bdcfed8a6a73")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.5")
         set(ORTHANC_FRAMEWORK_MD5 "5bb69f092981fdcfc11dec0a0f9a7db3")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.6")
+        set(ORTHANC_FRAMEWORK_MD5 "0e971f32f4f3e4951e0f3b5de49a3da6")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
--- a/Resources/Orthanc/Sdk-1.10.0/ClassDocumentation.json	Sat Jan 18 10:06:24 2025 +0100
+++ b/Resources/Orthanc/Sdk-1.10.0/ClassDocumentation.json	Wed Jan 22 14:32:19 2025 +0100
@@ -10,6 +10,7 @@
   "OrthancPluginRestOutput" : "Output for a call to the REST API of Orthanc",
   "OrthancPluginServerChunkedRequestReader" : "Read for a chunked HTTP request",
   "OrthancPluginStorageArea" : "Storage area plugin",
+  "OrthancPluginWebDavCollection" : "WebDAV collection",
   "OrthancPluginWorklistAnswers" : "Answers to a DICOM C-FIND worklist query",
   "OrthancPluginWorklistQuery" : "DICOM C-FIND worklist query"
 }
--- a/Resources/SyncOrthancFolder.py	Sat Jan 18 10:06:24 2025 +0100
+++ b/Resources/SyncOrthancFolder.py	Wed Jan 22 14:32:19 2025 +0100
@@ -109,18 +109,19 @@
 
 
 for f in [
-        'CodeModel.json',
-        'CodeModel.json.license',
-        'ClassDocumentation.json',
-        'ClassDocumentation.json.license',
+        ('ClassDocumentation.json',         'CodeGeneration/ClassDocumentation.json'),
+        ('ClassDocumentation.json.license', 'CodeGeneration/ClassDocumentation.json.license'),
+        ('CodeModel.json',                  'Resources/CodeModel-%s.json' % PLUGIN_SDK_VERSION),
+        ('CodeModel.json.license',          'Resources/CodeModel-%s.json.license' % PLUGIN_SDK_VERSION),
         ]:
     commands.append([
         ORTHANC_JAVA_REPOSITORY,
         ORTHANC_JAVA_VERSION,
-        'CodeGeneration/%s' % f,
-        'Sdk-%s/%s' % (PLUGIN_SDK_VERSION, f),
+        f[1],
+        'Sdk-%s/%s' % (PLUGIN_SDK_VERSION, f[0]),
     ])
 
 
+
 pool = multiprocessing.Pool(10)  # simultaneous downloads
 pool.map(Download, commands)