Mercurial > hg > orthanc-databases

changeset 285:f2e160b2dc3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use openssl-3.x branch while syncing
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 22 Jun 2021 07:47:35 +0200
parents 64bf8914f02e
children eb03551d3a5f
files Resources/Orthanc/Databases/DatabaseConstraint.cpp Resources/Orthanc/Databases/DatabaseConstraint.h Resources/Orthanc/Databases/ISqlLookupFormatter.cpp Resources/Orthanc/Databases/ISqlLookupFormatter.h Resources/SyncOrthancFolder.py
diffstat 5 files changed, 25 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/Databases/DatabaseConstraint.cpp	Sat Jun 12 08:49:52 2021 +0200
+++ b/Resources/Orthanc/Databases/DatabaseConstraint.cpp	Tue Jun 22 07:47:35 2021 +0200
@@ -8,18 +8,6 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
- * In addition, as a special exception, the copyright holders of this
- * program give permission to link the code of its release with the
- * OpenSSL project's "OpenSSL" library (or with modified versions of it
- * that use the same license as the "OpenSSL" library), and distribute
- * the linked executables. You must obey the GNU General Public License
- * in all respects for all of the code used other than "OpenSSL". If you
- * modify file(s) with this exception, you may extend this exception to
- * your version of the file(s), but you are not obligated to do so. If
- * you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files
- * in the program, then also delete it here.
  * 
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/Resources/Orthanc/Databases/DatabaseConstraint.h	Sat Jun 12 08:49:52 2021 +0200
+++ b/Resources/Orthanc/Databases/DatabaseConstraint.h	Tue Jun 22 07:47:35 2021 +0200
@@ -8,18 +8,6 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
- * In addition, as a special exception, the copyright holders of this
- * program give permission to link the code of its release with the
- * OpenSSL project's "OpenSSL" library (or with modified versions of it
- * that use the same license as the "OpenSSL" library), and distribute
- * the linked executables. You must obey the GNU General Public License
- * in all respects for all of the code used other than "OpenSSL". If you
- * modify file(s) with this exception, you may extend this exception to
- * your version of the file(s), but you are not obligated to do so. If
- * you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files
- * in the program, then also delete it here.
  * 
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/Resources/Orthanc/Databases/ISqlLookupFormatter.cpp	Sat Jun 12 08:49:52 2021 +0200
+++ b/Resources/Orthanc/Databases/ISqlLookupFormatter.cpp	Tue Jun 22 07:47:35 2021 +0200
@@ -8,18 +8,6 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
- * In addition, as a special exception, the copyright holders of this
- * program give permission to link the code of its release with the
- * OpenSSL project's "OpenSSL" library (or with modified versions of it
- * that use the same license as the "OpenSSL" library), and distribute
- * the linked executables. You must obey the GNU General Public License
- * in all respects for all of the code used other than "OpenSSL". If you
- * modify file(s) with this exception, you may extend this exception to
- * your version of the file(s), but you are not obligated to do so. If
- * you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files
- * in the program, then also delete it here.
  * 
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/Resources/Orthanc/Databases/ISqlLookupFormatter.h	Sat Jun 12 08:49:52 2021 +0200
+++ b/Resources/Orthanc/Databases/ISqlLookupFormatter.h	Tue Jun 22 07:47:35 2021 +0200
@@ -8,18 +8,6 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
- * In addition, as a special exception, the copyright holders of this
- * program give permission to link the code of its release with the
- * OpenSSL project's "OpenSSL" library (or with modified versions of it
- * that use the same license as the "OpenSSL" library), and distribute
- * the linked executables. You must obey the GNU General Public License
- * in all respects for all of the code used other than "OpenSSL". If you
- * modify file(s) with this exception, you may extend this exception to
- * your version of the file(s), but you are not obligated to do so. If
- * you do not wish to do so, delete this exception statement from your
- * version. If you delete this exception statement from all source files
- * in the program, then also delete it here.
  * 
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
--- 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: