Mercurial > hg > orthanc-stone

changeset 1515:b750b6eab453

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 07 Jul 2020 20:52:35 +0200
parents 6e3180a1f20f
children 2b7d34cb764f
files OrthancStone/Resources/SyncOrthancFolder.py StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginException.h StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake
diffstat 5 files changed, 28 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Resources/SyncOrthancFolder.py	Tue Jul 07 20:42:21 2020 +0200
+++ b/OrthancStone/Resources/SyncOrthancFolder.py	Tue Jul 07 20:52:35 2020 +0200
@@ -28,17 +28,17 @@
     ('OrthancFramework/Resources/Toolchains/MinGWToolchain.cmake', 'Toolchains'),
 
     ('OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.h',
-     '../../StoneWebViewer/Resources/Orthanc/Plugins'),
+     '../../../StoneWebViewer/Resources/Orthanc/Plugins'),
     ('OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp',
-     '../../StoneWebViewer/Resources/Orthanc/Plugins'),
+     '../../../StoneWebViewer/Resources/Orthanc/Plugins'),
     ('OrthancServer/Plugins/Samples/Common/OrthancPluginException.h',
-     '../../StoneWebViewer/Resources/Orthanc/Plugins'),
+     '../../../StoneWebViewer/Resources/Orthanc/Plugins'),
     ('OrthancServer/Plugins/Samples/Common/ExportedSymbolsPlugins.list',
-     '../../StoneWebViewer/Resources/Orthanc/Plugins'),
+     '../../../StoneWebViewer/Resources/Orthanc/Plugins'),
     ('OrthancServer/Plugins/Samples/Common/OrthancPluginsExports.cmake',
-     '../../StoneWebViewer/Resources/Orthanc/Plugins'),
+     '../../../StoneWebViewer/Resources/Orthanc/Plugins'),
     ('OrthancServer/Plugins/Samples/Common/VersionScriptPlugins.map',
-     '../../StoneWebViewer/Resources/Orthanc/Plugins'),
+     '../../../StoneWebViewer/Resources/Orthanc/Plugins'),
 ]
 
 SDK = [
@@ -74,7 +74,7 @@
     commands.append([
         'Orthanc-%s' % PLUGIN_SDK_VERSION, 
         'Plugins/Include/%s' % f,
-        '../../StoneWebViewer/Resources/OrthancSdk-%s/%s' % (PLUGIN_SDK_VERSION, f) 
+        '../../../StoneWebViewer/Resources/OrthancSdk-%s/%s' % (PLUGIN_SDK_VERSION, f) 
     ])
 
 pool = multiprocessing.Pool(10)  # simultaneous downloads
--- a/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Tue Jul 07 20:42:21 2020 +0200
+++ b/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp	Tue Jul 07 20:52:35 2020 +0200
@@ -8,19 +8,7 @@
  * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--- a/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Tue Jul 07 20:42:21 2020 +0200
+++ b/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h	Tue Jul 07 20:52:35 2020 +0200
@@ -8,19 +8,7 @@
  * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--- a/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginException.h	Tue Jul 07 20:42:21 2020 +0200
+++ b/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginException.h	Tue Jul 07 20:52:35 2020 +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/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake	Tue Jul 07 20:42:21 2020 +0200
+++ b/StoneWebViewer/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake	Tue Jul 07 20:52:35 2020 +0200
@@ -1,3 +1,22 @@
+# Orthanc - A Lightweight, RESTful DICOM Store
+# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+# Department, University Hospital of Liege, Belgium
+# Copyright (C) 2017-2020 Osimis S.A., Belgium
+#
+# This program is free software: you can redistribute it and/or
+# 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.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
 # In Orthanc <= 1.7.1, the instructions below were part of
 # "Compiler.cmake", and were protected by the (now unused) option
 # "ENABLE_PLUGINS_VERSION_SCRIPT" in CMake