Skip to content
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.

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

[x64-windows-release] add a single config community triplet based on x64-windows and make it work on some ports #15983

Merged
merged 82 commits into from
Dec 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
cf696f9
add a single config community triplet based on x64-windows
cenit Feb 1, 2021
5f27a5b
add a failed port, otherwise mechanism does not support empty list
cenit Feb 1, 2021
4cc3067
add failures to baseline
cenit Feb 2, 2021
bcbe7b2
remove duplicate entry
cenit Feb 2, 2021
56674da
Merge branch 'master' into dev/cenit/singleConfig
cenit Feb 2, 2021
b920a7c
second round of failures added to baseline
cenit Feb 2, 2021
f3e52b2
third round of regressions added to CI
cenit Feb 2, 2021
7ee42d3
[ade] fix single-config builds
cenit Feb 2, 2021
d53a4d1
[ade] update refs
cenit Feb 2, 2021
8b475d6
Merge branch 'master' into dev/cenit/singleConfig
cenit Apr 11, 2021
12dd475
Merge branch 'master' into dev/cenit/singleConfig
cenit Apr 21, 2021
4e9855f
Merge branch 'master' into dev/cenit/singleConfig
cenit Apr 30, 2021
5998f77
Merge branch 'master' into dev/cenit/singleConfig
cenit Jun 16, 2021
9c8f4ef
Merge branch 'master' into dev/cenit/singleConfig
cenit Jun 24, 2021
0585a66
Merge branch 'master' into dev/cenit/singleConfig
cenit Jul 9, 2021
bda098d
remove duplicate entries
cenit Jul 12, 2021
6d3e1d6
Merge branch 'master' into dev/cenit/singleConfig
cenit Sep 11, 2021
d605f5e
[unix2dos] restore eol in script file
cenit Sep 11, 2021
95d223d
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 11, 2021
90044be
add even more ports now failing in singleConfig...
cenit Sep 12, 2021
ba82eea
[libjpeg-turbo] remove unnecessary check
cenit Sep 14, 2021
134d8f4
[libjpeg-turbo] fix references
cenit Sep 14, 2021
2e84245
[baseline] restore check for ports that were added recently
cenit Sep 14, 2021
8680ebd
[libmodplug] enable single config triplets
cenit Sep 14, 2021
97d7285
[tensorflow-common] enable single config triplets
cenit Sep 14, 2021
8e2de7a
update baseline
cenit Sep 14, 2021
cfa1033
fix references
cenit Sep 14, 2021
f8f216e
remove wrong check for single config triplets
cenit Sep 15, 2021
d3f4ac8
fix references
cenit Sep 15, 2021
53ff9bd
Merge branch 'master' into dev/cenit/singleConfig
cenit Sep 15, 2021
c39fc1c
Merge branch 'master' into dev/cenit/singleConfig
cenit Sep 17, 2021
71ed32a
[ogre] fix single config builds
cenit Sep 20, 2021
e4b79eb
[ogre] fix references
cenit Sep 20, 2021
c449521
Merge branch 'dev/cenit/singleConfig' of https://github.com/cenit/vcp…
cenit Sep 20, 2021
75a6fa8
Merge branch 'master' into dev/cenit/singleConfig
cenit Sep 20, 2021
39c00de
[untested] force x64-windows-release as host triplet when testing x64…
cenit Sep 21, 2021
9126eae
fix
cenit Sep 21, 2021
831de2f
[x264] fix for single config
cenit Sep 21, 2021
a07eaad
[x264] update refs
cenit Sep 21, 2021
036c970
[libffi] enable single config builds
cenit Sep 21, 2021
d13d943
[libffi] update refs
cenit Sep 21, 2021
1139792
remove cli broken arguments
cenit Sep 21, 2021
a54c950
[calceph] enable single-config builds
cenit Sep 21, 2021
38c1a65
[calceph] fix references
cenit Sep 21, 2021
b791b18
Merge branch 'dev/cenit/singleConfig' of https://github.com/cenit/vcp…
cenit Sep 21, 2021
1eddc65
[kf5config] enable single-config builds
cenit Sep 21, 2021
d085bee
[kf5config] fix references
cenit Sep 21, 2021
7351547
[detours] enable single-config builds
cenit Sep 21, 2021
2a5aa85
[detours] fix references
cenit Sep 21, 2021
d406015
[kf5*] enable single-config builds
cenit Sep 21, 2021
a5ba53a
[kf5*] fix references
cenit Sep 21, 2021
d578007
fix
cenit Sep 21, 2021
0141dec
kf5config fix reference
cenit Sep 21, 2021
a6ce8dc
trying again to force host triplet in CI
cenit Sep 21, 2021
dba2422
[boost] fix for single-config builds
cenit Sep 22, 2021
2bff109
[boost] update references
cenit Sep 22, 2021
90aae4a
merge with master
cenit Sep 22, 2021
83940bf
fix
cenit Sep 22, 2021
e08e054
[boost] update refs
cenit Sep 22, 2021
600725a
disable host triplet in ci because it's not necessary
cenit Sep 22, 2021
7e89743
retrigger a build for ports previously failing
cenit Sep 22, 2021
cd29110
remove host triplet in ci, not necessary anymore?
cenit Sep 22, 2021
0571014
make PR dry
cenit Sep 23, 2021
5a529d1
merge with master
cenit Sep 24, 2021
22112d4
[tensorflow-common] bump version
cenit Sep 24, 2021
c9370de
[tensorflow-common] fix references
cenit Sep 24, 2021
dbeeb11
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 24, 2021
9e09326
Merge branch 'master' into dev/cenit/singleConfig
cenit Sep 28, 2021
3b13ccc
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 28, 2021
1f28a1e
Fix version database for boost-modular-build-helper.
BillyONeal Sep 28, 2021
9de2f77
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 30, 2021
befdc57
Merge branch 'master' into dev/cenit/singleConfig
cenit Nov 3, 2021
21a7836
fix references
cenit Nov 3, 2021
db504d6
Merge branch 'master' into dev/cenit/singleConfig
cenit Nov 19, 2021
c39073c
restore CRLF on some ports
cenit Nov 19, 2021
1a7895e
bump versions
cenit Nov 19, 2021
981287f
fix references
cenit Nov 19, 2021
fe11d43
Merge branch 'master' into dev/cenit/singleConfig
cenit Dec 17, 2021
659022b
bump port versions
cenit Dec 17, 2021
4cc5413
fix references
cenit Dec 17, 2021
ccafda4
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 17, 2021
5793a2a
boost-modular-build-helper: Reverted due to no changes.
BillyONeal Dec 17, 2021
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
10 changes: 6 additions & 4 deletions ports/calceph/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ vcpkg_extract_source_archive_ex(
)

if (VCPKG_TARGET_IS_WINDOWS)

vcpkg_install_nmake(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
Expand All @@ -29,7 +29,9 @@ if (VCPKG_TARGET_IS_WINDOWS)
)
file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/include/calceph.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
endif()
file(REMOVE_RECURSE "${CURRENT_INSTALLED_DIR}/calceph")

else() # Build in UNIX
Expand All @@ -40,10 +42,10 @@ else() # Build in UNIX
--enable-fortran=no
--enable-thread=yes
)

vcpkg_install_make()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

endif()

file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME readme.rst)
Expand Down
1 change: 1 addition & 0 deletions ports/calceph/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "calceph",
"version": "3.5.0",
"port-version": 1,
"description": "C library to access the binary planetary ephemeris files.",
"homepage": "https://www.imcce.fr/inpop/calceph/",
"documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html",
Expand Down
17 changes: 8 additions & 9 deletions ports/libffi/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,15 @@ set(exec_prefix "\${prefix}")
set(libdir "\${prefix}/lib")
set(toolexeclibdir "\${libdir}")
set(includedir "\${prefix}/include")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY)
endif()
configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY)

# debug
set(prefix "${CURRENT_INSTALLED_DIR}/debug")
set(exec_prefix "\${prefix}")
set(libdir "\${prefix}/lib")
set(toolexeclibdir "\${libdir}")
set(includedir "\${prefix}/../include")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
set(prefix "${CURRENT_INSTALLED_DIR}/debug")
set(exec_prefix "\${prefix}")
set(libdir "\${prefix}/lib")
set(toolexeclibdir "\${libdir}")
set(includedir "\${prefix}/../include")
configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" @ONLY)
endif()

Expand Down
2 changes: 1 addition & 1 deletion ports/libffi/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libffi",
"version": "3.4.2",
"port-version": 2,
"port-version": 4,
"description": "Portable, high level programming interface to various calling conventions",
"homepage": "https://github.com/libffi/libffi",
"dependencies": [
Expand Down
3 changes: 0 additions & 3 deletions ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
find_library(JPEG_LIBRARY_DEBUG NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
if(NOT JPEG_INCLUDE_DIR OR NOT JPEG_LIBRARY_RELEASE OR (NOT JPEG_LIBRARY_DEBUG AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib"))
message(FATAL_ERROR "Broken installation of vcpkg port libjpeg-turbo")
endif()
if(CMAKE_VERSION VERSION_LESS 3.12)
include(SelectLibraryConfigurations)
select_library_configurations(JPEG)
Expand Down
2 changes: 1 addition & 1 deletion ports/libjpeg-turbo/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libjpeg-turbo",
"version": "2.0.6",
"port-version": 2,
"port-version": 3,
"description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.",
"homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo",
"features": {
Expand Down
10 changes: 9 additions & 1 deletion ports/tensorflow-common/tensorflow-common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,15 @@ else()
endif()
endif()

foreach(BUILD_TYPE dbg rel)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
list(APPEND PORT_BUILD_CONFIGS "dbg")
endif()

if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
list(APPEND PORT_BUILD_CONFIGS "rel")
endif()

foreach(BUILD_TYPE IN LISTS PORT_BUILD_CONFIGS)
# prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks
set(STATIC_ONLY_PATCHES)
set(WINDOWS_ONLY_PATCHES)
Expand Down
2 changes: 1 addition & 1 deletion ports/tensorflow-common/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tensorflow-common",
"version-semver": "2.7.0",
"port-version": 1,
"port-version": 2,
"description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
"homepage": "https://github.com/tensorflow/tensorflow"
}
10 changes: 6 additions & 4 deletions ports/x264/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ vcpkg_from_github(
REF 5db6aa6cab1b146e07b60cc1736a01f21da01154
SHA512 d2cdd40d195fd6507abacc8b8810107567dff2c0a93424ba1eb00b544cb78a5430f00f9bcf8f19bd663ae77849225577da05bfcdb57948a8af9dc32a7c8b9ffd
HEAD_REF stable
PATCHES
PATCHES
"uwp-cflags.patch"
)

Expand Down Expand Up @@ -61,11 +61,13 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_TARGET_IS_WINDOWS)
set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc")
if(EXISTS "${pcfile}")
vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264")
vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264")
endif()
set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc")
if(EXISTS "${pcfile}")
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc")
if(EXISTS "${pcfile}")
vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264")
endif()
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion ports/x264/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "x264",
"version-string": "164-5db6aa6cab1b146",
"port-version": 1,
"port-version": 2,
"description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format",
"homepage": "https://github.com/mirror/x264",
"supports": "!arm",
Expand Down
4 changes: 4 additions & 0 deletions triplets/community/x64-windows-release.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_BUILD_TYPE release)
10 changes: 5 additions & 5 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@
},
"calceph": {
"baseline": "3.5.0",
"port-version": 0
"port-version": 1
},
"camport3": {
"baseline": "1.5.3",
Expand Down Expand Up @@ -3454,7 +3454,7 @@
},
"libffi": {
"baseline": "3.4.2",
"port-version": 2
"port-version": 4
},
"libfido2": {
"baseline": "1.7.0",
Expand Down Expand Up @@ -3590,7 +3590,7 @@
},
"libjpeg-turbo": {
"baseline": "2.0.6",
"port-version": 2
"port-version": 3
},
"libjuice": {
"baseline": "0.9.1",
Expand Down Expand Up @@ -6706,7 +6706,7 @@
},
"tensorflow-common": {
"baseline": "2.7.0",
"port-version": 1
"port-version": 2
},
"tensorpipe": {
"baseline": "2021-04-26",
Expand Down Expand Up @@ -7306,7 +7306,7 @@
},
"x264": {
"baseline": "164-5db6aa6cab1b146",
"port-version": 1
"port-version": 2
},
"x265": {
"baseline": "3.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/calceph.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "48bd1ecc8648d44291fbaf0a11f5f12aa017c077",
"version": "3.5.0",
"port-version": 1
},
{
"git-tree": "d2665db7558ef66aa086f95b155e61b15bd56848",
"version": "3.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libffi.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "05f73f7c0bbd49045d312d90683a01405f5ffd83",
"version": "3.4.2",
"port-version": 4
},
{
"git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e",
"version": "3.4.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libjpeg-turbo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1f10cf90b5807f4b4b98cc82786236002e85b9ac",
"version": "2.0.6",
"port-version": 3
},
{
"git-tree": "48423df98f8715a1f33c2abdfcfc0c0bf5cc5f92",
"version": "2.0.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tensorflow-common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1f37cd68d08ecbb0ca6c2d630598d3f568f1fcc4",
"version-semver": "2.7.0",
"port-version": 2
},
{
"git-tree": "4c81239401e4304b124ed215960cdcdf19611e47",
"version-semver": "2.7.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/x264.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c449395a31c61601c5313e4f3e6040bee9c67fde",
"version-string": "164-5db6aa6cab1b146",
"port-version": 2
},
{
"git-tree": "8d6c7ba5815a0683a2915df5f95de5d06e938781",
"version-string": "164-5db6aa6cab1b146",
Expand Down