# HG changeset patch # User Sebastien Jodogne # Date 1480418579 -3600 # Node ID 8b51b133bb8b344a987e0a6c4d09b0a9d73060a6 # Parent d402a80567e69886da4f41b19842165d5265d732 move of third party downloads to the main server diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/BoostConfiguration.cmake --- a/Resources/CMake/BoostConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/BoostConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -43,7 +43,7 @@ set(BOOST_NAME boost_1_60_0) set(BOOST_BCP_SUFFIX bcpdigest-1.0.1) set(BOOST_MD5 "a789f8ec2056ad1c2d5f0cb64687cc7b") - set(BOOST_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz") + set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz") set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME}) diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/DcmtkConfiguration.cmake --- a/Resources/CMake/DcmtkConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/DcmtkConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -7,7 +7,7 @@ SET(DCMTK_VERSION_NUMBER 361) SET(DCMTK_PACKAGE_VERSION "3.6.1") SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.1_20160216) - SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.1_20160216.tar.gz") + SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.1_20160216.tar.gz") SET(DCMTK_MD5 "273c8a544b9fe09b8a4fb4eb51df8e52") SET(DCMTK_PATCH_SPEED "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-speed.patch") @@ -21,7 +21,7 @@ SET(DCMTK_VERSION_NUMBER 360) SET(DCMTK_PACKAGE_VERSION "3.6.0") SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) - SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip") + SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.0.zip") SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4") SET(DCMTK_PATCH_SPEED "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch") SET(DCMTK_PATCH_MINGW64 "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-mingw64.patch") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/GoogleTestConfiguration.cmake --- a/Resources/CMake/GoogleTestConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/GoogleTestConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -26,7 +26,7 @@ elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST) set(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0) - set(GTEST_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/gtest-1.7.0.zip") + set(GTEST_URL "http://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip") set(GTEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7") DownloadPackage(${GTEST_MD5} ${GTEST_URL} "${GTEST_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/JsonCppConfiguration.cmake --- a/Resources/CMake/JsonCppConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/JsonCppConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP) set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.5) - set(JSONCPP_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-0.10.5.tar.gz") + set(JSONCPP_URL "http://www.orthanc-server.com/downloads/third-party/jsoncpp-0.10.5.tar.gz") set(JSONCPP_MD5 "db146bac5a126ded9bd728ab7b61ed6b") DownloadPackage(${JSONCPP_MD5} ${JSONCPP_URL} "${JSONCPP_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/LibCurlConfiguration.cmake --- a/Resources/CMake/LibCurlConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/LibCurlConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_CURL) SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.50.3) - SET(CURL_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.50.3.tar.gz") + SET(CURL_URL "http://www.orthanc-server.com/downloads/third-party/curl-7.50.3.tar.gz") SET(CURL_MD5 "870e16fd88a88b52e26a4f04dfc161db") DownloadPackage(${CURL_MD5} ${CURL_URL} "${CURL_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/LibIconvConfiguration.cmake --- a/Resources/CMake/LibIconvConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/LibIconvConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -1,5 +1,5 @@ set(LIBICONV_SOURCES_DIR ${CMAKE_BINARY_DIR}/libiconv-1.14) -set(LIBICONV_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libiconv-1.14.tar.gz") +set(LIBICONV_URL "http://www.orthanc-server.com/downloads/third-party/libiconv-1.14.tar.gz") set(LIBICONV_MD5 "e34509b1623cec449dfeb73d7ce9c6c6") DownloadPackage(${LIBICONV_MD5} ${LIBICONV_URL} "${LIBICONV_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/LibJpegConfiguration.cmake --- a/Resources/CMake/LibJpegConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/LibJpegConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -2,7 +2,7 @@ set(LIBJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/jpeg-9a) DownloadPackage( "3353992aecaee1805ef4109aadd433e7" - "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jpegsrc.v9a.tar.gz" + "http://www.orthanc-server.com/downloads/third-party/jpegsrc.v9a.tar.gz" "${LIBJPEG_SOURCES_DIR}") include_directories( diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/LibPngConfiguration.cmake --- a/Resources/CMake/LibPngConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/LibPngConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG) SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12) - SET(LIBPNG_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libpng-1.5.12.tar.gz") + SET(LIBPNG_URL "http://www.orthanc-server.com/downloads/third-party/libpng-1.5.12.tar.gz") SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28") DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/LuaConfiguration.cmake --- a/Resources/CMake/LuaConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/LuaConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -1,7 +1,7 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_LUA) SET(LUA_SOURCES_DIR ${CMAKE_BINARY_DIR}/lua-5.1.5) SET(LUA_MD5 "2e115fe26e435e33b0d5c022e4490567") - SET(LUA_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/lua-5.1.5.tar.gz") + SET(LUA_URL "http://www.orthanc-server.com/downloads/third-party/lua-5.1.5.tar.gz") DownloadPackage(${LUA_MD5} ${LUA_URL} "${LUA_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/MongooseConfiguration.cmake --- a/Resources/CMake/MongooseConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/MongooseConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -11,7 +11,7 @@ # Use Mongoose 3.1 DownloadPackage( "e718fc287b4eb1bd523be3fa00942bb0" - "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/mongoose-3.1.tgz" + "http://www.orthanc-server.com/downloads/third-party/mongoose-3.1.tgz" "${MONGOOSE_SOURCES_DIR}") add_definitions(-DMONGOOSE_USE_CALLBACKS=0) @@ -21,7 +21,7 @@ # Use Mongoose 3.8 DownloadPackage( "7e3296295072792cdc3c633f9404e0c3" - "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/mongoose-3.8.tgz" + "http://www.orthanc-server.com/downloads/third-party/mongoose-3.8.tgz" "${MONGOOSE_SOURCES_DIR}") add_definitions(-DMONGOOSE_USE_CALLBACKS=1) diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/PugixmlConfiguration.cmake --- a/Resources/CMake/PugixmlConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/PugixmlConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -4,7 +4,7 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_PUGIXML) set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.4) set(PUGIXML_MD5 "7c56c91cfe3ecdee248a8e4892ef5781") - set(PUGIXML_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/pugixml-1.4.tar.gz") + set(PUGIXML_URL "http://www.orthanc-server.com/downloads/third-party/pugixml-1.4.tar.gz") DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/SQLiteConfiguration.cmake --- a/Resources/CMake/SQLiteConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/SQLiteConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -17,7 +17,7 @@ if (SQLITE_STATIC) SET(SQLITE_SOURCES_DIR ${CMAKE_BINARY_DIR}/sqlite-amalgamation-3071300) SET(SQLITE_MD5 "5fbeff9645ab035a1f580e90b279a16d") - SET(SQLITE_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/sqlite-amalgamation-3071300.zip") + SET(SQLITE_URL "http://www.orthanc-server.com/downloads/third-party/sqlite-amalgamation-3071300.zip") DownloadPackage(${SQLITE_MD5} ${SQLITE_URL} "${SQLITE_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b Resources/CMake/ZlibConfiguration.cmake --- a/Resources/CMake/ZlibConfiguration.cmake Mon Nov 28 09:16:02 2016 +0100 +++ b/Resources/CMake/ZlibConfiguration.cmake Tue Nov 29 12:22:59 2016 +0100 @@ -1,6 +1,6 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB) SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7) - SET(ZLIB_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/zlib-1.2.7.tar.gz") + SET(ZLIB_URL "http://www.orthanc-server.com/downloads/third-party/zlib-1.2.7.tar.gz") SET(ZLIB_MD5 "60df6a37c56e7c1366cca812414f7b85") DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}") diff -r d402a80567e6 -r 8b51b133bb8b UnitTestsSources/LuaTests.cpp --- a/UnitTestsSources/LuaTests.cpp Mon Nov 28 09:16:02 2016 +0100 +++ b/UnitTestsSources/LuaTests.cpp Tue Nov 29 12:22:59 2016 +0100 @@ -287,8 +287,8 @@ Orthanc::LuaContext lua; #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1 - lua.Execute("JSON = loadstring(HttpGet('http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/JSON.lua')) ()"); - const std::string url("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/Product.json"); + lua.Execute("JSON = loadstring(HttpGet('http://www.orthanc-server.com/downloads/third-party/JSON.lua')) ()"); + const std::string url("http://www.orthanc-server.com/downloads/third-party/Product.json"); #endif std::string s;