Mercurial > hg > orthanc-object-storage

changeset 155:cf1c7c4441b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 22 Jun 2024 17:12:20 +0200
parents e8ac39175eaf
children cb9b4d8c75a2
files Aws/AwsStaticConfiguration.cmake Aws/DownloadStaticPackages.sh
diffstat 2 files changed, 22 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/Aws/AwsStaticConfiguration.cmake	Sat Jun 22 16:55:11 2024 +0200
+++ b/Aws/AwsStaticConfiguration.cmake	Sat Jun 22 17:12:20 2024 +0200
@@ -19,6 +19,7 @@
 
 # The versions below must match those in "./DownloadStaticPackages.sh"
 SET(AWS_CHECKSUMS_VERSION      0.1.17)
+SET(AWS_CRT_CPP_VERSION        0.24.1)
 SET(AWS_C_AUTH_VERSION         0.7.1)
 SET(AWS_C_CAL_VERSION          0.6.1)
 SET(AWS_C_COMMON_VERSION       0.9.3)
@@ -29,74 +30,74 @@
 SET(AWS_C_MQTT_VERSION         0.9.5)
 SET(AWS_C_S3_VERSION           0.3.14)
 SET(AWS_C_SDKUTILS_VERSION     0.1.11)
-SET(AWS_CRT_CPP_VERSION        0.24.1)
 SET(AWS_SDK_CPP_VERSION        1.11.178)
 
+SET(AWS_CHECKSUMS_MD5       "c256144404dc74349a8344662111e353")
+SET(AWS_CRT_CPP_MD5         "fa2cda44386bd56f1d4609c6a54a59f9")
+SET(AWS_C_AUTH_MD5          "aa690622a5f697d47ca3095ba2ef3cca")
+SET(AWS_C_CAL_MD5           "6d7c05e2f1c173b923e77b6021cb660d")
+SET(AWS_C_COMMON_MD5        "d872ff682d5beca8ada6b19464235ca0")
+SET(AWS_C_COMPRESSION_MD5   "b8bc8bc9cf3749eb2d3f36098c9ead27")
+SET(AWS_C_EVENT_STREAM_MD5  "e3261d89598a3331eebcd0476b523c73")
+SET(AWS_C_HTTP_MD5          "b8ef3268d4d64b7fabe743b03518d2d7")
+SET(AWS_C_IO_MD5            "9ae415cb81404e1b76d8e8267e585e34")
+SET(AWS_C_MQTT_MD5          "76d59d9f14f3999b0f9618e386e71db6")
+SET(AWS_C_S3_MD5            "564bb0df1184ebe9ce41c23a0c18cf1a")
+SET(AWS_C_SDKUTILS_MD5      "713cac3392aa20d5dda852cf21ac1957")
+SET(AWS_SDK_CPP_MD5         "a3f45888e939bb71506e0f7eaa630e48")
+
 
 SET(AWS_CHECKSUMS_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-checksums-${AWS_CHECKSUMS_VERSION})
 SET(AWS_CHECKSUMS_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-checksums-${AWS_CHECKSUMS_VERSION}.tar.gz")
-SET(AWS_CHECKSUMS_MD5 "c256144404dc74349a8344662111e353")
 DownloadPackage(${AWS_CHECKSUMS_MD5} ${AWS_CHECKSUMS_URL} "${AWS_CHECKSUMS_SOURCES_DIR}")
 
+SET(AWS_CRT_CPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-crt-cpp-${AWS_CRT_CPP_VERSION})
+SET(AWS_CRT_CPP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-crt-cpp-${AWS_CRT_CPP_VERSION}.tar.gz")
+DownloadPackage(${AWS_CRT_CPP_MD5} ${AWS_CRT_CPP_URL} "${AWS_CRT_CPP_SOURCES_DIR}")
+
 SET(AWS_C_AUTH_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-auth-${AWS_C_AUTH_VERSION})
 SET(AWS_C_AUTH_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-auth-${AWS_C_AUTH_VERSION}.tar.gz")
-SET(AWS_C_AUTH_MD5 "aa690622a5f697d47ca3095ba2ef3cca")
 DownloadPackage(${AWS_C_AUTH_MD5} ${AWS_C_AUTH_URL} "${AWS_C_AUTH_SOURCES_DIR}")
 
 SET(AWS_C_CAL_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-cal-${AWS_C_CAL_VERSION})
 SET(AWS_C_CAL_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-cal-${AWS_C_CAL_VERSION}.tar.gz")
-SET(AWS_C_CAL_MD5 "6d7c05e2f1c173b923e77b6021cb660d")
 DownloadPackage(${AWS_C_CAL_MD5} ${AWS_C_CAL_URL} "${AWS_C_CAL_SOURCES_DIR}")
 
 SET(AWS_C_COMMON_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-common-${AWS_C_COMMON_VERSION})
 SET(AWS_C_COMMON_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-common-${AWS_C_COMMON_VERSION}.tar.gz")
-SET(AWS_C_COMMON_MD5 "d872ff682d5beca8ada6b19464235ca0")
 DownloadPackage(${AWS_C_COMMON_MD5} ${AWS_C_COMMON_URL} "${AWS_C_COMMON_SOURCES_DIR}")
 
 SET(AWS_C_COMPRESSION_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-compression-${AWS_C_COMPRESSION_VERSION})
 SET(AWS_C_COMPRESSION_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-compression-${AWS_C_COMPRESSION_VERSION}.tar.gz")
-SET(AWS_C_COMPRESSION_MD5 "b8bc8bc9cf3749eb2d3f36098c9ead27")
 DownloadPackage(${AWS_C_COMPRESSION_MD5} ${AWS_C_COMPRESSION_URL} "${AWS_C_COMPRESSION_SOURCES_DIR}")
 
 SET(AWS_C_EVENT_STREAM_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-event-stream-${AWS_C_EVENT_STREAM_VERSION})
 SET(AWS_C_EVENT_STREAM_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-event-stream-${AWS_C_EVENT_STREAM_VERSION}.tar.gz")
-SET(AWS_C_EVENT_STREAM_MD5 "e3261d89598a3331eebcd0476b523c73")
 DownloadPackage(${AWS_C_EVENT_STREAM_MD5} ${AWS_C_EVENT_STREAM_URL} "${AWS_C_EVENT_STREAM_SOURCES_DIR}")
 
 SET(AWS_C_HTTP_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-http-${AWS_C_HTTP_VERSION})
 SET(AWS_C_HTTP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-http-${AWS_C_HTTP_VERSION}.tar.gz")
-SET(AWS_C_HTTP_MD5 "b8ef3268d4d64b7fabe743b03518d2d7")
 DownloadPackage(${AWS_C_HTTP_MD5} ${AWS_C_HTTP_URL} "${AWS_C_HTTP_SOURCES_DIR}")
 
 SET(AWS_C_IO_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-io-${AWS_C_IO_VERSION})
 SET(AWS_C_IO_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-io-${AWS_C_IO_VERSION}.tar.gz")
-SET(AWS_C_IO_MD5 "9ae415cb81404e1b76d8e8267e585e34")
 DownloadPackage(${AWS_C_IO_MD5} ${AWS_C_IO_URL} "${AWS_C_IO_SOURCES_DIR}")
 
 SET(AWS_C_MQTT_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-mqtt-${AWS_C_MQTT_VERSION})
 SET(AWS_C_MQTT_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-mqtt-${AWS_C_MQTT_VERSION}.tar.gz")
-SET(AWS_C_MQTT_MD5 "76d59d9f14f3999b0f9618e386e71db6")
 DownloadPackage(${AWS_C_MQTT_MD5} ${AWS_C_MQTT_URL} "${AWS_C_MQTT_SOURCES_DIR}")
 
 SET(AWS_C_S3_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-s3-${AWS_C_S3_VERSION})
 SET(AWS_C_S3_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-s3-${AWS_C_S3_VERSION}.tar.gz")
-SET(AWS_C_S3_MD5 "564bb0df1184ebe9ce41c23a0c18cf1a")
 DownloadPackage(${AWS_C_S3_MD5} ${AWS_C_S3_URL} "${AWS_C_S3_SOURCES_DIR}")
 
 SET(AWS_C_SDKUTILS_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-c-sdkutils-${AWS_C_SDKUTILS_VERSION})
 SET(AWS_C_SDKUTILS_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-c-sdkutils-${AWS_C_SDKUTILS_VERSION}.tar.gz")
-SET(AWS_C_SDKUTILS_MD5 "713cac3392aa20d5dda852cf21ac1957")
 DownloadPackage(${AWS_C_SDKUTILS_MD5} ${AWS_C_SDKUTILS_URL} "${AWS_C_SDKUTILS_SOURCES_DIR}")
 
-SET(AWS_CRT_CPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-crt-cpp-${AWS_CRT_CPP_VERSION})
-SET(AWS_CRT_CPP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-crt-cpp-${AWS_CRT_CPP_VERSION}.tar.gz")
-SET(AWS_CRT_CPP_MD5 "fa2cda44386bd56f1d4609c6a54a59f9")
-DownloadPackage(${AWS_CRT_CPP_MD5} ${AWS_CRT_CPP_URL} "${AWS_CRT_CPP_SOURCES_DIR}")
-
 
 SET(AWS_SDK_CPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/aws-sdk-cpp-${AWS_SDK_CPP_VERSION})
 SET(AWS_SDK_CPP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/aws/aws-sdk-cpp-${AWS_SDK_CPP_VERSION}.tar.gz")
-SET(AWS_SDK_CPP_MD5 "a3f45888e939bb71506e0f7eaa630e48")
 
 if (IS_DIRECTORY "${AWS_SDK_CPP_SOURCES_DIR}")
   set(FirstRun OFF)
--- a/Aws/DownloadStaticPackages.sh	Sat Jun 22 16:55:11 2024 +0200
+++ b/Aws/DownloadStaticPackages.sh	Sat Jun 22 17:12:20 2024 +0200
@@ -28,6 +28,7 @@
 set -e
 
 AWS_CHECKSUMS_VERSION=0.1.17       # https://github.com/awslabs/aws-checksums/tags
+AWS_CRT_CPP_VERSION=0.24.1         # https://github.com/awslabs/aws-crt-cpp/tags
 AWS_C_AUTH_VERSION=0.7.1           # https://github.com/awslabs/aws-c-auth/tags
 AWS_C_CAL_VERSION=0.6.1            # https://github.com/awslabs/aws-c-cal/tags
 AWS_C_COMMON_VERSION=0.9.3         # https://github.com/awslabs/aws-c-common/tags
@@ -38,7 +39,6 @@
 AWS_C_MQTT_VERSION=0.9.5           # https://github.com/awslabs/aws-c-mqtt/tags
 AWS_C_S3_VERSION=0.3.14            # https://github.com/awslabs/aws-c-s3/tags
 AWS_C_SDKUTILS_VERSION=0.1.11      # https://github.com/awslabs/aws-c-sdkutils/tags
-AWS_CRT_CPP_VERSION=0.24.1         # https://github.com/awslabs/aws-crt-cpp/tags
 AWS_SDK_CPP_VERSION=1.11.178       # https://github.com/awslabs/aws-sdk-cpp/tags
 
 TARGET=/tmp/aws
@@ -52,6 +52,8 @@
 
 wget https://github.com/awslabs/aws-checksums/archive/refs/tags/v${AWS_CHECKSUMS_VERSION}.tar.gz \
      -O ${TARGET}/aws-checksums-${AWS_CHECKSUMS_VERSION}.tar.gz
+wget https://github.com/awslabs/aws-crt-cpp/archive/refs/tags/v${AWS_CRT_CPP_VERSION}.tar.gz \
+     -O ${TARGET}/aws-crt-cpp-${AWS_CRT_CPP_VERSION}.tar.gz
 wget https://github.com/awslabs/aws-c-auth/archive/refs/tags/v${AWS_C_AUTH_VERSION}.tar.gz \
      -O ${TARGET}/aws-c-auth-${AWS_C_AUTH_VERSION}.tar.gz
 wget https://github.com/awslabs/aws-c-cal/archive/refs/tags/v${AWS_C_CAL_VERSION}.tar.gz \
@@ -72,7 +74,5 @@
      -O ${TARGET}/aws-c-s3-${AWS_C_S3_VERSION}.tar.gz
 wget https://github.com/awslabs/aws-c-sdkutils/archive/refs/tags/v${AWS_C_SDKUTILS_VERSION}.tar.gz \
      -O ${TARGET}/aws-c-sdkutils-${AWS_C_SDKUTILS_VERSION}.tar.gz
-wget https://github.com/awslabs/aws-crt-cpp/archive/refs/tags/v${AWS_CRT_CPP_VERSION}.tar.gz \
-     -O ${TARGET}/aws-crt-cpp-${AWS_CRT_CPP_VERSION}.tar.gz
 wget https://github.com/awslabs/aws-sdk-cpp/archive/refs/tags/${AWS_SDK_CPP_VERSION}.tar.gz \
      -O ${TARGET}/aws-sdk-cpp-${AWS_SDK_CPP_VERSION}.tar.gz