# HG changeset patch # User Alain Mazy # Date 1580641446 -3600 # Node ID 4c84d96391b6095d0e0368db9a7d5f889804dfb2 # Parent b5faee100a744eb0c3117a710b882baedf61c003# Parent 9bf97ec22e22bcac55799e68e2d3ba0b6ff56455 merge diff -r b5faee100a74 -r 4c84d96391b6 CMakeLists.txt --- a/CMakeLists.txt Sun Feb 02 12:03:54 2020 +0100 +++ b/CMakeLists.txt Sun Feb 02 12:04:06 2020 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License @@ -24,10 +24,10 @@ set(ORTHANC_DICOM_WEB_VERSION "mainline") if (ORTHANC_DICOM_WEB_VERSION STREQUAL "mainline") - set(ORTHANC_FRAMEWORK_VERSION "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_VERSION "1.5.7") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.5.8") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() @@ -35,7 +35,8 @@ # Parameters of the build set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)") set(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages") -set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc source code (can be \"hg\", \"archive\", \"web\" or \"path\")") +set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc framework (can be \"hg\", \"archive\", \"web\" or \"path\")") +set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_FRAMEWORK_DEFAULT_VERSION}" CACHE STRING "Version of the Orthanc framework") set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"") set(ORTHANC_FRAMEWORK_ROOT "" CACHE STRING "Path to the Orthanc source directory, if ORTHANC_FRAMEWORK_SOURCE is \"path\"") diff -r b5faee100a74 -r 4c84d96391b6 Plugin/Configuration.cpp --- a/Plugin/Configuration.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/Configuration.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/Configuration.h --- a/Plugin/Configuration.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/Configuration.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/DicomWebClient.cpp --- a/Plugin/DicomWebClient.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/DicomWebClient.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/DicomWebClient.h --- a/Plugin/DicomWebClient.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/DicomWebClient.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/DicomWebFormatter.cpp --- a/Plugin/DicomWebFormatter.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/DicomWebFormatter.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/DicomWebFormatter.h --- a/Plugin/DicomWebFormatter.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/DicomWebFormatter.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/DicomWebServers.cpp --- a/Plugin/DicomWebServers.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/DicomWebServers.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/DicomWebServers.h --- a/Plugin/DicomWebServers.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/DicomWebServers.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/GdcmParsedDicomFile.cpp --- a/Plugin/GdcmParsedDicomFile.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/GdcmParsedDicomFile.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/GdcmParsedDicomFile.h --- a/Plugin/GdcmParsedDicomFile.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/GdcmParsedDicomFile.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/Plugin.cpp --- a/Plugin/Plugin.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/Plugin.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/QidoRs.cpp --- a/Plugin/QidoRs.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/QidoRs.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/QidoRs.h --- a/Plugin/QidoRs.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/QidoRs.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/StowRs.cpp --- a/Plugin/StowRs.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/StowRs.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/StowRs.h --- a/Plugin/StowRs.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/StowRs.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/WadoRs.cpp --- a/Plugin/WadoRs.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/WadoRs.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/WadoRs.h --- a/Plugin/WadoRs.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/WadoRs.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/WadoRsRetrieveFrames.cpp --- a/Plugin/WadoRsRetrieveFrames.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/WadoRsRetrieveFrames.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/WadoRsRetrieveRendered.cpp --- a/Plugin/WadoRsRetrieveRendered.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/WadoRsRetrieveRendered.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/WadoUri.cpp --- a/Plugin/WadoUri.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/WadoUri.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Plugin/WadoUri.h --- a/Plugin/WadoUri.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Plugin/WadoUri.h Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Resources/CMake/GdcmConfiguration.cmake --- a/Resources/CMake/GdcmConfiguration.cmake Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/CMake/GdcmConfiguration.cmake Sun Feb 02 12:04:06 2020 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Resources/CMake/JavaScriptLibraries.cmake --- a/Resources/CMake/JavaScriptLibraries.cmake Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/CMake/JavaScriptLibraries.cmake Sun Feb 02 12:04:06 2020 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Resources/Orthanc/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/DownloadOrthancFramework.cmake Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Orthanc/DownloadOrthancFramework.cmake Sun Feb 02 12:04:06 2020 +0100 @@ -1,7 +1,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2019 Osimis S.A., 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 @@ -110,6 +110,8 @@ set(ORTHANC_FRAMEWORK_MD5 "3c29de1e289b5472342947168f0105c0") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.7") set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8") + set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336") endif() endif() endif() diff -r b5faee100a74 -r 4c84d96391b6 Resources/Orthanc/LinuxStandardBaseToolchain.cmake --- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake Sun Feb 02 12:04:06 2020 +0100 @@ -31,7 +31,12 @@ # which compilers to use for C and C++ SET(CMAKE_C_COMPILER ${LSB_PATH}/bin/lsbcc) -CMAKE_FORCE_CXX_COMPILER(${LSB_PATH}/bin/lsbc++ GNU) + +if (${CMAKE_VERSION} VERSION_LESS "3.6.0") + CMAKE_FORCE_CXX_COMPILER(${LSB_PATH}/bin/lsbc++ GNU) +else() + SET(CMAKE_CXX_COMPILER ${LSB_PATH}/bin/lsbc++) +endif() # here is the target environment located SET(CMAKE_FIND_ROOT_PATH ${LSB_PATH}) diff -r b5faee100a74 -r 4c84d96391b6 Resources/Orthanc/Sdk-1.5.4/orthanc/OrthancCPlugin.h --- a/Resources/Orthanc/Sdk-1.5.4/orthanc/OrthancCPlugin.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Orthanc/Sdk-1.5.4/orthanc/OrthancCPlugin.h Sun Feb 02 12:04:06 2020 +0100 @@ -76,7 +76,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 diff -r b5faee100a74 -r 4c84d96391b6 Resources/Orthanc/Sdk-1.5.7/orthanc/OrthancCPlugin.h --- a/Resources/Orthanc/Sdk-1.5.7/orthanc/OrthancCPlugin.h Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Orthanc/Sdk-1.5.7/orthanc/OrthancCPlugin.h Sun Feb 02 12:04:06 2020 +0100 @@ -77,7 +77,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 diff -r b5faee100a74 -r 4c84d96391b6 Resources/Samples/JavaScript/qido-rs.js --- a/Resources/Samples/JavaScript/qido-rs.js Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Samples/JavaScript/qido-rs.js Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Resources/Samples/JavaScript/stow-rs.js --- a/Resources/Samples/JavaScript/stow-rs.js Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Samples/JavaScript/stow-rs.js Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Resources/Samples/Python/SendStow.py --- a/Resources/Samples/Python/SendStow.py Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Samples/Python/SendStow.py Sun Feb 02 12:04:06 2020 +0100 @@ -3,7 +3,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Resources/Samples/Python/WadoRetrieveStudy.py --- a/Resources/Samples/Python/WadoRetrieveStudy.py Sun Feb 02 12:03:54 2020 +0100 +++ b/Resources/Samples/Python/WadoRetrieveStudy.py Sun Feb 02 12:04:06 2020 +0100 @@ -3,7 +3,7 @@ # Orthanc - A Lightweight, RESTful DICOM Store # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics # Department, University Hospital of Liege, Belgium -# Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License diff -r b5faee100a74 -r 4c84d96391b6 Resources/holy-build-box-compile.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/holy-build-box-compile.sh Sun Feb 02 12:04:06 2020 +0100 @@ -0,0 +1,36 @@ +#!/bin/bash + +## +## This script compiles cross-distribution Linux binaries thanks to +## Holy Build Box: https://github.com/phusion/holy-build-box +## +## The ideal solution would be to use Linux Standard Base +## (LSB). Unfortunately, the LSB C++ compiler is a pre-4.8 gcc that +## does not feature full C++11 capabilities, which prevents compiling +## GDCM >= 3.0. +## + +set -ex + +if [ "$1" != "Debug" -a "$1" != "Release" ]; then + echo "Please provide build type: Debug or Release" + exit -1 +fi + +if [ -t 1 ]; then + # TTY is available => use interactive mode + DOCKER_FLAGS='-i' +fi + +ROOT_DIR=`dirname $(readlink -f $0)`/.. + +mkdir -p ${ROOT_DIR}/holy-build-box + +docker run -t ${DOCKER_FLAGS} --rm \ + --user $(id -u):$(id -g) \ + -v ${ROOT_DIR}:/source:ro \ + -v ${ROOT_DIR}/holy-build-box:/target:rw \ + phusion/holy-build-box-64:2.0.1 \ + bash /source/Resources/holy-build-box-internal.sh $1 + +ls -lR ${ROOT_DIR}/holy-build-box/ diff -r b5faee100a74 -r 4c84d96391b6 Resources/holy-build-box-internal.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/holy-build-box-internal.sh Sun Feb 02 12:04:06 2020 +0100 @@ -0,0 +1,43 @@ +#!/bin/bash +set -e + +# Activate Holy Build Box environment. +source /hbb_exe/activate + +set -x + +mkdir /tmp/build +cd /tmp/build + +# Holy Build Box defines LDFLAGS as "-L/hbb_exe/lib +# -static-libstdc++". The "-L/hbb_exe/lib" option results in linking +# errors "undefined reference" to `std::__once_callable', +# 'std::__once_call' and '__once_proxy'. +export LDFLAGS=-static-libstdc++ +unset LDPATHFLAGS +unset SHLIB_LDFLAGS +unset LD_LIBRARY_PATH +unset LIBRARY_PATH + +mkdir /tmp/source-writeable + +cp -r /source/CMakeLists.txt /tmp/source-writeable/ +cp -r /source/Plugin /tmp/source-writeable/ +cp -r /source/Resources /tmp/source-writeable/ +cp -r /source/UnitTestsSources /tmp/source-writeable/ +cp -r /source/WebApplication /tmp/source-writeable/ + +cmake /tmp/source-writeable \ + -DCMAKE_BUILD_TYPE=$1 -DSTATIC_BUILD=ON \ + -DORTHANC_SDK_VERSION=1.5.7 \ + -DORTHANC_FRAMEWORK_SOURCE=web \ + -DORTHANC_FRAMEWORK_VERSION=1.5.8 \ + -DCMAKE_INSTALL_PREFIX=/target + +make -j`nproc` + +if [ "$1" == "Release" ]; then + strip ./libOrthancDicomWeb.so +fi + +make install diff -r b5faee100a74 -r 4c84d96391b6 UnitTestsSources/UnitTestsMain.cpp --- a/UnitTestsSources/UnitTestsMain.cpp Sun Feb 02 12:03:54 2020 +0100 +++ b/UnitTestsSources/UnitTestsMain.cpp Sun Feb 02 12:04:06 2020 +0100 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., 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 Affero General Public License