From aa60b7efa56a83ead743718941d8b320ef4a05af Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 4 Feb 2021 10:15:44 -0800 Subject: [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (#15474) This reduces bootstrap cost for Windows customers, resolving the issue initially submitted as #12502 . The `toolsrc` tree was extracted to https://github.com/microsoft/vcpkg-tool. `bootstrap.sh` was changed to download the right source tarball, extract, and build it. This was chosen over the previous attempt, a submodule, over concerns of accidentally destroying people's local modifications. --- .../e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake | 2 -- scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json | 6 ------ .../e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake | 2 -- scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json | 6 ------ scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake | 2 -- scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json | 6 ------ scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake | 3 --- scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json | 6 ------ .../overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake | 3 --- .../overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json | 6 ------ scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake | 1 - scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json | 4 ---- scripts/e2e_ports/versions/baseline.json | 5 ----- scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json | 8 -------- 14 files changed, 60 deletions(-) delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake delete mode 100644 scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json delete mode 100644 scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake delete mode 100644 scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json delete mode 100644 scripts/e2e_ports/versions/baseline.json delete mode 100644 scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json (limited to 'scripts/e2e_ports') diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake deleted file mode 100644 index 68dc779a8..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake +++ /dev/null @@ -1,2 +0,0 @@ -vcpkg_minimum_required(VERSION ${VCPKG_BASE_VERSION}) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json deleted file mode 100644 index 48debf1e7..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-requires-current-date", - "version-string": "1.0.0", - "description": "A test port that verifies that vcpkg_minimum_required is inclusive by using the current base version value.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake deleted file mode 100644 index b68e53e95..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake +++ /dev/null @@ -1,2 +0,0 @@ -vcpkg_minimum_required(VERSION 2999-12-31) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json deleted file mode 100644 index f60901998..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-requires-future-date", - "version-string": "1.0.0", - "description": "A test port that requires a vcpkg version from an impossibly far future.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake deleted file mode 100644 index 5a4fbf421..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake +++ /dev/null @@ -1,2 +0,0 @@ -vcpkg_minimum_required(VERSION 2020-01-12) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json deleted file mode 100644 index 31e6fb62f..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-requires-old-date", - "version-string": "1.0.0", - "description": "A test port that requires a vcpkg version from before vcpkg_minimum_required's introduction.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake deleted file mode 100644 index 571ae3b7a..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -vcpkg_test_cmake(args args args) diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json deleted file mode 100644 index 9f34e058d..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-uses-test-cmake", - "version-string": "1.0.0", - "description": "A test port that uses the deprecated function vcpkg_test_cmake.", - "homepage": "" -} diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake deleted file mode 100644 index 9207d30b1..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -include(vcpkg_common_functions) diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json deleted file mode 100644 index 7c16ffe82..000000000 --- a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "vcpkg-uses-vcpkg-common-functions", - "version-string": "1.0.0", - "description": "A test port that uses the deprecated file vcpkg_common_functions.", - "homepage": "" -} diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake deleted file mode 100644 index 065116c27..000000000 --- a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json deleted file mode 100644 index a25da6d23..000000000 --- a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "vcpkg-internal-e2e-test-port", - "version-string": "1.0.0" -} diff --git a/scripts/e2e_ports/versions/baseline.json b/scripts/e2e_ports/versions/baseline.json deleted file mode 100644 index 2413f8afc..000000000 --- a/scripts/e2e_ports/versions/baseline.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "vcpkg-internal-e2e-test-port": { "baseline": "1.0.0" } - } -} diff --git a/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json b/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json deleted file mode 100644 index ce7698ebb..000000000 --- a/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "versions": [ - { - "version-string": "1.0.0", - "git-tree": "1dc3e42a3c0cafe2884d379af4399273238b986e" - } - ] -} -- cgit v1.2.3