3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 06:08:03 +08:00
Code Issues Projects Releases Wiki Activity

[VCPKG baseline] Fix many ports (#11559)

Browse Source
This commit is contained in:
Jack·Boos·Yu 2020-05-26 02:52:48 +08:00 committed by GitHub
parent 2ac2b5f3da
commit b271aeffa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 38 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/apr-util/CONTROL
View File

@ -1,5 +1,5 @@
Source: apr-util
Version: 1.6.1
Version: 1.6.1-1
Homepage: https://apr.apache.org/
Description: Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation
Build-Depends: expat, apr, openssl

5
ports/apr-util/portfile.cmake
View File

@ -1,4 +1,3 @@
vcpkg_download_distfile(ARCHIVE
URLS "http://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2"
FILENAME "apr-util-1.6.1.tar.bz2"
@ -7,7 +6,6 @@ vcpkg_download_distfile(ARCHIVE
)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
@ -46,7 +44,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}")
else(VCPKG_TARGET_IS_WINDOWS)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
@ -70,7 +67,7 @@ else(VCPKG_TARGET_IS_WINDOWS)
NO_DEBUG
OPTIONS
"--prefix=${CURRENT_INSTALLED_DIR}"
"--with-apr=${CURRENT_INSTALLED_DIR}"
"--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr"
"--with-openssl=${CURRENT_INSTALLED_DIR}"
"-with-expat=${CURRENT_INSTALLED_DIR}"
"${CONFIGURE_PARAMETER_1}"

2
ports/bond/CONTROL
View File

@ -1,5 +1,5 @@
Source: bond
Version: 8.1.0-3
Version: 8.1.0-4
Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
Homepage: https://github.com/Microsoft/bond
Build-Depends: rapidjson, boost-config, boost-utility, boost-assign

11
ports/bond/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@ -11,7 +9,7 @@ vcpkg_from_github(
PATCHES fix-install-path.patch
)
if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_download_distfile(GBC_ARCHIVE
URLS "https://github.com/microsoft/bond/releases/download/8.1.0/gbc-8.1.0-amd64.zip"
FILENAME "gbc-8.1.0-amd64.zip"
@ -50,13 +48,12 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/bond TARGET_PATH share/bond)
# Put the license file where vcpkg expects it
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bond)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/bond/LICENSE ${CURRENT_PACKAGES_DIR}/share/bond/copyright)
vcpkg_copy_pdbs()
# There's no way to supress installation of the headers in the debug build,
# so we just delete them.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
vcpkg_copy_pdbs()
# Put the license file where vcpkg expects it
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/ccfits/CONTROL
View File

@ -1,5 +1,5 @@
Source: ccfits
Version: 2.5-4
Version: 2.5-5
Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits
Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.
Build-Depends: cfitsio

4
ports/ccfits/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz"
FILENAME "CCfits-2.5.tar.gz"
@ -40,4 +38,4 @@ foreach(HEADER IN LISTS HEADERS)
endforeach()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ccfits RENAME copyright)
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/geographiclib/CONTROL
View File

@ -1,4 +1,4 @@
Source: geographiclib
Version: 1.47-patch1-10
Version: 1.47-patch1-11
Homepage: https://sourceforge.net/projects/geographiclib/
Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems.

2
ports/geographiclib/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "https://jaist.dl.sourceforge.net/project/geographiclib/distrib/archive/GeographicLib-1.47-patch1.zip"
FILENAME "geographiclib-1.47-patch1.zip"

2
ports/libaiff/CONTROL
View File

@ -1,4 +1,4 @@
Source: libaiff
Version: 5.0-2
Version: 5.0-3
Homepage: https://sourceforge.net/projects/aifftools
Description: LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features

7
ports/libaiff/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_download_distfile(ARCHIVE
@ -22,7 +20,8 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/libaiff)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)
vcpkg_install_cmake()
@ -38,4 +37,4 @@ foreach(HEADER ${HEADERS})
endforeach()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libaiff RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/ois/CONTROL
View File

@ -1,4 +1,4 @@
Source: ois
Version: 1.5
Version: 1.5-1
Description: Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.
Homepage: https://wgois.github.io/OIS/

3
ports/ois/portfile.cmake
View File

@ -26,6 +26,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
# CMake integration test
# vcpkg_test_cmake(PACKAGE_NAME ${PORT})

2
ports/opencc/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencc
Version: 2020-04-26-2
Version: 2020-04-26-3
Description: A project for conversion between Traditional and Simplified Chinese
Homepage: https://github.com/BYVoid/OpenCC
Supports: !(arm|arm64|uwp)

2
ports/opencc/portfile.cmake
View File

@ -47,4 +47,4 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

3
ports/wtl/CONTROL
View File

@ -1,5 +1,4 @@
Source: wtl
Version: 10.0-4
Version: 10.0-5
Homepage: https://sourceforge.net/projects/wtl/
Description: Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.
Build-Depends:

2
ports/wtl/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "https://downloads.sourceforge.net/project/wtl/WTL%2010/WTL%2010.0.9163/WTL10_9163.zip"
FILENAME "WTL10_9163.zip"

3
ports/xmsh/CONTROL
View File

@ -1,4 +1,5 @@
Source: xmsh
Version: 0.5.2
Version: 0.5.2-1
Description: Reference Implementation of XMSH Library
Build-Depends: tl-expected, nlohmann-json
Homepage: https://gitlab.com/libxmsh/xmsh

28
ports/xmsh/portfile.cmake
View File

@ -1,19 +1,15 @@
include(vcpkg_common_functions)
vcpkg_find_acquire_program(PYTHON3)
if (NOT VCPKG_TARGET_IS_WINDOWS)
message("Building with a gcc version less than 7.1.0 is not supported.")
else()
message(FATAL_ERROR "xmsh only support Linux/OSX.")
endif()
vcpkg_fail_port_install(ON_TARGET "Windows")
message("Building with a gcc version less than 7.1.0 is not supported.")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libxmsh/xmsh
REF e1900845b796ef977db70519b2ac08eebd788236 #v0.5.2
SHA512 643c6c94956de9b6fae635b6528e8ba756f4a2bc38de71613c2dd8d47f4a043aee7b6e7fec1870b306be3bea9f5c0c81d1d343bfc27883b3fba986fbc5b15406
HEAD_REF master
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH
REPO libxmsh/xmsh
REF e1900845b796ef977db70519b2ac08eebd788236
SHA512 643c6c94956de9b6fae635b6528e8ba756f4a2bc38de71613c2dd8d47f4a043aee7b6e7fec1870b306be3bea9f5c0c81d1d343bfc27883b3fba986fbc5b15406
HEAD_REF master
)
vcpkg_configure_cmake(
@ -29,6 +25,8 @@ set(ENV{PATH} "$ENV{PATH};${PYPATH}")
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@ -36,6 +34,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(INSTALL ${SOURCE_PATH}/copyright.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/xmsh RENAME copyright)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/copyright.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

7
scripts/azure-pipelines/linux/azure-pipelines.yml
View File

@ -18,6 +18,11 @@ jobs:
displayName: 'Initialize Environment'
inputs:
filePath: scripts/azure-pipelines/linux/initialize-environment.sh
- bash: |
sudo mkdir /home/agent -m=777
sudo chown `id -u` /home/agent
exit 0
displayName: 'Create /home/agent'
- bash: |
df -h
displayName: 'Report on Disk Space After Environment'
@ -32,7 +37,7 @@ jobs:
- powershell: |
$skipList = ./scripts/azure-pipelines/generate-skip-list.ps1 -Triplet "x64-linux" -BaselineFile "$(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt"
mkdir $(System.ArtifactsDirectory)/xml-results
$env:HOME = '/home/root'
$env:HOME = '/home/agent'
./vcpkg ci x64-linux --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-linux.xml" --exclude=$skipList --binarycaching
displayName: '** Test Modified Ports **'
- task: PowerShell@2

3
scripts/ci.baseline.txt
View File

@ -76,9 +76,6 @@ anyrpc:x86-windows=ignore
anyrpc:x64-windows-static=ignore
apr:arm-uwp=fail
apr:x64-uwp=fail
# Static builds fail beacuase apr-1-config is installed in bin
apr:x64-linux=fail
apr:x64-osx=fail
# Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
apr:arm64-windows=fail
argtable2:arm-uwp=fail