[vcpkg_copy_tools] support copying .app bundles #20210

wrobelda · 2021-09-16T17:34:01Z

Describe the pull request
- Adds VCPKG_HOST_BUNDLE_SUFFIX and VCPKG_TARGET_BUNDLE_SUFFIX variables, currently having a non-empty value on macOS only.
- modifies vcpkg_copy_tools() to attempt to copy tools using VCPKG_TARGET_BUNDLE_SUFFIX first. If target is not found, continues with the previous logic.

What does your PR fix?

Fixes vcpkg_copy_tools() doesn't support macOS .app bundles #20209
Fixes [vcpkg] vcpkg_copy_tools does not handle app packages for macos #15164
Which triplets are supported/not supported? Have you updated the CI baseline?

All.
Does your PR follow the maintainer guide?

Yes.
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Not applicable.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json
index 9a45fa9..4950f72 100644
--- a/ports/kf5configwidgets/vcpkg.json
+++ b/ports/kf5configwidgets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5configwidgets",
   "version-semver": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "Widgets for configuration dialogs",
   "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html",
   "dependencies": [
diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json
index 5ac9fbb..25aefee 100644
--- a/ports/kf5globalaccel/vcpkg.json
+++ b/ports/kf5globalaccel/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5globalaccel",
   "version-semver": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "lobal desktop keyboard shortcuts",
   "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html",
   "dependencies": [
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index e973cc4..3c7db55 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5iconthemes",
   "version": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "Icon GUI utilities",
   "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
   "dependencies": [
diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json
index c8f3cba..b02a341 100644
--- a/ports/kf5jobwidgets/vcpkg.json
+++ b/ports/kf5jobwidgets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5jobwidgets",
   "version-semver": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "Widgets for showing progress of asynchronous jobs",
   "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html",
   "dependencies": [
diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json
index 9a095b7..a874e8d 100644
--- a/ports/kf5package/vcpkg.json
+++ b/ports/kf5package/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5package",
   "version": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "Installation and loading of additional content (ex: scripts, images...) as packages",
   "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html",
   "dependencies": [
diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json
index e8bad39..72136bf 100644
--- a/ports/kf5service/vcpkg.json
+++ b/ports/kf5service/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5service",
   "version": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "Plugin framework for desktop services",
   "homepage": "https://api.kde.org/frameworks/kservice/html/index.html",
   "dependencies": [
diff --git a/ports/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json
index 20850e4..dfb7e27 100644
--- a/ports/kf5textwidgets/vcpkg.json
+++ b/ports/kf5textwidgets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5textwidgets",
   "version": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "Text editing widgets",
   "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html",
   "dependencies": [
diff --git a/ports/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json
index 4522698..0d48768 100644
--- a/ports/kf5wallet/vcpkg.json
+++ b/ports/kf5wallet/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5wallet",
   "version-semver": "5.84.0",
-  "port-version": 1,  
+  "port-version": 1,
   "description": "Safe desktop-wide storage for passwords",
   "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html",
   "dependencies": [

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 5d734efcef674dbf9b7b204484fc8f006101dcb5 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 2340b43..6bbf98b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2946,115 +2946,115 @@
     },
     "kf5archive": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5attica": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5auth": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5codecs": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5completion": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5config": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5configwidgets": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5coreaddons": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5crash": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5dbusaddons": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5globalaccel": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5guiaddons": {
       "baseline": "5.84.0",
-      "port-version": 2
+      "port-version": 3
     },
     "kf5holidays": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5i18n": {
       "baseline": "5.84.0",
-      "port-version": 2
+      "port-version": 3
     },
     "kf5iconthemes": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5itemmodels": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5itemviews": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5jobwidgets": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5package": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5plotting": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5service": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5solid": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5sonnet": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5syntaxhighlighting": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5textwidgets": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5wallet": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5widgetsaddons": {
       "baseline": "5.84.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5windowsystem": {
       "baseline": "5.84.0",
-      "port-version": 2
+      "port-version": 3
     },
     "kfr": {
       "baseline": "4.2.1",
diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json
index 068b74c..3dd22de 100644
--- a/versions/k-/kf5archive.json
+++ b/versions/k-/kf5archive.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1476ac82c0b38d83211053e22afbac2091dab2e3",
+      "version-semver": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "03f6943556e1d7600443c1f30445560de3f9b2f7",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5attica.json b/versions/k-/kf5attica.json
index d37e925..51344eb 100644
--- a/versions/k-/kf5attica.json
+++ b/versions/k-/kf5attica.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0d1c8f2256f2e831a4ba82551de6a55ee4565a6",
+      "version-semver": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "196f1ae93b85efd88bb9fa4a245ed9e8cf044a4a",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json
index acaa00c..c3154d0 100644
--- a/versions/k-/kf5auth.json
+++ b/versions/k-/kf5auth.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "54c38c08e5c5af0745650a385a5cea5926748545",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "5f1399e14100a7c100bc55f8d436224c680a7f52",
       "version": "5.84.0",
diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json
index 544d164..532248c 100644
--- a/versions/k-/kf5codecs.json
+++ b/versions/k-/kf5codecs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0997fde9753e1e3c745eca599c116ef3a511bece",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "cc839f57cba8b67ed071d5dc3a472b605033cd7a",
       "version": "5.84.0",
diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json
index 6192590..aea864f 100644
--- a/versions/k-/kf5completion.json
+++ b/versions/k-/kf5completion.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a184552295179e5f414d3166d8f6f40ce9c66347",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b32643e981f1d9bab04fd3526e9c6c4499d35d1f",
       "version": "5.84.0",
diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json
index 69d611d..13e4c60 100644
--- a/versions/k-/kf5config.json
+++ b/versions/k-/kf5config.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f36f1f5a124bd2f3123e0dfd9f4d350f1f69e757",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "67fa669df81328489ba66231cef84fc17ae4f434",
       "version": "5.84.0",
diff --git a/versions/k-/kf5configwidgets.json b/versions/k-/kf5configwidgets.json
index c2f9808..db43915 100644
--- a/versions/k-/kf5configwidgets.json
+++ b/versions/k-/kf5configwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9eca836d8da743409afa20dfc372145a7a7e68d6",
+      "version-semver": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "99dcbe4e7cb84be45f9869e441c274e44309291d",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json
index 3527c22..5783b0d 100644
--- a/versions/k-/kf5coreaddons.json
+++ b/versions/k-/kf5coreaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca84b488ea7914b621bf49006f03f4ce8221052c",
+      "version-semver": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "001ac94bfbadcc7b05c30448bff3adc9e2dc08dd",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json
index 6260690..cf1ac87 100644
--- a/versions/k-/kf5crash.json
+++ b/versions/k-/kf5crash.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e30fa89728c784663526f9ff9332021507b9ee8e",
+      "version-semver": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "9b4122c60d561d232fbd5294a304be12509b736d",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json
index 1c4e812..f5cfead 100644
--- a/versions/k-/kf5dbusaddons.json
+++ b/versions/k-/kf5dbusaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "497be7e1959fac395884422632328485883fd433",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "417fdf58b130c7e24794cf4d1d29336cb946f9fa",
       "version": "5.84.0",
diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json
index 32bfc0d..da94a06 100644
--- a/versions/k-/kf5globalaccel.json
+++ b/versions/k-/kf5globalaccel.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "541f3c0b90027dcb3837dec812f896dbc4786f46",
+      "version-semver": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "de0672be2e76751be304b4856466b9df6deaa29f",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json
index 0a1b250..c9d4b6f 100644
--- a/versions/k-/kf5guiaddons.json
+++ b/versions/k-/kf5guiaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1dfe4575612c8d7d2bff1d4b1ecf2d5601915060",
+      "version-semver": "5.84.0",
+      "port-version": 3
+    },
     {
       "git-tree": "3ecd4e54210c93a999c1cf4ddc24aded8c0d7437",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json
index b2fca6b..d79071a 100644
--- a/versions/k-/kf5holidays.json
+++ b/versions/k-/kf5holidays.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d8b6fefbcb219e7f1de19ffc4b30bc8fd199abc0",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b969d43d406c095970b4e98cc3b19c27567b557c",
       "version": "5.84.0",
diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json
index 1337933..637789d 100644
--- a/versions/k-/kf5i18n.json
+++ b/versions/k-/kf5i18n.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c866e11343fd709f33dba23075f00f64b62813b5",
+      "version": "5.84.0",
+      "port-version": 3
+    },
     {
       "git-tree": "3d34c7c3f38d55f93bc26d146fcf656f7eb4be3c",
       "version": "5.84.0",
diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 427e272..6108d3d 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dff2467b2980412adb042e6a9e2474eb5efba9f4",
+      "version": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "969df4c5b4230e480fcffa7d71a312e869a3660d",
       "version": "5.84.0",
diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json
index b498ce4..129da01 100644
--- a/versions/k-/kf5itemmodels.json
+++ b/versions/k-/kf5itemmodels.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ccd18253fc31dab2afa493a6150711036138da63",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b222a404755239053edfac06ee63bf3710719fe9",
       "version": "5.84.0",
diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json
index 3e9fe71..00e2cb2 100644
--- a/versions/k-/kf5itemviews.json
+++ b/versions/k-/kf5itemviews.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a89dde646ac62a41ece78c8757964cdd4ceaed60",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "164cc5f1d9ccfdf89ef60c4b718b8f6777162ea5",
       "version": "5.84.0",
diff --git a/versions/k-/kf5jobwidgets.json b/versions/k-/kf5jobwidgets.json
index 15adaa1..5554497 100644
--- a/versions/k-/kf5jobwidgets.json
+++ b/versions/k-/kf5jobwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6772f49b473e205b1f3dadfe97705b178f8e0ef2",
+      "version-semver": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7405290b40e00636f2db4aa51f0ebfa24bfe0589",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json
index 8f7ea21..5ad9f60 100644
--- a/versions/k-/kf5package.json
+++ b/versions/k-/kf5package.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "41b59faf036cdcc4d430a8bee7b4f87c4fa4e42f",
+      "version": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "aeff67d2d07a017d69a853037a12371683c5aa97",
       "version": "5.84.0",
diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json
index 7a594e4..65073a0 100644
--- a/versions/k-/kf5plotting.json
+++ b/versions/k-/kf5plotting.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "866d1f84848c54a924a542fc101895588ff895b0",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "39f28709c5b4d6e1c706c7e15617b7c052830122",
       "version": "5.84.0",
diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json
index cbc9e49..eed2af7 100644
--- a/versions/k-/kf5service.json
+++ b/versions/k-/kf5service.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8f6fb4f263f0fff296515f569565550c9805e65d",
+      "version": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "13315cd7dbaa61af6c16276f83a15ceaab5a1235",
       "version": "5.84.0",
diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json
index e449cf6..332603a 100644
--- a/versions/k-/kf5solid.json
+++ b/versions/k-/kf5solid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0a82387f00cd2a61e6f1751bb1c94c9d706fddb",
+      "version-semver": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "1f726a86d2961fd90661f27469d1e77b2b75c612",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json
index c5cd6b7..147aa3e 100644
--- a/versions/k-/kf5sonnet.json
+++ b/versions/k-/kf5sonnet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dab7f45858de89e5cb13bd31875d2ba99bf94365",
+      "version-semver": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "de4fdcac67da4df0962414b4b1f71d98753d4c4e",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json
index 706ca85..e72b1b3 100644
--- a/versions/k-/kf5syntaxhighlighting.json
+++ b/versions/k-/kf5syntaxhighlighting.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f86af1e17c47fb99ff1f4a662d2cf5c022408025",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "0bec703b0c5345b456bdbddf6e043d1c31dd2906",
       "version": "5.84.0",
diff --git a/versions/k-/kf5textwidgets.json b/versions/k-/kf5textwidgets.json
index 4bfc99a..d5d356c 100644
--- a/versions/k-/kf5textwidgets.json
+++ b/versions/k-/kf5textwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b6c8dad63ee1e48b572b94623152569b1443c20c",
+      "version": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "bdc98a609f6b939514630fb39de377fdb09560c0",
       "version": "5.84.0",
diff --git a/versions/k-/kf5wallet.json b/versions/k-/kf5wallet.json
index 560cd98..6209cf6 100644
--- a/versions/k-/kf5wallet.json
+++ b/versions/k-/kf5wallet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8e8401b12a23caa46bffec87b7f583771a55170d",
+      "version-semver": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c954ed1f4277c1c7fef03a9736d83d1a2da5ee63",
       "version-semver": "5.84.0",
diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json
index 77880f2..589de92 100644
--- a/versions/k-/kf5widgetsaddons.json
+++ b/versions/k-/kf5widgetsaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8ce78de33b2176f98f97f865494b520cdc37032",
+      "version": "5.84.0",
+      "port-version": 2
+    },
     {
       "git-tree": "de99d19b892fe1551e87c6dd3a1c2d353bfc3f76",
       "version": "5.84.0",
diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json
index df764af..56fe8c3 100644
--- a/versions/k-/kf5windowsystem.json
+++ b/versions/k-/kf5windowsystem.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ce30fb964e57b95c0a6afe4cacff6a28447c7649",
+      "version-semver": "5.84.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e8ec0d393c0ccf286aab3bbe310dd5c09eaecf88",
       "version-semver": "5.84.0",

scripts/cmake/vcpkg_common_definitions.cmake

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/ffnvcodec/portfile.cmake
ports/libproxy/portfile.cmake

scripts/cmake/vcpkg_common_definitions.cmake

JackBoosY · 2021-09-18T06:26:54Z

I need my colleague to review this PR further.

Neumann-A · 2021-09-21T22:03:35Z

closes #15164

JackBoosY · 2021-09-23T02:42:57Z

Please download this, apply it and commit changes.

wrobelda · 2021-09-24T01:22:56Z

Please download this, apply it and commit changes.

Fixed, thanks.

scripts/cmake/vcpkg_copy_tools.cmake

JackBoosY · 2021-09-24T09:40:54Z

cc @strega-nil-ms for review this PR.

strega-nil-ms · 2021-09-27T18:16:38Z

Are there bundles on non-macOS operating systems?

wrobelda · 2021-09-27T18:54:13Z

Are there bundles on non-macOS operating systems?

Not that I am aware of, but also not a specialist on Android nor e.g. iOS.

scripts/cmake/vcpkg_copy_tools.cmake

github-actions bot requested changes Sep 16, 2021

View reviewed changes

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from 0694bcb to fc83686 Compare September 16, 2021 18:02

wrobelda marked this pull request as ready for review September 16, 2021 18:03

github-actions bot approved these changes Sep 16, 2021

View reviewed changes

PhoebeHui assigned JackBoosY Sep 17, 2021

JackBoosY added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Sep 17, 2021

JackBoosY suggested changes Sep 17, 2021

View reviewed changes

scripts/cmake/vcpkg_common_definitions.cmake Show resolved Hide resolved

JackBoosY added the requires:author-response label Sep 17, 2021

[vcpkg_copy_tools] support copying .app bundles

d15587c

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from fc83686 to d15587c Compare September 17, 2021 10:54

github-actions bot approved these changes Sep 17, 2021

View reviewed changes

dg0yt reviewed Sep 18, 2021

View reviewed changes

scripts/cmake/vcpkg_common_definitions.cmake Show resolved Hide resolved

JackBoosY added requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. and removed requires:author-response labels Sep 18, 2021

github-actions bot approved these changes Sep 20, 2021

View reviewed changes

JackBoosY linked an issue Sep 22, 2021 that may be closed by this pull request

[vcpkg] vcpkg_copy_tools does not handle app packages for macos #15164

Closed

github-actions bot approved these changes Sep 22, 2021

View reviewed changes

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from 3056761 to 427c53f Compare September 22, 2021 11:34

github-actions bot approved these changes Sep 22, 2021

View reviewed changes

JackBoosY added the requires:author-response label Sep 23, 2021

github-actions bot approved these changes Sep 23, 2021

View reviewed changes

wrobelda mentioned this pull request Sep 23, 2021

[kf5xmlgui] New port #19756

Merged

3 tasks

JackBoosY reviewed Sep 24, 2021

View reviewed changes

scripts/cmake/vcpkg_copy_tools.cmake Outdated Show resolved Hide resolved

JackBoosY requested a review from strega-nil-ms September 24, 2021 09:41

github-actions bot approved these changes Sep 26, 2021

View reviewed changes

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from 65f1762 to 748dbfb Compare September 27, 2021 14:37

github-actions bot approved these changes Sep 27, 2021

View reviewed changes

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from 748dbfb to 09597fb Compare September 27, 2021 14:46

BillyONeal and others added 3 commits September 27, 2021 17:46

Merge remote-tracking branch 'origin/master' into HEAD

5c6fbfe

check for VCPKG_TARGET_IS_OSX

310f8dd

Fix formatting

4641251

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from 09597fb to f83571d Compare September 27, 2021 14:46

github-actions bot approved these changes Sep 27, 2021

View reviewed changes

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from f83571d to 26998bc Compare September 27, 2021 14:53

github-actions bot approved these changes Sep 27, 2021

View reviewed changes

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from 26998bc to aeb6f96 Compare September 27, 2021 14:56

github-actions bot approved these changes Sep 27, 2021

View reviewed changes

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from aeb6f96 to fade214 Compare September 27, 2021 14:57

github-actions bot approved these changes Sep 27, 2021

View reviewed changes

[vcpkg_copy_tools] copy bundle and plain bin if both present

d278d56

wrobelda force-pushed the vcpkg_copy_bundle_tools branch from fade214 to d278d56 Compare September 27, 2021 15:03

github-actions bot approved these changes Sep 27, 2021

View reviewed changes

JackBoosY removed the requires:author-response label Sep 28, 2021

JackBoosY approved these changes Sep 28, 2021

View reviewed changes

wrobelda mentioned this pull request Sep 29, 2021

[libalkimia] new port #20207

Merged

4 tasks

JackBoosY removed the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Sep 30, 2021

strega-nil-ms reviewed Oct 1, 2021

View reviewed changes

scripts/cmake/vcpkg_copy_tools.cmake Outdated Show resolved Hide resolved

Update scripts/cmake/vcpkg_copy_tools.cmake

71bfc7b

strega-nil-ms approved these changes Oct 1, 2021

View reviewed changes

strega-nil-ms added the info:reviewed Pull Request changes follow basic guidelines label Oct 1, 2021

github-actions bot approved these changes Oct 1, 2021

View reviewed changes

strega-nil-ms merged commit 7aa1a14 into microsoft:master Oct 4, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[vcpkg_copy_tools] support copying .app bundles #20210

[vcpkg_copy_tools] support copying .app bundles #20210

wrobelda commented Sep 16, 2021 •

edited

Loading

github-actions bot left a comment

github-actions bot left a comment

JackBoosY commented Sep 18, 2021

Neumann-A commented Sep 21, 2021

JackBoosY commented Sep 23, 2021

wrobelda commented Sep 24, 2021

JackBoosY commented Sep 24, 2021

strega-nil-ms commented Sep 27, 2021

wrobelda commented Sep 27, 2021 •

edited

Loading

[vcpkg_copy_tools] support copying .app bundles #20210

[vcpkg_copy_tools] support copying .app bundles #20210

Conversation

wrobelda commented Sep 16, 2021 • edited Loading

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

JackBoosY commented Sep 18, 2021

Neumann-A commented Sep 21, 2021

JackBoosY commented Sep 23, 2021

wrobelda commented Sep 24, 2021

JackBoosY commented Sep 24, 2021

strega-nil-ms commented Sep 27, 2021

wrobelda commented Sep 27, 2021 • edited Loading

wrobelda commented Sep 16, 2021 •

edited

Loading

If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?

wrobelda commented Sep 27, 2021 •

edited

Loading