Mercurial > hg > orthanc

changeset 411:5f6d75cd4b46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
md5 of third party downlaods
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 03 May 2013 12:54:22 +0200
parents b2c6cc90288c
children f1a0c472af79
files NEWS Resources/CMake/BoostConfiguration.cmake Resources/CMake/DcmtkConfiguration.cmake Resources/CMake/DownloadPackage.cmake Resources/CMake/GoogleLogConfiguration.cmake Resources/CMake/GoogleTestConfiguration.cmake Resources/CMake/JsonCppConfiguration.cmake Resources/CMake/LibCurlConfiguration.cmake Resources/CMake/LibPngConfiguration.cmake Resources/CMake/LuaConfiguration.cmake Resources/CMake/MongooseConfiguration.cmake Resources/CMake/OpenSslConfiguration.cmake Resources/CMake/SQLiteConfiguration.cmake Resources/CMake/ZlibConfiguration.cmake
diffstat 14 files changed, 55 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri May 03 12:23:32 2013 +0200
+++ b/NEWS	Fri May 03 12:54:22 2013 +0200
@@ -7,6 +7,7 @@
   DICOM connexion).
 * Filtering of incoming DICOM instances (through Lua scripting).
 * Filtering of incoming HTTP requests (through Lua scripting).
+* Check MD5 of third party downloads.
 
 
 Version 0.5.1 (2013/04/17)
--- a/Resources/CMake/BoostConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -41,7 +41,13 @@
 if (BOOST_STATIC)
   SET(BOOST_NAME boost_1_49_0)
   SET(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}.tar.gz" "${BOOST_SOURCES_DIR}" "${BOOST_PRELOADED}" "${BOOST_NAME}/boost ${BOOST_NAME}/libs/thread/src ${BOOST_NAME}/libs/system/src ${BOOST_NAME}/libs/filesystem/v3/src ${BOOST_NAME}/libs/locale/src ${BOOST_NAME}/libs/date_time/src")
+  DownloadPackage(
+    "e0defc8c818e4f1c5bbb29d0292b76ca"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}.tar.gz"
+    "${BOOST_SOURCES_DIR}" "${BOOST_PRELOADED}" 
+    # Only uncompress the Boost modules we need
+    "${BOOST_NAME}/boost ${BOOST_NAME}/libs/thread/src ${BOOST_NAME}/libs/system/src ${BOOST_NAME}/libs/filesystem/v3/src ${BOOST_NAME}/libs/locale/src ${BOOST_NAME}/libs/date_time/src"
+    )
 
   set(BOOST_SOURCES)
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
--- a/Resources/CMake/DcmtkConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,7 +1,10 @@
 if (${STATIC_BUILD})
   SET(DCMTK_VERSION_NUMBER 360)
   SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip" "${DCMTK_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "219ad631b82031806147e4abbfba4fa4"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip" 
+    "${DCMTK_SOURCES_DIR}" "" "")
 
   IF(CMAKE_CROSSCOMPILING)
     SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
--- a/Resources/CMake/DownloadPackage.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/DownloadPackage.cmake	Fri May 03 12:54:22 2013 +0200
@@ -10,14 +10,14 @@
 endmacro()
 
 
-macro(DownloadPackage Url TargetDirectory PreloadedVariable UncompressArguments)
+macro(DownloadPackage MD5 Url TargetDirectory PreloadedVariable UncompressArguments)
   if (NOT IS_DIRECTORY "${TargetDirectory}")
     GetUrlFilename(TMP_FILENAME "${Url}")
     if ("${PreloadedVariable}" STREQUAL "")
       set(TMP_PATH "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${TMP_FILENAME}")
       if (NOT EXISTS "${TMP_PATH}")
         message("Downloading ${Url}")
-        file(DOWNLOAD "${Url}" "${TMP_PATH}" SHOW_PROGRESS)
+        file(DOWNLOAD "${Url}" "${TMP_PATH}" SHOW_PROGRESS EXPECTED_MD5 "${MD5}")
       else()
         message("Using local copy of ${Url}")
       endif()
--- a/Resources/CMake/GoogleLogConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/GoogleLogConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,6 +1,9 @@
 if (STATIC_BUILD OR NOT USE_DYNAMIC_GOOGLE_LOG)
   SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.2)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.2.tar.gz" "${GOOGLE_LOG_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "897fbff90d91ea2b6d6e78c8cea641cc"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.2.tar.gz"
+    "${GOOGLE_LOG_SOURCES_DIR}" "" "")
 
   set(GOOGLE_LOG_HEADERS
     ${GOOGLE_LOG_SOURCES_DIR}/src/glog/logging.h
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -9,7 +9,10 @@
 
 elseif (STATIC_BUILD OR NOT USE_DYNAMIC_GOOGLE_TEST)
   SET(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.6.0)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/gtest-1.6.0.zip" "${GTEST_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "4577b49f2973c90bf9ba69aa8166b786"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/gtest-1.6.0.zip"
+    "${GTEST_SOURCES_DIR}" "" "")
 
   include_directories(
     ${GTEST_SOURCES_DIR}/include
--- a/Resources/CMake/JsonCppConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -9,7 +9,10 @@
 
 else()
   SET(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-src-0.5.0)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-src-0.5.0.tar.gz" "${JSONCPP_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "24482b67c1cb17aac1ed1814288a3a8f"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-src-0.5.0.tar.gz"
+    "${JSONCPP_SOURCES_DIR}" "" "")
 
   list(APPEND THIRD_PARTY_SOURCES
     ${JSONCPP_SOURCES_DIR}/src/lib_json/json_reader.cpp
--- a/Resources/CMake/LibCurlConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,6 +1,9 @@
 if (${STATIC_BUILD})
   SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.26.0)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.26.0.tar.gz" "${CURL_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "3fa4d5236f2a36ca5c3af6715e837691"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.26.0.tar.gz"
+    "${CURL_SOURCES_DIR}" "" "")
 
   include_directories(${CURL_SOURCES_DIR}/include)
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES)
--- a/Resources/CMake/LibPngConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/LibPngConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,6 +1,9 @@
 if (${STATIC_BUILD})
   SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libpng-1.5.12.tar.gz" "${LIBPNG_SOURCES_DIR}" "${LIBPNG_PRELOADED}" "")
+  DownloadPackage(
+    "8ea7f60347a306c5faf70b977fa80e28"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libpng-1.5.12.tar.gz"
+    "${LIBPNG_SOURCES_DIR}" "${LIBPNG_PRELOADED}" "")
 
   include_directories(
     ${LIBPNG_SOURCES_DIR}
--- a/Resources/CMake/LuaConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/LuaConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,6 +1,9 @@
 if (STATIC_BUILD OR NOT USE_DYNAMIC_LUA)
   SET(LUA_SOURCES_DIR ${CMAKE_BINARY_DIR}/lua-5.1.5)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/lua-5.1.5.tar.gz" "${LUA_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "2e115fe26e435e33b0d5c022e4490567"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/lua-5.1.5.tar.gz"
+    "${LUA_SOURCES_DIR}" "" "")
 
   add_definitions(
     #-DLUA_LIB=1
--- a/Resources/CMake/MongooseConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/MongooseConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,6 +1,9 @@
 if (STATIC_BUILD OR NOT USE_DYNAMIC_MONGOOSE)
   SET(MONGOOSE_SOURCES_DIR ${CMAKE_BINARY_DIR}/mongoose)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/mongoose-3.1.tgz" "${MONGOOSE_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "e718fc287b4eb1bd523be3fa00942bb0"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/mongoose-3.1.tgz"
+    "${MONGOOSE_SOURCES_DIR}" "" "")
 
   # Patch mongoose
   execute_process(
--- a/Resources/CMake/OpenSslConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/OpenSslConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,6 +1,9 @@
 if (${STATIC_BUILD})
   SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.1c)
-  DownloadPackage("www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.1c.tar.gz" "${OPENSSL_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "ae412727c8c15b67880aef7bd2999b2e"
+    "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.1c.tar.gz"
+    "${OPENSSL_SOURCES_DIR}" "" "")
 
   if (NOT EXISTS "${OPENSSL_SOURCES_DIR}/include/PATCHED")
     if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
--- a/Resources/CMake/SQLiteConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/SQLiteConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -1,6 +1,9 @@
 if (STATIC_BUILD OR NOT USE_DYNAMIC_SQLITE)
   SET(SQLITE_SOURCES_DIR ${CMAKE_BINARY_DIR}/sqlite-amalgamation-3071300)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/sqlite-amalgamation-3071300.zip" "${SQLITE_SOURCES_DIR}" "" "")
+  DownloadPackage(
+    "5fbeff9645ab035a1f580e90b279a16d"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/sqlite-amalgamation-3071300.zip"
+    "${SQLITE_SOURCES_DIR}" "" "")
 
   list(APPEND THIRD_PARTY_SOURCES
     ${SQLITE_SOURCES_DIR}/sqlite3.c
@@ -18,6 +21,7 @@
     )
 
   source_group(ThirdParty\\SQLite REGULAR_EXPRESSION ${SQLITE_SOURCES_DIR}/.*)
+
 else()
   CHECK_INCLUDE_FILE_CXX(sqlite3.h HAVE_SQLITE_H)
   if (NOT HAVE_SQLITE_H)
--- a/Resources/CMake/ZlibConfiguration.cmake	Fri May 03 12:23:32 2013 +0200
+++ b/Resources/CMake/ZlibConfiguration.cmake	Fri May 03 12:54:22 2013 +0200
@@ -6,7 +6,10 @@
 
 if (${STATIC_BUILD})
   SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7)
-  DownloadPackage("http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/zlib-1.2.7.tar.gz" "${ZLIB_SOURCES_DIR}" "${ZLIB_PRELOADED}" "")
+  DownloadPackage(
+    "60df6a37c56e7c1366cca812414f7b85"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/zlib-1.2.7.tar.gz"
+    "${ZLIB_SOURCES_DIR}" "${ZLIB_PRELOADED}" "")
 
   include_directories(
     ${ZLIB_SOURCES_DIR}