add port vcpkg-tool-python2 by Neumann-A · Pull Request #23431 · microsoft/vcpkg

Neumann-A · 2022-03-08T09:48:34Z

adds two ports

vcpkg-tool-lessmsi to not use msiexec to extract msi files
vcpkg-tool-python2 to extract python2 with lessmsi.

Other stuff:

make qt5-base switch to python3 (needs ci testing)
make qt5-webengine use python2 explicitly (similar to qtbase/qtwebengine)
added the vcpkg-tool-python2 to some ports using python2 (but not all)

github-actions

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

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

git add -u && git commit
git checkout 5962cf5a3bfc2124e8de991a4e45a8edcb3b4c69 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 86debae..e827c0e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5614,7 +5614,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-canvas3d": {
       "baseline": "0",
@@ -5742,7 +5742,7 @@
     },
     "qt5-webengine": {
       "baseline": "5.15.3",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-webglplugin": {
       "baseline": "5.15.3",
@@ -7244,6 +7244,10 @@
       "baseline": "2021-10-23",
       "port-version": 0
     },
+    "vcpkg-tool-lessmsi": {
+      "baseline": "1.10.0",
+      "port-version": 0
+    },
     "vcpkg-tool-meson": {
       "baseline": "0.60.2",
       "port-version": 2
@@ -7252,6 +7256,10 @@
       "baseline": "14.17.4",
       "port-version": 0
     },
+    "vcpkg-tool-python2": {
+      "baseline": "2.7.18",
+      "port-version": 0
+    },
     "vectorclass": {
       "baseline": "2.00.01",
       "port-version": 2
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index fc639f1..3cfd72e 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3f2a311bffa94b9a66d5d0e4f04b1d235813227",
+      "version": "5.15.3",
+      "port-version": 1
+    },
     {
       "git-tree": "8c2fa92b6281b496e3aead1b02238ab7668c204a",
       "version": "5.15.3",
diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json
index b7b79a2..eb34c4d 100644
--- a/versions/q-/qt5-webengine.json
+++ b/versions/q-/qt5-webengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "66ae5d14ade46af7612f7b3ee4657e787ff05889",
+      "version": "5.15.3",
+      "port-version": 1
+    },
     {
       "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad",
       "version": "5.15.3",

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

ports/vcpkg-tool-lessmsi/vcpkg.json
ports/vcpkg-tool-python2/vcpkg.json

Valid values for the license field can be found in the documentation

ports/qt5-webengine/portfile.cmake

ports/vcpkg-tool-lessmsi/portfile.cmake

strega-nil-ms · 2022-03-08T19:33:09Z

ports/vcpkg-tool-lessmsi/portfile.cmake

@@ -0,0 +1,17 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)


I'd like a script to go along with this eventually, but I'm not going to block on that.

ports/vcpkg-tool-python2/portfile.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

…thon2

adjust search path generate a details.cmake for vcpkg_find_acquire_program

JackBoosY · 2022-03-11T07:39:18Z

Since my PR #23478 and this PR requires each other, can you please merge my changes into this?

JackBoosY · 2022-03-11T07:41:14Z

And what about the python3:x64-linux regression?

Neumann-A · 2022-03-11T07:42:54Z

And what about the python3:x64-linux regression?

that is a vcpkg-tool update regression. Previously stuff like that was not checked on other platforms then windows.
Maybe @Hoikas can help here?

JackBoosY · 2022-03-11T07:45:06Z

And what about the python3:x64-linux regression?

that is a vcpkg-tool update regression. Previously stuff like that was not checked on other platforms then windows. Maybe @Hoikas can help here?

Ah I remember that just now, that's because the dependency libraries are mismatched.

JackBoosY · 2022-03-11T07:46:13Z

CMake Error at scripts/cmake/vcpkg_find_acquire_program.cmake:696 (message):
Unable to find PYTHON2

Neumann-A · 2022-03-11T08:16:05Z

can you please merge my changes into this?

@JackBoosY : please do that yourself. I want have time until very much later today.

CMake Error at scripts/cmake/vcpkg_find_acquire_program.cmake:696 (message):
Unable to find PYTHON2

Where did you see that?

JackBoosY · 2022-03-11T08:24:41Z

Where did you see that?

When building vcpkg-find-acquire-program:x64-windows:

Starting package 7/7: vcpkg-find-acquire-program:x64-windows
Building package vcpkg-find-acquire-program[core]:x64-windows...
-- Installing port from location: C:\a\1\s\scripts/test_ports\vcpkg-find-acquire-program
-- Downloading https://dl.google.com/go/go1.16.6.windows-386.zip -> go1.16.6.windows-386.zip...
-- Downloading https://download.qt.io/official_releases/jom/jom_1_1_3.zip;https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip -> jom_1_1_3.zip...
-- Downloading https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win32/nasm-2.15.05-win32.zip;https://fossies.org/windows/misc/nasm-2.15.05-win32.zip -> nasm-2.15.05-win32.zip...
-- Downloading https://strawberryperl.com/download/5.32.1.1/strawberry-perl-5.32.1.1-32bit.zip -> strawberry-perl-5.32.1.1-32bit.zip...
-- Downloading https://www.tortall.net/projects/yasm/snapshots/v1.3.0.6.g1962/yasm-1.3.0.6.g1962.exe -> yasm-1.3.0.6.g1962.exe...
-- Installing: D:/downloads/tools/yasm/1.3.0.6/yasm.exe
-- Downloading https://www.python.org/ftp/python/2.7.18/python-2.7.18.amd64.msi -> python-2.7.18.amd64.msi...
The Windows Installer Service could not be accessed. This can occur if the Windows Installer is not correctly installed. Contact your support personnel for assistance.

CMake Error at scripts/cmake/vcpkg_find_acquire_program.cmake:696 (message):
  Unable to find PYTHON2
Call Stack (most recent call first):
  scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake:5 (vcpkg_find_acquire_program)
  scripts/ports.cmake:145 (include)


Error: Building package vcpkg-find-acquire-program:x64-windows failed with: BUILD_FAILED
Elapsed time for package vcpkg-find-acquire-program:x64-windows: 11.77 s

Neumann-A · 2022-03-11T08:32:49Z

@JackBoosY: Yeah that is because I didn't adjust all usages of vcpkg_find_acquire_program(PYTHON2) to depend on vcpkg-tool-python2. Basically just the manifest needs to include it to make it work.

JackBoosY · 2022-03-11T08:36:57Z

@Neumann-A Does that mean we can't use this changes to fix the python2 regression completely?

Neumann-A · 2022-03-11T08:45:11Z

Does that mean we can't use this changes to fix the python2 regression completely?

It is only fixed if the ports using python2 are depending on vcpkg-tool-python2 or if vcpkg-tool-python2 gets installed before the port using python2. I didn't fix all ports in this PR which are using python2. The python2 issues is mainly a CI issue not a user issue. So failures in CI should be fixed if they are observed

…ol_python2

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

ports/blitz/vcpkg.json
ports/shiva/vcpkg.json
ports/v8/vcpkg.json
ports/vcpkg-gn/vcpkg.json

Valid values for the license field can be found in the documentation

ports/qt5-webengine/vcpkg.json

…ol_python2

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

ports/blitz/vcpkg.json
ports/shiva/vcpkg.json
ports/v8/vcpkg.json
ports/vcpkg-gn/vcpkg.json

Valid values for the license field can be found in the documentation

changes made

…thon2

github-actions

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

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

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

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 19a1479..6542309 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5838,7 +5838,7 @@
     },
     "qtinterfaceframework": {
       "baseline": "6.2.3",
-      "port-version": 1
+      "port-version": 2
     },
     "qtkeychain": {
       "baseline": "0.13.2",
diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json
index f1d4811..3dc3a83 100644
--- a/versions/q-/qtinterfaceframework.json
+++ b/versions/q-/qtinterfaceframework.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "42968cd54d91bbbf94a3c5aaaf6f1de876b0efac",
+      "version": "6.2.3",
+      "port-version": 2
+    },
     {
       "git-tree": "26fa7610125a5a6b54ced0cda87ab6621a42a1d9",
       "version": "6.2.3",

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

ports/blitz/vcpkg.json
ports/shiva/vcpkg.json
ports/v8/vcpkg.json
ports/vcpkg-gn/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

ports/blitz/vcpkg.json
ports/shiva/vcpkg.json
ports/v8/vcpkg.json
ports/vcpkg-gn/vcpkg.json

Valid values for the license field can be found in the documentation

Neumann-A · 2022-03-14T07:25:20Z

depends #23525 to be green in CI

…thon2

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

ports/blitz/vcpkg.json
ports/shiva/vcpkg.json
ports/v8/vcpkg.json
ports/vcpkg-gn/vcpkg.json

Valid values for the license field can be found in the documentation

Alexander Neumann added 8 commits March 8, 2022 10:35

add vcpkg-tool-lessmsi

8d4b8c7

add vcpkg-tool-python2

96033d1

adjust vcpkg_find_acquire_program

3dd148b

use python2 dependency in qt5-base

fbcf2b5

remove python2 from qt5-base

3a4868c

add python2 to qt5-webengine

dfffbf8

use python3 instead of python2

77d263f

add some deps on the new vcpkg-tool-python2

56b2f32

github-actions bot requested changes Mar 8, 2022

View reviewed changes

Osyotr reviewed Mar 8, 2022

View reviewed changes

ports/qt5-webengine/portfile.cmake Outdated Show resolved Hide resolved

strega-nil-ms reviewed Mar 8, 2022

View reviewed changes

ports/vcpkg-tool-lessmsi/portfile.cmake Outdated Show resolved Hide resolved

strega-nil-ms reviewed Mar 8, 2022

View reviewed changes

Neumann-A commented Mar 8, 2022

View reviewed changes

ports/vcpkg-tool-python2/portfile.cmake Outdated Show resolved Hide resolved

Neumann-A and others added 7 commits March 8, 2022 21:16

Apply suggestions from code review

c6ae452

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

add license field

23e9ddf

fix test detection

aaa4d0d

error on failure to find python2

efc27a9

move logs to correct position.

f22f03f

add dep to qtwebengine

af07821

Merge remote-tracking branch 'upstream/master' into add_vcpkg_tool_py…

5e728fa

…thon2

Adela0814 assigned JackBoosY Mar 9, 2022

JackBoosY added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Mar 9, 2022

Alexander Neumann added 8 commits March 9, 2022 10:27

adjust pybind cmake config.

090a524

fix shiva

3ecdab2

move python2 to manual-tools

b32919d

adjust search path generate a details.cmake for vcpkg_find_acquire_program

format manifest

1749587

use version-date

e72457c

version stuff

4e89c52

replace version-string

6e2b0bc

more version stuff

709fda6

PhoebeHui mentioned this pull request Mar 11, 2022

[boost-modular-build-helper] Attempt to pass flags more correctly into b2 #23001

Merged

JackBoosY changed the title ~~[vcpkg baseline] add port vcpkg-tool-python2~~ add port vcpkg-tool-python2 Mar 11, 2022

Merge branch 'master' of github.com:Microsoft/vcpkg into add_vcpkg_to…

58c75b5

…ol_python2

github-actions bot approved these changes Mar 11, 2022

View reviewed changes

vicroms previously requested changes Mar 11, 2022

View reviewed changes

ports/qt5-webengine/vcpkg.json Show resolved Hide resolved

Merge branch 'master' of github.com:microsoft/vcpkg into add_vcpkg_to…

ef87fce

…ol_python2

github-actions bot approved these changes Mar 11, 2022

View reviewed changes

Neumann-A added 2 commits March 12, 2022 21:32

Merge remote-tracking branch 'upstream/master' into add_vcpkg_tool_py…

b0e1344

…thon2

try fixing qtinterfaceframework

a3c76a8

github-actions bot requested changes Mar 12, 2022

View reviewed changes

version stuff

867a22a

github-actions bot approved these changes Mar 14, 2022

View reviewed changes

JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Mar 14, 2022

Merge remote-tracking branch 'upstream/master' into add_vcpkg_tool_py…

d40242b

…thon2

github-actions bot approved these changes Mar 14, 2022

View reviewed changes

JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Mar 14, 2022

vicroms merged commit fad0644 into microsoft:master Mar 14, 2022

Neumann-A deleted the add_vcpkg_tool_python2 branch March 14, 2022 17:28

Conversation

Neumann-A commented Mar 8, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

strega-nil-ms Mar 8, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JackBoosY commented Mar 11, 2022

Uh oh!

JackBoosY commented Mar 11, 2022

Uh oh!

Neumann-A commented Mar 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JackBoosY commented Mar 11, 2022

Uh oh!

JackBoosY commented Mar 11, 2022

Uh oh!

Neumann-A commented Mar 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JackBoosY commented Mar 11, 2022

Uh oh!

Neumann-A commented Mar 11, 2022

Uh oh!

JackBoosY commented Mar 11, 2022

Uh oh!

Neumann-A commented Mar 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Neumann-A commented Mar 14, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Neumann-A commented Mar 11, 2022 •

edited

Loading

Neumann-A commented Mar 11, 2022 •

edited

Loading

Neumann-A commented Mar 11, 2022 •

edited

Loading