# HG changeset patch # User Sebastien Jodogne # Date 1700634020 -3600 # Node ID ae7d63413f2b54685d1532c59d4babd75126b678 # Parent 2bb1c5347aca55ada9456c34fa0ab7c9afd7bdf9 migration to UCLouvain servers diff -r 2bb1c5347aca -r ae7d63413f2b README --- a/README Thu Nov 16 17:47:55 2023 +0100 +++ b/README Wed Nov 22 07:20:20 2023 +0100 @@ -22,7 +22,7 @@ ---------------------- Build and usage instructions are available in the Orthanc Book: -http://book.orthanc-server.com/plugins/ohif.html +https://orthanc.uclouvain.be/book/plugins/ohif.html Contributing @@ -30,7 +30,7 @@ Instructions for contributing to the Orthanc project are included in the Orthanc Book: -https://book.orthanc-server.com/developers/repositories.html +https://orthanc.uclouvain.be/book/developers/repositories.html Licensing diff -r 2bb1c5347aca -r ae7d63413f2b Resources/CreateOHIFDist.sh --- a/Resources/CreateOHIFDist.sh Thu Nov 16 17:47:55 2023 +0100 +++ b/Resources/CreateOHIFDist.sh Wed Nov 22 07:20:20 2023 +0100 @@ -51,7 +51,7 @@ if [ ! -f "${ROOT_DIR}/OHIF/${PACKAGE}.tar.gz" ]; then mkdir -p "${ROOT_DIR}/OHIF" ( cd ${ROOT_DIR}/OHIF && \ - wget https://orthanc.uclouvain.be/third-party-downloads/OHIF/${PACKAGE}.tar.gz ) + wget https://orthanc.uclouvain.be/downloads/third-party-downloads/OHIF/${PACKAGE}.tar.gz ) fi mkdir -p ${ROOT_DIR}/OHIF/dist/ diff -r 2bb1c5347aca -r ae7d63413f2b Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Nov 16 17:47:55 2023 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Nov 22 07:20:20 2023 +0100 @@ -168,21 +168,27 @@ # elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df") # DICOMweb 1.1 (framework pre-1.6.0) + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f") # Stone Web viewer 1.0 (framework pre-1.8.1) + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7") # PostgreSQL 3.3 (framework pre-1.8.2) + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "23ad1b9c7800") # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0) + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d") # WSI 1.1 (framework pre-1.10.0), to remove "-std=c++11" + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5") # DICOMweb 1.15 (framework pre-1.12.2) + set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f") endif() endif() @@ -320,7 +326,11 @@ else() # Default case: Download from the official Web site set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz) - set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}") + if (ORTHANC_FRAMEWORK_PRE_RELEASE) + set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}") + else() + set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/sources/orthanc/${ORTHANC_FRAMEMORK_FILENAME}") + endif() endif() set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")