diff Resources/SyncOrthancFolder.py @ 285:f2e160b2dc3e

use openssl-3.x branch while syncing
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 22 Jun 2021 07:47:35 +0200
parents c7dc70a0a477
children c4f0f8087564 1938ba8fba35
line wrap: on
line diff
--- a/Resources/SyncOrthancFolder.py	Sat Jun 12 08:49:52 2021 +0200
+++ b/Resources/SyncOrthancFolder.py	Tue Jun 22 07:47:35 2021 +0200
@@ -16,26 +16,28 @@
 REPOSITORY = 'https://hg.orthanc-server.com/orthanc/raw-file'
 
 FILES = [
-    ('OrthancFramework/Resources/CMake/AutoGeneratedCode.cmake', 'CMake'),
-    ('OrthancFramework/Resources/CMake/Compiler.cmake', 'CMake'),
-    ('OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake', 'CMake'),
-    ('OrthancFramework/Resources/CMake/DownloadPackage.cmake', 'CMake'),
-    ('OrthancFramework/Resources/CMake/GoogleTestConfiguration.cmake', 'CMake'),
-    ('OrthancFramework/Resources/EmbedResources.py', '.'),
-    ('OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake', '.'),
-    ('OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain32.cmake', '.'),
-    ('OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain64.cmake', '.'),
-    ('OrthancFramework/Resources/Toolchains/MinGWToolchain.cmake', '.'),
-    ('OrthancServer/Plugins/Samples/Common/ExportedSymbolsPlugins.list', 'Plugins'),
-    ('OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp', 'Plugins'),
-    ('OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h', 'Plugins'),
-    ('OrthancServer/Plugins/Samples/Common/OrthancPluginException.h', 'Plugins'),
-    ('OrthancServer/Plugins/Samples/Common/OrthancPluginsExports.cmake', 'Plugins'),
-    ('OrthancServer/Plugins/Samples/Common/VersionScriptPlugins.map', 'Plugins'),
-    ('OrthancServer/Sources/Search/DatabaseConstraint.cpp', 'Databases'),
-    ('OrthancServer/Sources/Search/DatabaseConstraint.h', 'Databases'),
-    ('OrthancServer/Sources/Search/ISqlLookupFormatter.cpp', 'Databases'),
-    ('OrthancServer/Sources/Search/ISqlLookupFormatter.h', 'Databases'),
+    ('default', 'OrthancFramework/Resources/CMake/AutoGeneratedCode.cmake', 'CMake'),
+    ('default', 'OrthancFramework/Resources/CMake/Compiler.cmake', 'CMake'),
+    ('default', 'OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake', 'CMake'),
+    ('default', 'OrthancFramework/Resources/CMake/DownloadPackage.cmake', 'CMake'),
+    ('default', 'OrthancFramework/Resources/CMake/GoogleTestConfiguration.cmake', 'CMake'),
+    ('default', 'OrthancFramework/Resources/EmbedResources.py', '.'),
+    ('default', 'OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake', '.'),
+    ('default', 'OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain32.cmake', '.'),
+    ('default', 'OrthancFramework/Resources/Toolchains/MinGW-W64-Toolchain64.cmake', '.'),
+    ('default', 'OrthancFramework/Resources/Toolchains/MinGWToolchain.cmake', '.'),
+
+    # TODO - Replace branch "openssl-3.x" by "default" once it is reintegrated into mainline
+    ('openssl-3.x', 'OrthancServer/Plugins/Samples/Common/ExportedSymbolsPlugins.list', 'Plugins'),
+    ('openssl-3.x', 'OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp', 'Plugins'),
+    ('openssl-3.x', 'OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h', 'Plugins'),
+    ('openssl-3.x', 'OrthancServer/Plugins/Samples/Common/OrthancPluginException.h', 'Plugins'),
+    ('openssl-3.x', 'OrthancServer/Plugins/Samples/Common/OrthancPluginsExports.cmake', 'Plugins'),
+    ('openssl-3.x', 'OrthancServer/Plugins/Samples/Common/VersionScriptPlugins.map', 'Plugins'),
+    ('openssl-3.x', 'OrthancServer/Sources/Search/DatabaseConstraint.cpp', 'Databases'),
+    ('openssl-3.x', 'OrthancServer/Sources/Search/DatabaseConstraint.h', 'Databases'),
+    ('openssl-3.x', 'OrthancServer/Sources/Search/ISqlLookupFormatter.cpp', 'Databases'),
+    ('openssl-3.x', 'OrthancServer/Sources/Search/ISqlLookupFormatter.h', 'Databases'),
 ]
 
 SDK = [
@@ -67,9 +69,9 @@
 commands = []
 
 for f in FILES:
-    commands.append([ 'default',
-                      f[0],
-                      os.path.join(f[1], os.path.basename(f[0])) ])
+    commands.append([ f[0],  # Branch
+                      f[1],  # Source file
+                      os.path.join(f[2], os.path.basename(f[1])) ])
 
 for version in PLUGIN_SDK_VERSION_OLD:
     for f in SDK: