gyp: update gyp to 0.6.1#2238

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.

Sign up for GitHub

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

Closed
rvagg wants to merge 1 commit into from
Closed

gyp: update gyp to 0.6.1 #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions gyp/.flake8
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101

@cclausscclaussOct 14, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!

@rvaggrvaggOct 15, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in

max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black
2 changes: 1 addition & 1 deletion gyp/.github/workflows/Python_tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
max-parallel: 15
matrix:
os: [macos-latest, ubuntu-latest] # , windows-latest]
python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
40 changes: 40 additions & 0 deletions gyp/.github/workflows/node-gyp.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
test:
strategy:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Clone gyp-next
uses: actions/checkout@v2
with:
path: gyp-next
- name: Clone nodejs/node-gyp
uses: actions/checkout@v2
with:
repository: nodejs/node-gyp
path: node-gyp
- uses: actions/setup-node@v1
with:
node-version: 14.x
- uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install dependencies
run: |
cd node-gyp
npm install --no-progress
- name: Replace gyp in node-gyp
shell: bash
run: |
rm -rf node-gyp/gyp
cp -r gyp-next node-gyp/gyp
- name: Run tests
run: |
cd node-gyp
npm test
2 changes: 1 addition & 1 deletion gyp/.github/workflows/nodejs-windows.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
build-windows:
runs-on: windows-latest
steps:
- name: Clone node-gyp
- name: Clone gyp-next
uses: actions/checkout@v2
with:
path: gyp-next
Expand Down
28 changes: 27 additions & 1 deletion gyp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down
3 changes: 3 additions & 0 deletions gyp/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`
9 changes: 6 additions & 3 deletions gyp/pylib/gyp/MSVSSettings_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
"MSBuild, index value (21) not in expected range [0, 3)",
"Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
"MSBuild, index value (13) not in expected range [0, 3)",
"Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
"Warning: while converting "
"VCCLCompilerTool/GeneratePreprocessedFile to "
"MSBuild, value must be one of [0, 1, 2]; got 14",
"Warning: while converting VCLinkerTool/Driver to "
"MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
"EmbedManifest": "false",
"GenerateCatalogFiles": "true",
"InputResourceManifests": "asfsfdafs",
"ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
"ManifestResourceFile":
"$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
"OutputManifestFile": "$(TargetPath).manifestdfs",
"RegistrarScriptFile": "sdfsfd",
"ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
"LinkIncremental": "",
},
"ManifestResourceCompile": {
"ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
"ResourceOutputFileName":
"$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
},
}
self.maxDiff = 9999 # on failure display a long diff
Expand Down
17 changes: 0 additions & 17 deletions gyp/pylib/gyp/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
params=None,
check=False,
circular_check=True,
duplicate_basename_check=True,
):
"""
Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
generator_input_info,
check,
circular_check,
duplicate_basename_check,
params["parallel"],
params["root_targets"],
)
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
regenerate=False,
help="don't check for circular relationships between files",
)
# --no-duplicate-basename-check disables the check for duplicate basenames
# in a static_library/shared_library project. Visual C++ 2008 generator
# doesn't support this configuration. Libtool on Mac also generates warnings
# when duplicate basenames are passed into Make generator on Mac.
# TODO(yukawa): Remove this option when these legacy generators are
# deprecated.
parser.add_argument(
"--no-duplicate-basename-check",
dest="duplicate_basename_check",
action="store_false",
default=True,
regenerate=False,
help="don't check for duplicate basenames",
)
parser.add_argument(
"--no-parallel",
action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
params,
options.check,
options.circular_check,
options.duplicate_basename_check,
)

# TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down
24 changes: 15 additions & 9 deletions gyp/pylib/gyp/common.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
"""Wrapper around file which only covers the target if it differs."""

def __init__(self):
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
# On Cygwin remove the "dir" argument
# `C:` prefixed paths are treated as relative,
# consequently ending up with current dir "/cygdrive/c/..."
# being prefixed to those, which was
# obviously a non-existent path,
# for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
# For more details see:
# https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
# Pick temporary file.
tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
# one.
os.unlink(self.tmp_path)
else:
# The new file is different from the old one, or there is no old one.
# The new file is different from the old one,
# or there is no old one.
# Rename the new file to the permanent name.
#
# tempfile.mkstemp uses an overly restrictive mode, resulting in a
# file that can only be read by the owner, regardless of the umask.
# There's no reason to not respect the umask here, which means that
# an extra hoop is required to fetch it and reset the new file's mode.
# There's no reason to not respect the umask here,
# which means that an extra hoop is required
# to fetch it and reset the new file's mode.
#
# No way to get the umask without setting a new one? Set a safe one
# and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
os.chmod(self.tmp_path, 0o666 & ~umask)
if sys.platform == "win32" and os.path.exists(filename):
# NOTE: on windows (but not cygwin) rename will not replace an
# existing file, so it must be preceded with a remove. Sadly there
# is no way to make the switch atomic.
# existing file, so it must be preceded with a remove.
# Sadly there is no way to make the switch atomic.
os.remove(filename)
os.rename(self.tmp_path, filename)
except Exception:
Expand Down
2 changes: 1 addition & 1 deletion gyp/pylib/gyp/generator/android.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
These are source files necessary to build the current target.
We need to handle shared_intermediate directory source files as
a special case by copying them to the intermediate directory and
treating them as a genereated sources. Otherwise the Android build
treating them as a generated sources. Otherwise the Android build
rules won't pick them up.

Args:
Expand Down
4 changes: 2 additions & 2 deletions gyp/pylib/gyp/generator/compile_commands_json.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
defines = ["-D" + s for s in defines]

# TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

def resolve(filename):
return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
gyp: update gyp to 0.6.1#2238

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.

 Sign up for GitHub

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

 Closed

rvagg
wants to merge
1
commit into

from

 Closed


gyp: update gyp to 0.6.1
#2238
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 2 additions & 2 deletions
gyp/.flake8

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101
@cclausscclaussOct 14, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!
@rvaggrvaggOct 15, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in
max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/Python_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
 max-parallel: 15
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
 python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
 python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 steps:
 - uses: actions/checkout@v2
 - name: Set up Python ${{ matrix.python-version }}
Expand Down

40 changes: 40 additions & 0 deletions
gyp/.github/workflows/node-gyp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
 test:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest, ubuntu-latest, windows-latest]
 runs-on: ${{ matrix.os }}
 steps:
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
 - name: Clone nodejs/node-gyp
 uses: actions/checkout@v2
 with:
 repository: nodejs/node-gyp
 path: node-gyp
 - uses: actions/setup-node@v1
 with:
 node-version: 14.x
 - uses: actions/setup-python@v2
 with:
 python-version: 3.9
 - name: Install dependencies
 run: |
 cd node-gyp
 npm install --no-progress
 - name: Replace gyp in node-gyp
 shell: bash
 run: |
 rm -rf node-gyp/gyp
 cp -r gyp-next node-gyp/gyp
 - name: Run tests
 run: |
 cd node-gyp
 npm test

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/nodejs-windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
 build-windows:
 runs-on: windows-latest
 steps:
 - name: Clone node-gyp
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
Expand Down

28 changes: 27 additions & 1 deletion
gyp/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
 directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
 just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
 auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down

3 changes: 3 additions & 0 deletions
gyp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`

9 changes: 6 additions & 3 deletions
gyp/pylib/gyp/MSVSSettings_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
 "MSBuild, index value (21) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
 "MSBuild, index value (13) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
 "Warning: while converting "
 "VCCLCompilerTool/GeneratePreprocessedFile to "
 "MSBuild, value must be one of [0, 1, 2]; got 14",
 "Warning: while converting VCLinkerTool/Driver to "
 "MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
 "EmbedManifest": "false",
 "GenerateCatalogFiles": "true",
 "InputResourceManifests": "asfsfdafs",
 "ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "ManifestResourceFile":
 "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "OutputManifestFile": "$(TargetPath).manifestdfs",
 "RegistrarScriptFile": "sdfsfd",
 "ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
 "LinkIncremental": "",
 },
 "ManifestResourceCompile": {
 "ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 "ResourceOutputFileName":
 "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 },
 }
 self.maxDiff = 9999 # on failure display a long diff
Expand Down

17 changes: 0 additions & 17 deletions
gyp/pylib/gyp/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
 params=None,
 check=False,
 circular_check=True,
 duplicate_basename_check=True,
):
 """
 Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
 generator_input_info,
 check,
 circular_check,
 duplicate_basename_check,
 params["parallel"],
 params["root_targets"],
 )
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
 regenerate=False,
 help="don't check for circular relationships between files",
 )
 # --no-duplicate-basename-check disables the check for duplicate basenames
 # in a static_library/shared_library project. Visual C++ 2008 generator
 # doesn't support this configuration. Libtool on Mac also generates warnings
 # when duplicate basenames are passed into Make generator on Mac.
 # TODO(yukawa): Remove this option when these legacy generators are
 # deprecated.
 parser.add_argument(
 "--no-duplicate-basename-check",
 dest="duplicate_basename_check",
 action="store_false",
 default=True,
 regenerate=False,
 help="don't check for duplicate basenames",
 )
 parser.add_argument(
 "--no-parallel",
 action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
 params,
 options.check,
 options.circular_check,
 options.duplicate_basename_check,
 )

 # TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down

24 changes: 15 additions & 9 deletions
gyp/pylib/gyp/common.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
 """Wrapper around file which only covers the target if it differs."""

 def __init__(self):
 # On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
 # obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
 # On Cygwin remove the "dir" argument
 # `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..."
 # being prefixed to those, which was
 # obviously a non-existent path,
 # for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # For more details see:
 # https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
 base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
 # Pick temporary file.
 tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
 # one.
 os.unlink(self.tmp_path)
 else:
 # The new file is different from the old one, or there is no old one.
 # The new file is different from the old one,
 # or there is no old one.
 # Rename the new file to the permanent name.
 #
 # tempfile.mkstemp uses an overly restrictive mode, resulting in a
 # file that can only be read by the owner, regardless of the umask.
 # There's no reason to not respect the umask here, which means that
 # an extra hoop is required to fetch it and reset the new file's mode.
 # There's no reason to not respect the umask here,
 # which means that an extra hoop is required
 # to fetch it and reset the new file's mode.
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
 os.chmod(self.tmp_path, 0o666 & ~umask)
 if sys.platform == "win32" and os.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
 # is no way to make the switch atomic.
 # existing file, so it must be preceded with a remove.
 # Sadly there is no way to make the switch atomic.
 os.remove(filename)
 os.rename(self.tmp_path, filename)
 except Exception:
Expand Down

2 changes: 1 addition & 1 deletion
gyp/pylib/gyp/generator/android.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
 These are source files necessary to build the current target.
 We need to handle shared_intermediate directory source files as
 a special case by copying them to the intermediate directory and
 treating them as a genereated sources. Otherwise the Android build
 treating them as a generated sources. Otherwise the Android build
 rules won't pick them up.

 Args:
Expand Down

4 changes: 2 additions & 2 deletions
gyp/pylib/gyp/generator/compile_commands_json.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
 defines = ["-D" + s for s in defines]

 # TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
 sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
 sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

 def resolve(filename):
 return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: update gyp to 0.6.1#2238

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.

 Sign up for GitHub

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

 Closed

rvagg
wants to merge
1
commit into

from

 Closed


gyp: update gyp to 0.6.1
#2238
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 2 additions & 2 deletions
gyp/.flake8

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101
@cclausscclaussOct 14, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!
@rvaggrvaggOct 15, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in
max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/Python_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
 max-parallel: 15
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
 python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
 python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 steps:
 - uses: actions/checkout@v2
 - name: Set up Python ${{ matrix.python-version }}
Expand Down

40 changes: 40 additions & 0 deletions
gyp/.github/workflows/node-gyp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
 test:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest, ubuntu-latest, windows-latest]
 runs-on: ${{ matrix.os }}
 steps:
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
 - name: Clone nodejs/node-gyp
 uses: actions/checkout@v2
 with:
 repository: nodejs/node-gyp
 path: node-gyp
 - uses: actions/setup-node@v1
 with:
 node-version: 14.x
 - uses: actions/setup-python@v2
 with:
 python-version: 3.9
 - name: Install dependencies
 run: |
 cd node-gyp
 npm install --no-progress
 - name: Replace gyp in node-gyp
 shell: bash
 run: |
 rm -rf node-gyp/gyp
 cp -r gyp-next node-gyp/gyp
 - name: Run tests
 run: |
 cd node-gyp
 npm test

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/nodejs-windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
 build-windows:
 runs-on: windows-latest
 steps:
 - name: Clone node-gyp
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
Expand Down

28 changes: 27 additions & 1 deletion
gyp/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
 directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
 just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
 auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down

3 changes: 3 additions & 0 deletions
gyp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`

9 changes: 6 additions & 3 deletions
gyp/pylib/gyp/MSVSSettings_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
 "MSBuild, index value (21) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
 "MSBuild, index value (13) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
 "Warning: while converting "
 "VCCLCompilerTool/GeneratePreprocessedFile to "
 "MSBuild, value must be one of [0, 1, 2]; got 14",
 "Warning: while converting VCLinkerTool/Driver to "
 "MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
 "EmbedManifest": "false",
 "GenerateCatalogFiles": "true",
 "InputResourceManifests": "asfsfdafs",
 "ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "ManifestResourceFile":
 "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "OutputManifestFile": "$(TargetPath).manifestdfs",
 "RegistrarScriptFile": "sdfsfd",
 "ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
 "LinkIncremental": "",
 },
 "ManifestResourceCompile": {
 "ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 "ResourceOutputFileName":
 "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 },
 }
 self.maxDiff = 9999 # on failure display a long diff
Expand Down

17 changes: 0 additions & 17 deletions
gyp/pylib/gyp/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
 params=None,
 check=False,
 circular_check=True,
 duplicate_basename_check=True,
):
 """
 Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
 generator_input_info,
 check,
 circular_check,
 duplicate_basename_check,
 params["parallel"],
 params["root_targets"],
 )
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
 regenerate=False,
 help="don't check for circular relationships between files",
 )
 # --no-duplicate-basename-check disables the check for duplicate basenames
 # in a static_library/shared_library project. Visual C++ 2008 generator
 # doesn't support this configuration. Libtool on Mac also generates warnings
 # when duplicate basenames are passed into Make generator on Mac.
 # TODO(yukawa): Remove this option when these legacy generators are
 # deprecated.
 parser.add_argument(
 "--no-duplicate-basename-check",
 dest="duplicate_basename_check",
 action="store_false",
 default=True,
 regenerate=False,
 help="don't check for duplicate basenames",
 )
 parser.add_argument(
 "--no-parallel",
 action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
 params,
 options.check,
 options.circular_check,
 options.duplicate_basename_check,
 )

 # TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down

24 changes: 15 additions & 9 deletions
gyp/pylib/gyp/common.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
 """Wrapper around file which only covers the target if it differs."""

 def __init__(self):
 # On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
 # obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
 # On Cygwin remove the "dir" argument
 # `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..."
 # being prefixed to those, which was
 # obviously a non-existent path,
 # for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # For more details see:
 # https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
 base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
 # Pick temporary file.
 tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
 # one.
 os.unlink(self.tmp_path)
 else:
 # The new file is different from the old one, or there is no old one.
 # The new file is different from the old one,
 # or there is no old one.
 # Rename the new file to the permanent name.
 #
 # tempfile.mkstemp uses an overly restrictive mode, resulting in a
 # file that can only be read by the owner, regardless of the umask.
 # There's no reason to not respect the umask here, which means that
 # an extra hoop is required to fetch it and reset the new file's mode.
 # There's no reason to not respect the umask here,
 # which means that an extra hoop is required
 # to fetch it and reset the new file's mode.
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
 os.chmod(self.tmp_path, 0o666 & ~umask)
 if sys.platform == "win32" and os.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
 # is no way to make the switch atomic.
 # existing file, so it must be preceded with a remove.
 # Sadly there is no way to make the switch atomic.
 os.remove(filename)
 os.rename(self.tmp_path, filename)
 except Exception:
Expand Down

2 changes: 1 addition & 1 deletion
gyp/pylib/gyp/generator/android.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
 These are source files necessary to build the current target.
 We need to handle shared_intermediate directory source files as
 a special case by copying them to the intermediate directory and
 treating them as a genereated sources. Otherwise the Android build
 treating them as a generated sources. Otherwise the Android build
 rules won't pick them up.

 Args:
Expand Down

4 changes: 2 additions & 2 deletions
gyp/pylib/gyp/generator/compile_commands_json.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
 defines = ["-D" + s for s in defines]

 # TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
 sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
 sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

 def resolve(filename):
 return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: update gyp to 0.6.1#2238

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.

 Sign up for GitHub

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

 Closed

rvagg
wants to merge
1
commit into

from

 Closed


gyp: update gyp to 0.6.1
#2238
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 2 additions & 2 deletions
gyp/.flake8

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101
@cclausscclaussOct 14, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!
@rvaggrvaggOct 15, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in
max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/Python_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
 max-parallel: 15
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
 python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
 python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 steps:
 - uses: actions/checkout@v2
 - name: Set up Python ${{ matrix.python-version }}
Expand Down

40 changes: 40 additions & 0 deletions
gyp/.github/workflows/node-gyp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
 test:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest, ubuntu-latest, windows-latest]
 runs-on: ${{ matrix.os }}
 steps:
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
 - name: Clone nodejs/node-gyp
 uses: actions/checkout@v2
 with:
 repository: nodejs/node-gyp
 path: node-gyp
 - uses: actions/setup-node@v1
 with:
 node-version: 14.x
 - uses: actions/setup-python@v2
 with:
 python-version: 3.9
 - name: Install dependencies
 run: |
 cd node-gyp
 npm install --no-progress
 - name: Replace gyp in node-gyp
 shell: bash
 run: |
 rm -rf node-gyp/gyp
 cp -r gyp-next node-gyp/gyp
 - name: Run tests
 run: |
 cd node-gyp
 npm test

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/nodejs-windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
 build-windows:
 runs-on: windows-latest
 steps:
 - name: Clone node-gyp
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
Expand Down

28 changes: 27 additions & 1 deletion
gyp/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
 directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
 just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
 auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down

3 changes: 3 additions & 0 deletions
gyp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`

9 changes: 6 additions & 3 deletions
gyp/pylib/gyp/MSVSSettings_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
 "MSBuild, index value (21) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
 "MSBuild, index value (13) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
 "Warning: while converting "
 "VCCLCompilerTool/GeneratePreprocessedFile to "
 "MSBuild, value must be one of [0, 1, 2]; got 14",
 "Warning: while converting VCLinkerTool/Driver to "
 "MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
 "EmbedManifest": "false",
 "GenerateCatalogFiles": "true",
 "InputResourceManifests": "asfsfdafs",
 "ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "ManifestResourceFile":
 "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "OutputManifestFile": "$(TargetPath).manifestdfs",
 "RegistrarScriptFile": "sdfsfd",
 "ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
 "LinkIncremental": "",
 },
 "ManifestResourceCompile": {
 "ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 "ResourceOutputFileName":
 "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 },
 }
 self.maxDiff = 9999 # on failure display a long diff
Expand Down

17 changes: 0 additions & 17 deletions
gyp/pylib/gyp/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
 params=None,
 check=False,
 circular_check=True,
 duplicate_basename_check=True,
):
 """
 Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
 generator_input_info,
 check,
 circular_check,
 duplicate_basename_check,
 params["parallel"],
 params["root_targets"],
 )
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
 regenerate=False,
 help="don't check for circular relationships between files",
 )
 # --no-duplicate-basename-check disables the check for duplicate basenames
 # in a static_library/shared_library project. Visual C++ 2008 generator
 # doesn't support this configuration. Libtool on Mac also generates warnings
 # when duplicate basenames are passed into Make generator on Mac.
 # TODO(yukawa): Remove this option when these legacy generators are
 # deprecated.
 parser.add_argument(
 "--no-duplicate-basename-check",
 dest="duplicate_basename_check",
 action="store_false",
 default=True,
 regenerate=False,
 help="don't check for duplicate basenames",
 )
 parser.add_argument(
 "--no-parallel",
 action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
 params,
 options.check,
 options.circular_check,
 options.duplicate_basename_check,
 )

 # TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down

24 changes: 15 additions & 9 deletions
gyp/pylib/gyp/common.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
 """Wrapper around file which only covers the target if it differs."""

 def __init__(self):
 # On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
 # obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
 # On Cygwin remove the "dir" argument
 # `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..."
 # being prefixed to those, which was
 # obviously a non-existent path,
 # for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # For more details see:
 # https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
 base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
 # Pick temporary file.
 tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
 # one.
 os.unlink(self.tmp_path)
 else:
 # The new file is different from the old one, or there is no old one.
 # The new file is different from the old one,
 # or there is no old one.
 # Rename the new file to the permanent name.
 #
 # tempfile.mkstemp uses an overly restrictive mode, resulting in a
 # file that can only be read by the owner, regardless of the umask.
 # There's no reason to not respect the umask here, which means that
 # an extra hoop is required to fetch it and reset the new file's mode.
 # There's no reason to not respect the umask here,
 # which means that an extra hoop is required
 # to fetch it and reset the new file's mode.
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
 os.chmod(self.tmp_path, 0o666 & ~umask)
 if sys.platform == "win32" and os.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
 # is no way to make the switch atomic.
 # existing file, so it must be preceded with a remove.
 # Sadly there is no way to make the switch atomic.
 os.remove(filename)
 os.rename(self.tmp_path, filename)
 except Exception:
Expand Down

2 changes: 1 addition & 1 deletion
gyp/pylib/gyp/generator/android.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
 These are source files necessary to build the current target.
 We need to handle shared_intermediate directory source files as
 a special case by copying them to the intermediate directory and
 treating them as a genereated sources. Otherwise the Android build
 treating them as a generated sources. Otherwise the Android build
 rules won't pick them up.

 Args:
Expand Down

4 changes: 2 additions & 2 deletions
gyp/pylib/gyp/generator/compile_commands_json.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
 defines = ["-D" + s for s in defines]

 # TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
 sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
 sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

 def resolve(filename):
 return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
gyp: update gyp to 0.6.1#2238

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.

 Sign up for GitHub

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

 Closed

rvagg
wants to merge
1
commit into

from

 Closed


gyp: update gyp to 0.6.1
#2238
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 2 additions & 2 deletions
gyp/.flake8

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101
@cclausscclaussOct 14, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!
@rvaggrvaggOct 15, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in
max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/Python_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
 max-parallel: 15
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
 python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
 python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 steps:
 - uses: actions/checkout@v2
 - name: Set up Python ${{ matrix.python-version }}
Expand Down

40 changes: 40 additions & 0 deletions
gyp/.github/workflows/node-gyp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
 test:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest, ubuntu-latest, windows-latest]
 runs-on: ${{ matrix.os }}
 steps:
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
 - name: Clone nodejs/node-gyp
 uses: actions/checkout@v2
 with:
 repository: nodejs/node-gyp
 path: node-gyp
 - uses: actions/setup-node@v1
 with:
 node-version: 14.x
 - uses: actions/setup-python@v2
 with:
 python-version: 3.9
 - name: Install dependencies
 run: |
 cd node-gyp
 npm install --no-progress
 - name: Replace gyp in node-gyp
 shell: bash
 run: |
 rm -rf node-gyp/gyp
 cp -r gyp-next node-gyp/gyp
 - name: Run tests
 run: |
 cd node-gyp
 npm test

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/nodejs-windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
 build-windows:
 runs-on: windows-latest
 steps:
 - name: Clone node-gyp
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
Expand Down

28 changes: 27 additions & 1 deletion
gyp/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
 directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
 just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
 auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down

3 changes: 3 additions & 0 deletions
gyp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`

9 changes: 6 additions & 3 deletions
gyp/pylib/gyp/MSVSSettings_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
 "MSBuild, index value (21) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
 "MSBuild, index value (13) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
 "Warning: while converting "
 "VCCLCompilerTool/GeneratePreprocessedFile to "
 "MSBuild, value must be one of [0, 1, 2]; got 14",
 "Warning: while converting VCLinkerTool/Driver to "
 "MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
 "EmbedManifest": "false",
 "GenerateCatalogFiles": "true",
 "InputResourceManifests": "asfsfdafs",
 "ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "ManifestResourceFile":
 "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "OutputManifestFile": "$(TargetPath).manifestdfs",
 "RegistrarScriptFile": "sdfsfd",
 "ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
 "LinkIncremental": "",
 },
 "ManifestResourceCompile": {
 "ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 "ResourceOutputFileName":
 "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 },
 }
 self.maxDiff = 9999 # on failure display a long diff
Expand Down

17 changes: 0 additions & 17 deletions
gyp/pylib/gyp/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
 params=None,
 check=False,
 circular_check=True,
 duplicate_basename_check=True,
):
 """
 Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
 generator_input_info,
 check,
 circular_check,
 duplicate_basename_check,
 params["parallel"],
 params["root_targets"],
 )
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
 regenerate=False,
 help="don't check for circular relationships between files",
 )
 # --no-duplicate-basename-check disables the check for duplicate basenames
 # in a static_library/shared_library project. Visual C++ 2008 generator
 # doesn't support this configuration. Libtool on Mac also generates warnings
 # when duplicate basenames are passed into Make generator on Mac.
 # TODO(yukawa): Remove this option when these legacy generators are
 # deprecated.
 parser.add_argument(
 "--no-duplicate-basename-check",
 dest="duplicate_basename_check",
 action="store_false",
 default=True,
 regenerate=False,
 help="don't check for duplicate basenames",
 )
 parser.add_argument(
 "--no-parallel",
 action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
 params,
 options.check,
 options.circular_check,
 options.duplicate_basename_check,
 )

 # TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down

24 changes: 15 additions & 9 deletions
gyp/pylib/gyp/common.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
 """Wrapper around file which only covers the target if it differs."""

 def __init__(self):
 # On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
 # obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
 # On Cygwin remove the "dir" argument
 # `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..."
 # being prefixed to those, which was
 # obviously a non-existent path,
 # for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # For more details see:
 # https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
 base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
 # Pick temporary file.
 tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
 # one.
 os.unlink(self.tmp_path)
 else:
 # The new file is different from the old one, or there is no old one.
 # The new file is different from the old one,
 # or there is no old one.
 # Rename the new file to the permanent name.
 #
 # tempfile.mkstemp uses an overly restrictive mode, resulting in a
 # file that can only be read by the owner, regardless of the umask.
 # There's no reason to not respect the umask here, which means that
 # an extra hoop is required to fetch it and reset the new file's mode.
 # There's no reason to not respect the umask here,
 # which means that an extra hoop is required
 # to fetch it and reset the new file's mode.
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
 os.chmod(self.tmp_path, 0o666 & ~umask)
 if sys.platform == "win32" and os.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
 # is no way to make the switch atomic.
 # existing file, so it must be preceded with a remove.
 # Sadly there is no way to make the switch atomic.
 os.remove(filename)
 os.rename(self.tmp_path, filename)
 except Exception:
Expand Down

2 changes: 1 addition & 1 deletion
gyp/pylib/gyp/generator/android.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
 These are source files necessary to build the current target.
 We need to handle shared_intermediate directory source files as
 a special case by copying them to the intermediate directory and
 treating them as a genereated sources. Otherwise the Android build
 treating them as a generated sources. Otherwise the Android build
 rules won't pick them up.

 Args:
Expand Down

4 changes: 2 additions & 2 deletions
gyp/pylib/gyp/generator/compile_commands_json.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
 defines = ["-D" + s for s in defines]

 # TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
 sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
 sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

 def resolve(filename):
 return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: update gyp to 0.6.1#2238

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.

 Sign up for GitHub

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

 Closed

rvagg
wants to merge
1
commit into

from

 Closed


gyp: update gyp to 0.6.1
#2238
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 2 additions & 2 deletions
gyp/.flake8

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101
@cclausscclaussOct 14, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!
@rvaggrvaggOct 15, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in
max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/Python_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
 max-parallel: 15
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
 python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
 python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 steps:
 - uses: actions/checkout@v2
 - name: Set up Python ${{ matrix.python-version }}
Expand Down

40 changes: 40 additions & 0 deletions
gyp/.github/workflows/node-gyp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
 test:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest, ubuntu-latest, windows-latest]
 runs-on: ${{ matrix.os }}
 steps:
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
 - name: Clone nodejs/node-gyp
 uses: actions/checkout@v2
 with:
 repository: nodejs/node-gyp
 path: node-gyp
 - uses: actions/setup-node@v1
 with:
 node-version: 14.x
 - uses: actions/setup-python@v2
 with:
 python-version: 3.9
 - name: Install dependencies
 run: |
 cd node-gyp
 npm install --no-progress
 - name: Replace gyp in node-gyp
 shell: bash
 run: |
 rm -rf node-gyp/gyp
 cp -r gyp-next node-gyp/gyp
 - name: Run tests
 run: |
 cd node-gyp
 npm test

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/nodejs-windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
 build-windows:
 runs-on: windows-latest
 steps:
 - name: Clone node-gyp
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
Expand Down

28 changes: 27 additions & 1 deletion
gyp/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
 directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
 just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
 auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down

3 changes: 3 additions & 0 deletions
gyp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`

9 changes: 6 additions & 3 deletions
gyp/pylib/gyp/MSVSSettings_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
 "MSBuild, index value (21) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
 "MSBuild, index value (13) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
 "Warning: while converting "
 "VCCLCompilerTool/GeneratePreprocessedFile to "
 "MSBuild, value must be one of [0, 1, 2]; got 14",
 "Warning: while converting VCLinkerTool/Driver to "
 "MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
 "EmbedManifest": "false",
 "GenerateCatalogFiles": "true",
 "InputResourceManifests": "asfsfdafs",
 "ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "ManifestResourceFile":
 "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "OutputManifestFile": "$(TargetPath).manifestdfs",
 "RegistrarScriptFile": "sdfsfd",
 "ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
 "LinkIncremental": "",
 },
 "ManifestResourceCompile": {
 "ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 "ResourceOutputFileName":
 "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 },
 }
 self.maxDiff = 9999 # on failure display a long diff
Expand Down

17 changes: 0 additions & 17 deletions
gyp/pylib/gyp/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
 params=None,
 check=False,
 circular_check=True,
 duplicate_basename_check=True,
):
 """
 Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
 generator_input_info,
 check,
 circular_check,
 duplicate_basename_check,
 params["parallel"],
 params["root_targets"],
 )
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
 regenerate=False,
 help="don't check for circular relationships between files",
 )
 # --no-duplicate-basename-check disables the check for duplicate basenames
 # in a static_library/shared_library project. Visual C++ 2008 generator
 # doesn't support this configuration. Libtool on Mac also generates warnings
 # when duplicate basenames are passed into Make generator on Mac.
 # TODO(yukawa): Remove this option when these legacy generators are
 # deprecated.
 parser.add_argument(
 "--no-duplicate-basename-check",
 dest="duplicate_basename_check",
 action="store_false",
 default=True,
 regenerate=False,
 help="don't check for duplicate basenames",
 )
 parser.add_argument(
 "--no-parallel",
 action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
 params,
 options.check,
 options.circular_check,
 options.duplicate_basename_check,
 )

 # TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down

24 changes: 15 additions & 9 deletions
gyp/pylib/gyp/common.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
 """Wrapper around file which only covers the target if it differs."""

 def __init__(self):
 # On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
 # obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
 # On Cygwin remove the "dir" argument
 # `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..."
 # being prefixed to those, which was
 # obviously a non-existent path,
 # for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # For more details see:
 # https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
 base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
 # Pick temporary file.
 tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
 # one.
 os.unlink(self.tmp_path)
 else:
 # The new file is different from the old one, or there is no old one.
 # The new file is different from the old one,
 # or there is no old one.
 # Rename the new file to the permanent name.
 #
 # tempfile.mkstemp uses an overly restrictive mode, resulting in a
 # file that can only be read by the owner, regardless of the umask.
 # There's no reason to not respect the umask here, which means that
 # an extra hoop is required to fetch it and reset the new file's mode.
 # There's no reason to not respect the umask here,
 # which means that an extra hoop is required
 # to fetch it and reset the new file's mode.
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
 os.chmod(self.tmp_path, 0o666 & ~umask)
 if sys.platform == "win32" and os.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
 # is no way to make the switch atomic.
 # existing file, so it must be preceded with a remove.
 # Sadly there is no way to make the switch atomic.
 os.remove(filename)
 os.rename(self.tmp_path, filename)
 except Exception:
Expand Down

2 changes: 1 addition & 1 deletion
gyp/pylib/gyp/generator/android.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
 These are source files necessary to build the current target.
 We need to handle shared_intermediate directory source files as
 a special case by copying them to the intermediate directory and
 treating them as a genereated sources. Otherwise the Android build
 treating them as a generated sources. Otherwise the Android build
 rules won't pick them up.

 Args:
Expand Down

4 changes: 2 additions & 2 deletions
gyp/pylib/gyp/generator/compile_commands_json.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
 defines = ["-D" + s for s in defines]

 # TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
 sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
 sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

 def resolve(filename):
 return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: update gyp to 0.6.1#2238

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.

 Sign up for GitHub

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

 Closed

rvagg
wants to merge
1
commit into

from

 Closed


gyp: update gyp to 0.6.1
#2238
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 2 additions & 2 deletions
gyp/.flake8

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101
@cclausscclaussOct 14, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!
@rvaggrvaggOct 15, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in
max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/Python_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
 max-parallel: 15
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
 python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
 python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 steps:
 - uses: actions/checkout@v2
 - name: Set up Python ${{ matrix.python-version }}
Expand Down

40 changes: 40 additions & 0 deletions
gyp/.github/workflows/node-gyp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
 test:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest, ubuntu-latest, windows-latest]
 runs-on: ${{ matrix.os }}
 steps:
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
 - name: Clone nodejs/node-gyp
 uses: actions/checkout@v2
 with:
 repository: nodejs/node-gyp
 path: node-gyp
 - uses: actions/setup-node@v1
 with:
 node-version: 14.x
 - uses: actions/setup-python@v2
 with:
 python-version: 3.9
 - name: Install dependencies
 run: |
 cd node-gyp
 npm install --no-progress
 - name: Replace gyp in node-gyp
 shell: bash
 run: |
 rm -rf node-gyp/gyp
 cp -r gyp-next node-gyp/gyp
 - name: Run tests
 run: |
 cd node-gyp
 npm test

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/nodejs-windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
 build-windows:
 runs-on: windows-latest
 steps:
 - name: Clone node-gyp
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
Expand Down

28 changes: 27 additions & 1 deletion
gyp/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
 directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
 just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
 auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down

3 changes: 3 additions & 0 deletions
gyp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`

9 changes: 6 additions & 3 deletions
gyp/pylib/gyp/MSVSSettings_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
 "MSBuild, index value (21) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
 "MSBuild, index value (13) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
 "Warning: while converting "
 "VCCLCompilerTool/GeneratePreprocessedFile to "
 "MSBuild, value must be one of [0, 1, 2]; got 14",
 "Warning: while converting VCLinkerTool/Driver to "
 "MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
 "EmbedManifest": "false",
 "GenerateCatalogFiles": "true",
 "InputResourceManifests": "asfsfdafs",
 "ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "ManifestResourceFile":
 "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "OutputManifestFile": "$(TargetPath).manifestdfs",
 "RegistrarScriptFile": "sdfsfd",
 "ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
 "LinkIncremental": "",
 },
 "ManifestResourceCompile": {
 "ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 "ResourceOutputFileName":
 "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 },
 }
 self.maxDiff = 9999 # on failure display a long diff
Expand Down

17 changes: 0 additions & 17 deletions
gyp/pylib/gyp/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
 params=None,
 check=False,
 circular_check=True,
 duplicate_basename_check=True,
):
 """
 Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
 generator_input_info,
 check,
 circular_check,
 duplicate_basename_check,
 params["parallel"],
 params["root_targets"],
 )
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
 regenerate=False,
 help="don't check for circular relationships between files",
 )
 # --no-duplicate-basename-check disables the check for duplicate basenames
 # in a static_library/shared_library project. Visual C++ 2008 generator
 # doesn't support this configuration. Libtool on Mac also generates warnings
 # when duplicate basenames are passed into Make generator on Mac.
 # TODO(yukawa): Remove this option when these legacy generators are
 # deprecated.
 parser.add_argument(
 "--no-duplicate-basename-check",
 dest="duplicate_basename_check",
 action="store_false",
 default=True,
 regenerate=False,
 help="don't check for duplicate basenames",
 )
 parser.add_argument(
 "--no-parallel",
 action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
 params,
 options.check,
 options.circular_check,
 options.duplicate_basename_check,
 )

 # TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down

24 changes: 15 additions & 9 deletions
gyp/pylib/gyp/common.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
 """Wrapper around file which only covers the target if it differs."""

 def __init__(self):
 # On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
 # obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
 # On Cygwin remove the "dir" argument
 # `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..."
 # being prefixed to those, which was
 # obviously a non-existent path,
 # for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # For more details see:
 # https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
 base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
 # Pick temporary file.
 tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
 # one.
 os.unlink(self.tmp_path)
 else:
 # The new file is different from the old one, or there is no old one.
 # The new file is different from the old one,
 # or there is no old one.
 # Rename the new file to the permanent name.
 #
 # tempfile.mkstemp uses an overly restrictive mode, resulting in a
 # file that can only be read by the owner, regardless of the umask.
 # There's no reason to not respect the umask here, which means that
 # an extra hoop is required to fetch it and reset the new file's mode.
 # There's no reason to not respect the umask here,
 # which means that an extra hoop is required
 # to fetch it and reset the new file's mode.
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
 os.chmod(self.tmp_path, 0o666 & ~umask)
 if sys.platform == "win32" and os.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
 # is no way to make the switch atomic.
 # existing file, so it must be preceded with a remove.
 # Sadly there is no way to make the switch atomic.
 os.remove(filename)
 os.rename(self.tmp_path, filename)
 except Exception:
Expand Down

2 changes: 1 addition & 1 deletion
gyp/pylib/gyp/generator/android.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
 These are source files necessary to build the current target.
 We need to handle shared_intermediate directory source files as
 a special case by copying them to the intermediate directory and
 treating them as a genereated sources. Otherwise the Android build
 treating them as a generated sources. Otherwise the Android build
 rules won't pick them up.

 Args:
Expand Down

4 changes: 2 additions & 2 deletions
gyp/pylib/gyp/generator/compile_commands_json.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
 defines = ["-D" + s for s in defines]

 # TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
 sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
 sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

 def resolve(filename):
 return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
gyp: update gyp to 0.6.1#2238

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.

 Sign up for GitHub

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

 Closed

rvagg
wants to merge
1
commit into

from

 Closed


gyp: update gyp to 0.6.1
#2238
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


4 changes: 2 additions & 2 deletions
gyp/.flake8

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
[flake8]
max-complexity = 10
max-complexity = 101
@cclausscclaussOct 14, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch!
@rvaggrvaggOct 15, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, take it up with gyp-next, I'm just vendoring it in
max-line-length = 88
extend-ignore = E203,C901,E501
extend-ignore = E203 # whitespace before ':' to agree with psf/black

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/Python_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
 max-parallel: 15
 matrix:
 os: [macos-latest, ubuntu-latest] # , windows-latest]
 python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
 python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
 steps:
 - uses: actions/checkout@v2
 - name: Set up Python ${{ matrix.python-version }}
Expand Down

40 changes: 40 additions & 0 deletions
gyp/.github/workflows/node-gyp.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
name: node-gyp integration

on: [push, pull_request]

jobs:
 test:
 strategy:
 fail-fast: false
 matrix:
 os: [macos-latest, ubuntu-latest, windows-latest]
 runs-on: ${{ matrix.os }}
 steps:
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
 - name: Clone nodejs/node-gyp
 uses: actions/checkout@v2
 with:
 repository: nodejs/node-gyp
 path: node-gyp
 - uses: actions/setup-node@v1
 with:
 node-version: 14.x
 - uses: actions/setup-python@v2
 with:
 python-version: 3.9
 - name: Install dependencies
 run: |
 cd node-gyp
 npm install --no-progress
 - name: Replace gyp in node-gyp
 shell: bash
 run: |
 rm -rf node-gyp/gyp
 cp -r gyp-next node-gyp/gyp
 - name: Run tests
 run: |
 cd node-gyp
 npm test

2 changes: 1 addition & 1 deletion
gyp/.github/workflows/nodejs-windows.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ jobs:
 build-windows:
 runs-on: windows-latest
 steps:
 - name: Clone node-gyp
 - name: Clone gyp-next
 uses: actions/checkout@v2
 with:
 path: gyp-next
Expand Down

28 changes: 27 additions & 1 deletion
gyp/CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [0.6.1] - 2020-10-14

### Fixed
- Correctly rename object files for absolute paths in MSVS generator.

## [0.6.0] - 2020-10-13

### Added
- The Makefile generator will now output shared libraries directly to the product
 directory on all platforms (previously only macOS).

## [0.5.0] - 2020-09-30

### Added
- Extended compile_commands_json generator to consider more file extensions than
 just `c` and `cc`. `cpp` and `cxx` are now supported.
- Source files with duplicate basenames are now supported.

### Removed
- The `--no-duplicate-basename-check` option was removed.
- The `msvs_enable_marmasm` configuration option was removed in favor of
 auto-inclusion of the "marmasm" sections for Windows on ARM.

## [0.4.0] - 2020-07-14

### Added
Expand DownExpand Up@@ -34,7 +57,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This is the first release of this project, based on https://chromium.googlesource.com/external/gyp
with changes made over the years in Node.js and node-gyp.

[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.4.0...HEAD
[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.1...HEAD
[0.6.1]: https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1
Expand Down

3 changes: 3 additions & 0 deletions
gyp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,3 +2,6 @@ GYP can Generate Your Projects.
===================================

Documents are available at [gyp.gsrc.io](https://gyp.gsrc.io), or you can check out ```md-pages``` branch to read those documents offline.

__gyp-next__ is [released](https://github.com/nodejs/gyp-next/releases) to the [__Python Packaging Index__](https://pypi.org/project/gyp-next) (PyPI) and can be installed with the command:
* `python3 -m pip install gyp-next`

9 changes: 6 additions & 3 deletions
gyp/pylib/gyp/MSVSSettings_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -678,7 +678,8 @@ def testConvertToMSBuildSettings_warnings(self):
 "MSBuild, index value (21) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/UsePrecompiledHeader to "
 "MSBuild, index value (13) not in expected range [0, 3)",
 "Warning: while converting VCCLCompilerTool/GeneratePreprocessedFile to "
 "Warning: while converting "
 "VCCLCompilerTool/GeneratePreprocessedFile to "
 "MSBuild, value must be one of [0, 1, 2]; got 14",
 "Warning: while converting VCLinkerTool/Driver to "
 "MSBuild, index value (10) not in expected range [0, 4)",
Expand DownExpand Up@@ -1348,7 +1349,8 @@ def testConvertToMSBuildSettings_actual(self):
 "EmbedManifest": "false",
 "GenerateCatalogFiles": "true",
 "InputResourceManifests": "asfsfdafs",
 "ManifestResourceFile": "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "ManifestResourceFile":
 "$(IntDir)\\$(TargetFileName).embed.manifest.resfdsf",
 "OutputManifestFile": "$(TargetPath).manifestdfs",
 "RegistrarScriptFile": "sdfsfd",
 "ReplacementsFile": "sdffsd",
Expand DownExpand Up@@ -1532,7 +1534,8 @@ def testConvertToMSBuildSettings_actual(self):
 "LinkIncremental": "",
 },
 "ManifestResourceCompile": {
 "ResourceOutputFileName": "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 "ResourceOutputFileName":
 "$(IntDir)$(TargetFileName).embed.manifest.resfdsf"
 },
 }
 self.maxDiff = 9999 # on failure display a long diff
Expand Down

17 changes: 0 additions & 17 deletions
gyp/pylib/gyp/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,6 @@ def Load(
 params=None,
 check=False,
 circular_check=True,
 duplicate_basename_check=True,
):
 """
 Loads one or more specified build files.
Expand DownExpand Up@@ -156,7 +155,6 @@ def Load(
 generator_input_info,
 check,
 circular_check,
 duplicate_basename_check,
 params["parallel"],
 params["root_targets"],
 )
Expand DownExpand Up@@ -431,20 +429,6 @@ def gyp_main(args):
 regenerate=False,
 help="don't check for circular relationships between files",
 )
 # --no-duplicate-basename-check disables the check for duplicate basenames
 # in a static_library/shared_library project. Visual C++ 2008 generator
 # doesn't support this configuration. Libtool on Mac also generates warnings
 # when duplicate basenames are passed into Make generator on Mac.
 # TODO(yukawa): Remove this option when these legacy generators are
 # deprecated.
 parser.add_argument(
 "--no-duplicate-basename-check",
 dest="duplicate_basename_check",
 action="store_false",
 default=True,
 regenerate=False,
 help="don't check for duplicate basenames",
 )
 parser.add_argument(
 "--no-parallel",
 action="store_true",
Expand DownExpand Up@@ -651,7 +635,6 @@ def gyp_main(args):
 params,
 options.check,
 options.circular_check,
 options.duplicate_basename_check,
 )

 # TODO(mark): Pass |data| for now because the generator needs a list of
Expand Down

24 changes: 15 additions & 9 deletions
gyp/pylib/gyp/common.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -352,10 +352,14 @@ class Writer(object):
 """Wrapper around file which only covers the target if it differs."""

 def __init__(self):
 # On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
 # obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
 # On Cygwin remove the "dir" argument
 # `C:` prefixed paths are treated as relative,
 # consequently ending up with current dir "/cygdrive/c/..."
 # being prefixed to those, which was
 # obviously a non-existent path,
 # for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
 # For more details see:
 # https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp
 base_temp_dir = "" if IsCygwin() else os.path.dirname(filename)
 # Pick temporary file.
 tmp_fd, self.tmp_path = tempfile.mkstemp(
Expand DownExpand Up@@ -391,13 +395,15 @@ def close(self):
 # one.
 os.unlink(self.tmp_path)
 else:
 # The new file is different from the old one, or there is no old one.
 # The new file is different from the old one,
 # or there is no old one.
 # Rename the new file to the permanent name.
 #
 # tempfile.mkstemp uses an overly restrictive mode, resulting in a
 # file that can only be read by the owner, regardless of the umask.
 # There's no reason to not respect the umask here, which means that
 # an extra hoop is required to fetch it and reset the new file's mode.
 # There's no reason to not respect the umask here,
 # which means that an extra hoop is required
 # to fetch it and reset the new file's mode.
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
Expand All@@ -406,8 +412,8 @@ def close(self):
 os.chmod(self.tmp_path, 0o666 & ~umask)
 if sys.platform == "win32" and os.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
 # is no way to make the switch atomic.
 # existing file, so it must be preceded with a remove.
 # Sadly there is no way to make the switch atomic.
 os.remove(filename)
 os.rename(self.tmp_path, filename)
 except Exception:
Expand Down

2 changes: 1 addition & 1 deletion
gyp/pylib/gyp/generator/android.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -557,7 +557,7 @@ def WriteSources(self, spec, configs, extra_sources):
 These are source files necessary to build the current target.
 We need to handle shared_intermediate directory source files as
 a special case by copying them to the intermediate directory and
 treating them as a genereated sources. Otherwise the Android build
 treating them as a generated sources. Otherwise the Android build
 rules won't pick them up.

 Args:
Expand Down

4 changes: 2 additions & 2 deletions
gyp/pylib/gyp/generator/compile_commands_json.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,8 @@ def AddCommandsForTarget(cwd, target, params, per_config_commands):
 defines = ["-D" + s for s in defines]

 # TODO(bnoordhuis) Handle generated source files.
sources = target.get("sources", [])
 sources = [s for s in sources if s.endswith(".c") or s.endswith(".cc")]
extensions = (".c", ".cc", ".cpp", ".cxx")
 sources = [s for s in target.get("sources", []) if s.endswith(extensions)]

 def resolve(filename):
 return os.path.abspath(os.path.join(cwd, filename))
Expand Down
Loading