From e78aa8421173e02315fabd88c7cd77de7a3c8e9a Mon Sep 17 00:00:00 2001
From: cd-pkwan <66626590+cd-pkwan@users.noreply.github.com>
Date: Wed, 15 Jun 2022 00:09:30 +0800
Subject: [PATCH] [chartdir] use versioned download link (#23732)

* Update download link

* Fix version database.

* Remove skips from ci.baseline.txt.

* Use versioned download link

Updated to use versioned download links for macOS, Linux x86 and Linux x64, in addition to Windows.

* Update portfile.cmake

* Remove support for arm and uwp

* Update ci.baseline.txt

* Update version database.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/chartdir/portfile.cmake | 22 +++++++++++-----------
 ports/chartdir/vcpkg.json     |  5 +++--
 scripts/ci.baseline.txt       |  2 ++
 versions/baseline.json        |  2 +-
 versions/c-/chartdir.json     |  5 +++++
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake
index 7e79c17d69..f4ad36e81f 100644
--- a/ports/chartdir/portfile.cmake
+++ b/ports/chartdir/portfile.cmake
@@ -1,13 +1,13 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+# ChartDirector's DLL interface only contains primitive types, so it is CRT agnostic.
+if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
+    message(STATUS "Note: ${PORT} only supports dynamic library linkage. Building dynamic library.")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
 
-if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_LIBRARY_LINKAGE STREQUAL static)
-
-    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-
-elseif(VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_TARGET_IS_WINDOWS)
 
     vcpkg_download_distfile(ARCHIVE_FILE
-        URLS "https://www.advsofteng.net/chartdir_cpp_win.zip"
+        URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_win_7.0.0.zip"
         FILENAME "chartdir_cpp_win-7.0.0.zip"
         SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b
     )
@@ -34,9 +34,9 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
 elseif(VCPKG_TARGET_IS_OSX)
 
     vcpkg_download_distfile(ARCHIVE_FILE
-        URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz"
+        URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_mac_7.0.0.tar.gz"
         FILENAME "chartdir_cpp_mac-7.0.0.tar.gz"
-        SHA512 3f00a4eb7c6b7fc1ebd4856c287ca9a76ca4ce813b4203350526c7ef10c946baa3768446178b664af8e8222275f10f9ee6f5f87cf1e23f23c4a221f431864744
+        SHA512 fd46ac45e8906854ededb9e30ee3ba8bdd05588e6ca7c9fdf140254ee637d32565417d799da33b23228f1ade8111fcae037eed4cf978a11d35e70ab8861214a2
     )
 
     vcpkg_extract_source_archive_ex(
@@ -55,7 +55,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 
         vcpkg_download_distfile(ARCHIVE_FILE
-            URLS "https://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz"
+            URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_64_7.0.0.tar.gz"
             FILENAME "chartdir_cpp_linux_64-7.0.0.tar.gz"
             SHA512 ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467
         )
@@ -63,7 +63,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
     else()
 
         vcpkg_download_distfile(ARCHIVE_FILE
-            URLS "https://www.advsofteng.net/chartdir_cpp_linux.tar.gz"
+            URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_7.0.0.tar.gz"
             FILENAME "chartdir_cpp_linux-7.0.0.tar.gz"
             SHA512 54720fb431fa0fb34be3a187ec3886b0f2a7307ea52a0415fab8513117a157f64a8c0e0b01304aac1d313e4557768242e6b12002509fde2e5303d930c78c0e03
         )
diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json
index f99954188d..9e8fcacfa5 100644
--- a/ports/chartdir/vcpkg.json
+++ b/ports/chartdir/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "chartdir",
   "version": "7.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.",
-  "homepage": "https://www.advsofteng.com/"
+  "homepage": "https://www.advsofteng.com/",
+  "supports": "!arm & !uwp"
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 11fe1ca062..32ec72ef8a 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -104,6 +104,8 @@ charls:x64-windows=skip
 charls:x64-windows-static=skip
 charls:x64-windows-static-md=skip
 charls:x86-windows=skip
+chmlib:arm-uwp=fail
+chmlib:x64-uwp=fail
 # chartdir does not offer stable download URLs
 chartdir:arm64-windows=skip
 chartdir:arm-uwp=skip
diff --git a/versions/baseline.json b/versions/baseline.json
index 2330888533..38856410a1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1358,7 +1358,7 @@
     },
     "chartdir": {
       "baseline": "7.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "check": {
       "baseline": "0.15.2",
diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json
index e2b949dd9c..96f84184e0 100644
--- a/versions/c-/chartdir.json
+++ b/versions/c-/chartdir.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f64b5801adec2ea3f13517ffa35bd96b6a8bb9f",
+      "version": "7.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "2b4bad1eb46439cbd63295d8120f03966c52d162",
       "version": "7.0.0",