Skip to content

[chartdir] use versioned download link #23732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 10 commits into from
Jun 14, 2022
Merged

[chartdir] use versioned download link #23732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
33b3807
Update download link
cd-pkwan Mar 23, 2022
5fa4d11
Fix version database.
BillyONeal Mar 24, 2022
9a62dfe
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Mar 28, 2022
9294a28
Remove skips from ci.baseline.txt.
BillyONeal Mar 28, 2022
1f617be
Use versioned download link
cd-pkwan Mar 29, 2022
12b79e2
Update portfile.cmake
cd-pkwan May 1, 2022
eae47c8
Remove support for arm and uwp
cd-pkwan May 1, 2022
9856c25
Update ci.baseline.txt
cd-pkwan Jun 13, 2022
0223972
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jun 13, 2022
60bae28
Update version database.
BillyONeal Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ports/chartdir/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

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)
# 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()

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
)
Expand All @@ -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(
Expand All @@ -55,15 +55,15 @@ 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
)

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
)
Expand Down
5 changes: 3 additions & 2 deletions ports/chartdir/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 2 additions & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@
},
"chartdir": {
"baseline": "7.0.0",
"port-version": 3
"port-version": 4
},
"check": {
"baseline": "0.15.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/chartdir.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7f64b5801adec2ea3f13517ffa35bd96b6a8bb9f",
"version": "7.0.0",
"port-version": 4
},
{
"git-tree": "2b4bad1eb46439cbd63295d8120f03966c52d162",
"version": "7.0.0",
Expand Down