From 6193af0e33c439a74f9388381efc5f9ecfd6b9b9 Mon Sep 17 00:00:00 2001 From: jonasstrandstedt Date: Thu, 30 Oct 2014 09:18:57 +0100 Subject: [PATCH] Added MD5 check support for downloaded files - Pointing to Linux fixed Ghoul --- CMakeLists.txt | 15 ++++++++++++--- ext/ghoul | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32ab7f05d6..89d2833879 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,21 +140,30 @@ add_subdirectory(src) option(DOWNLOAD_FILES "Download large OpenSpace data on configure" OFF) if(DOWNLOAD_FILES) function(DownloadFile FILE_PATH FILE_URL) + set(FILE_MD5 ${ARGV2}) if(NOT EXISTS "${FILE_PATH}") file(DOWNLOAD ${FILE_URL} ${FILE_PATH} INACTIVITY_TIMEOUT 10 SHOW_PROGRESS) endif() + file(MD5 ${FILE_PATH} MD5_RESULT) + if( NOT "${FILE_MD5}" STREQUAL "" ) + string(COMPARE EQUAL ${MD5_RESULT} ${FILE_MD5} SUCCESS) + if(NOT ${SUCCESS}) + message(WARNING "${FILE_PATH} not matching MD5") + endif() + endif() endfunction(DownloadFile) - function(NewHorizonDownload FILE_PATH) + function(NewHorizonDownload FILE_PATH ) + set(MD5 "${ARGV1}") DownloadFile("${OPENSPACE_BASE_DIR}/openspace-data/spice/JupiterNhKernels/${FILE_PATH}" - "http://naif.jpl.nasa.gov/pub/naif/pds/data/nh-j_p_ss-spice-6-v1.0/nhsp_1000/data/${FILE_PATH}") + "http://naif.jpl.nasa.gov/pub/naif/pds/data/nh-j_p_ss-spice-6-v1.0/nhsp_1000/data/${FILE_PATH}" ${MD5}) endfunction(NewHorizonDownload) NewHorizonDownload("ck/merged_nhpc_2006_v011.bc") NewHorizonDownload("ck/merged_nhpc_2007_v006.bc") NewHorizonDownload("fk/nh_v200.tf") NewHorizonDownload("ik/nh_lorri_v100.ti") - NewHorizonDownload("pck/new_horizons_413.tsc") + NewHorizonDownload("sclk/new_horizons_413.tsc" "6f7a87c21cb3e37835261ed745f34d4a") NewHorizonDownload("spk/de413.bsp") NewHorizonDownload("spk/jup260.bsp") NewHorizonDownload("spk/nh_nep_ura_000.bsp") diff --git a/ext/ghoul b/ext/ghoul index 213ec8a4cd..9c57641e71 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 213ec8a4cd1afe0b497675a17859349a4096761d +Subproject commit 9c57641e71ec2b3461a1d039ea3e6921dd0b103f