aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/boost/generate-ports.ps119
-rw-r--r--scripts/boost/post-source-stubs/iostreams.cmake18
-rw-r--r--scripts/ci.baseline.txt24
-rw-r--r--scripts/cmake/vcpkg_find_acquire_program.cmake30
4 files changed, 48 insertions, 43 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 200b8376e..36ddfe66e 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -46,6 +46,10 @@ function Generate()
$controlDeps = ($Depends | sort) -join ", "
$versionSuffix = ""
+ if ($Name -eq "iostreams")
+ {
+ $versionsuffix = "-1"
+ }
mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null
$controlLines = @(
@@ -165,9 +169,6 @@ function Generate()
")"
)
}
- elseif ($PortName -eq "iostreams")
- {
- }
else
{
$portfileLines += @(
@@ -176,13 +177,11 @@ function Generate()
)
}
}
- if ($PortName -ne "iostreams")
- {
- $portfileLines += @(
- "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)"
- "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})"
- )
- }
+
+ $portfileLines += @(
+ "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)"
+ "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})"
+ )
if (Test-Path "$scriptsDir/post-build-stubs/$PortName.cmake")
{
diff --git a/scripts/boost/post-source-stubs/iostreams.cmake b/scripts/boost/post-source-stubs/iostreams.cmake
deleted file mode 100644
index df1479fb8..000000000
--- a/scripts/boost/post-source-stubs/iostreams.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-vcpkg_download_distfile(LICENSE
- URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.72.0/LICENSE_1_0.txt"
- FILENAME "boost_LICENSE_1_0.txt"
- SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-iostreams RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b658bcea3..af6569c83 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -282,8 +282,6 @@ cppfs:x64-uwp=fail
cppgraphqlgen:arm-uwp=fail
cppgraphqlgen:x64-uwp=ignore
cppkafka:x64-linux=ignore
-cppmicroservices:x86-windows=fail
-cppmicroservices:x64-windows=fail
cppmicroservices:arm64-windows=fail
cppmicroservices:arm-uwp=fail
cppmicroservices:x64-uwp=fail
@@ -380,7 +378,6 @@ dxut:arm-uwp=fail
dxut:x64-linux=fail
dxut:x64-osx=fail
dxut:x64-windows-static=fail
-eastl:arm64-windows=fail
eastl:arm-uwp=fail
easyhook:arm64-windows=fail
easyhook:arm-uwp=fail
@@ -390,6 +387,10 @@ easyhook:x64-uwp=fail
easyhook:x64-windows-static=fail
easyloggingpp:arm-uwp=fail
easyloggingpp:x64-uwp=fail
+eathread:arm64-windows=fail
+eathread:arm-uwp=fail
+eathread:x64-uwp=fail
+eathread:x86-windows=fail
ebml:arm-uwp=fail
ebml:x64-uwp=fail
ecm:arm64-windows = skip
@@ -580,6 +581,9 @@ gtk:x86-windows=ignore
gts:x64-linux=fail
gts:x64-osx=fail
guetzli:x64-osx=fail
+h3:arm64-windows=fail
+h3:arm-uwp=fail
+h3:x64-uwp=fail
halide:x64-windows-static=fail
hdf5:arm64-windows=fail
hdf5:arm-uwp=fail
@@ -679,6 +683,7 @@ lcm:x64-linux=fail
lcm:x64-osx=fail
leptonica:x64-uwp=fail
leptonica:arm-uwp=fail
+leptonica:arm64-windows=fail
leveldb:arm-uwp=fail
leveldb:x64-uwp=fail
libaiff:x64-linux=fail
@@ -750,6 +755,12 @@ libgo:x64-osx=fail
libgo:x64-windows=fail
libgo:x64-windows-static=fail
libgo:x86-windows=fail
+libgpod:arm64-windows=fail
+libgpod:arm-uwp=fail
+libgpod:x64-uwp=fail
+libgpod:x64-windows=fail
+libgpod:x64-windows-static=fail
+libgpod:x86-windows=fail
libhydrogen:arm64-windows=fail
libics:arm-uwp=fail
libics:x64-uwp=fail
@@ -916,7 +927,6 @@ libusb:arm-uwp=fail
libusb:x64-linux=fail
libusb:x64-osx=fail
libusb:x64-uwp=fail
-libusbmuxd:arm64-windows=fail
libusbmuxd:arm-uwp=fail
libusbmuxd:x64-uwp=fail
libusbmuxd:x64-linux=fail
@@ -1547,8 +1557,8 @@ sdl2-mixer:arm-uwp=fail
sdl2-mixer:x64-uwp=fail
sdl2-net:arm-uwp=fail
sdl2-net:x64-uwp=fail
-seal:arm-uwp=fail
-seal:x64-uwp=fail
+seal:arm-uwp=fail
+seal:x64-uwp=fail
secp256k1:x64-linux=fail
secp256k1:x64-osx=fail
selene:x64-linux=ignore
@@ -1564,11 +1574,11 @@ sfgui:x64-linux=ignore
sfml:arm64-windows=fail
shapelib:arm-uwp=fail
shapelib:x64-uwp=fail
-shiva:x64-windows=fail
shiva:x64-windows-static=fail
shiva-sfml:x64-linux=fail
shiva-sfml:x64-osx=fail
shiva-sfml:x86-windows=fail
+shiva-sfml:x64-windows=fail
shogun:arm64-windows = skip
shogun:arm-uwp = skip
shogun:x64-osx=fail
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index cb17ece21..a525dbc11 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -93,11 +93,18 @@ function(vcpkg_find_acquire_program VAR)
elseif(VAR MATCHES "PYTHON3")
if(CMAKE_HOST_WIN32)
set(PROGNAME python)
- set(SUBDIR "python-3.7.3")
+ if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+ set(SUBDIR "python-3.7.3-x86")
+ set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-win32.zip")
+ set(ARCHIVE "python-3.7.3-embed-win32.zip")
+ set(HASH 2c1b1f0a29d40a91771ae21a5f733eedc10984cd182cb10c2793bbd24191a89f20612a3f23c34047f37fb06369016bfd4a52915ed1b4a56f8bd2b4ca6994eb31)
+ else()
+ set(SUBDIR "python-3.7.3-x64")
+ set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-amd64.zip")
+ set(ARCHIVE "python-3.7.3-embed-amd64.zip")
+ set(HASH 4b3e0067b5e8d00b1cac5d556ab4fbd71df2a1852afb3354ee62363aabc8801aca84da09dbd26125527ae54b50488f808c1d82abf18969c23a51dcd57576885f)
+ endif()
set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
- set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-win32.zip")
- set(ARCHIVE "python-3.7.3-embed-win32.zip")
- set(HASH 2c1b1f0a29d40a91771ae21a5f733eedc10984cd182cb10c2793bbd24191a89f20612a3f23c34047f37fb06369016bfd4a52915ed1b4a56f8bd2b4ca6994eb31)
set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E remove python37._pth)
else()
set(PROGNAME python3)
@@ -107,11 +114,18 @@ function(vcpkg_find_acquire_program VAR)
elseif(VAR MATCHES "PYTHON2")
if(CMAKE_HOST_WIN32)
set(PROGNAME python)
- set(SUBDIR "python2")
+ if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+ set(SUBDIR "python-2.7.16-x86")
+ set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi")
+ set(ARCHIVE "python-2.7.16.msi")
+ set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254)
+ else()
+ set(SUBDIR "python-2.7.16-x64")
+ set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.amd64.msi")
+ set(ARCHIVE "python-2.7.16.amd64.msi")
+ set(HASH 47c1518d1da939e3ba6722c54747778b93a44c525bcb358b253c23b2510374a49a43739c8d0454cedade858f54efa6319763ba33316fdc721305bc457efe4ffb)
+ endif()
set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
- set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi")
- set(ARCHIVE "python-2.7.16.msi")
- set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254)
else()
set(PROGNAME python2)
set(BREW_PACKAGE_NAME "python2")
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-14 10:54:26 +0000