Skip to content

gyp: cherrypick more Python3 changes from node-gyp

Rodrigo Muino Tomonari requested to merge github/fork/cclauss/Update-gyp-to-49c7f99-v5.0.2 into master

EDIT: Title and commit message changed to reflect that this PR is now only about Python 3 compatibility and is no longer a complete upgrade to gyp v5.0.2.

As discussed in #28555 (closed) there are a lot of Python 3 compatibility changes in node/node-gyp that we should re-vendor into Node.js. Below are the commands that were used to create this pull request.

Many files are contain normal Python 3 compatibility modification but there changes for changes for Visual Studio 2017 and Visual Studio 2019 in tools/gyp/pylib/gyp/MSVSVersion.py that will require careful review. See: https://github.com/nodejs/node/commit/317b712a52e0bb855bd18670ea8efa6c32bae032

@nodejs/python @nodejs/gyp

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines 
cd node-gyp
git checkout master
git pull --rebase upstream master
git push origin master

cd ../node
git checkout master
git pull --rebase upstream master
git push origin master

git checkout -b Update-gyp-to-49c7f99-v5.0.2
cd ..
SRC_DIR="node-gyp/gyp/"
DST_DIR="node/tools/gyp/"
ls ${SRC_DIR}
ls ${DST_DIR}

# cp -r ${SRC_DIR}AUTHORS ${DST_DIR}
cp -r ${SRC_DIR}PRESUBMIT.py ${DST_DIR}
# cp -r ${SRC_DIR}gyp.bat ${DST_DIR}
cp -r ${SRC_DIR}pylib ${DST_DIR}
cp -r ${SRC_DIR}tools ${DST_DIR}

cd node
git commit -am"git: update to gyp v5.0.2 49c7f99"
git push
git push --set-upstream origin Update-gyp-to-49c7f99-v5.0.2

Merge request reports