GeezerVison is showing github.com — tools: update gyp-next to v0.6.2 · nodejs/node@985efdf
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboard +40Lines changed: 40 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| | 1 | +name: node-gyp integration | | 2 | + | | 3 | +on: [push, pull_request] | | 4 | + | | 5 | +jobs: | | 6 | + test: | | 7 | + strategy: | | 8 | + fail-fast: false | | 9 | + matrix: | | 10 | + os: [macos-latest, ubuntu-latest, windows-latest] | | 11 | + runs-on: ${{ matrix.os }} | | 12 | + steps: | | 13 | + - name: Clone gyp-next | | 14 | + uses: actions/checkout@v2 | | 15 | + with: | | 16 | + path: gyp-next | | 17 | + - name: Clone nodejs/node-gyp | | 18 | + uses: actions/checkout@v2 | | 19 | + with: | | 20 | + repository: nodejs/node-gyp | | 21 | + path: node-gyp | | 22 | + - uses: actions/setup-node@v1 | | 23 | + with: | | 24 | + node-version: 14.x | | 25 | + - uses: actions/setup-python@v2 | | 26 | + with: | | 27 | + python-version: 3.9 | | 28 | + - name: Install dependencies | | 29 | + run: | | | 30 | + cd node-gyp | | 31 | + npm install --no-progress | | 32 | + - name: Replace gyp in node-gyp | | 33 | + shell: bash | | 34 | + run: | | | 35 | + rm -rf node-gyp/gyp | | 36 | + cp -r gyp-next node-gyp/gyp | | 37 | + - name: Run tests | | 38 | + run: | | | 39 | + cd node-gyp | | 40 | + npm test |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp/.github/workflows/nodejs-windows.yml +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 6 | 6 | build-windows: | 7 | 7 | runs-on: windows-latest | 8 | 8 | steps: | 9 | | - - name: Clone node-gyp | | 9 | + - name: Clone gyp-next | 10 | 10 | uses: actions/checkout@v2 | 11 | 11 | with: | 12 | 12 | path: gyp-next | |
Collapse file Copy file name to clipboard +16Lines changed: 16 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| | 1 | +on: | | 2 | + push: | | 3 | + branches: | | 4 | + - master | | 5 | + | | 6 | +name: release-please | | 7 | +jobs: | | 8 | + release-please: | | 9 | + runs-on: ubuntu-latest | | 10 | + steps: | | 11 | + | | 12 | + with: | | 13 | + token: ${{ secrets.GITHUB_TOKEN }} | | 14 | + release-type: python | | 15 | + package-name: gyp-next | | 16 | + bump-minor-pre-major: Yes |
Collapse file Copy file name to clipboard +49-40Lines changed: 49 additions & 40 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | # Changelog | 2 | 2 |
| 3 | | -All notable changes to this project will be documented in this file. | | 3 | +### [0.6.2](https://www.github.com/nodejs/gyp-next/compare/v0.6.1...v0.6.2) (2020-10-16) | 4 | 4 |
| 5 | | -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). | 6 | 5 |
| 7 | | -## [Unreleased] | | 6 | +### Bug Fixes | 8 | 7 |
| 9 | | -## [0.6.0] - 2020-10-13 | | 8 | +* do not rewrite absolute paths to avoid long paths ([#74](https://www.github.com/nodejs/gyp-next/issues/74)) ([c2ccc1a](https://www.github.com/nodejs/gyp-next/commit/c2ccc1a81f7f94433a94f4d01a2e820db4c4331a)) | | 9 | +* only include MARMASM when toolset is target ([5a2794a](https://www.github.com/nodejs/gyp-next/commit/5a2794aefb58f0c00404ff042b61740bc8b8d5cd)) | 10 | 10 |
| 11 | | -### Added | 12 | | -- The Makefile generator will now output shared libraries directly to the product | 13 | | - directory on all platforms (previously only macOS). | | 11 | +### [0.6.1](https://github.com/nodejs/gyp-next/compare/v0.6.0...v0.6.1) (2020-10-14) | 14 | 12 |
| 15 | | -## [0.5.0] - 2020-09-30 | 16 | 13 |
| 17 | | -### Added | 18 | | -- Extended compile_commands_json generator to consider more file extensions than | 19 | | - just `c` and `cc`. `cpp` and `cxx` are now supported. | 20 | | -- Source files with duplicate basenames are now supported. | | 14 | +### Bug Fixes | | 15 | + | | 16 | +* Correctly rename object files for absolute paths in MSVS generator. | | 17 | + | | 18 | +## [0.6.0](https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0) (2020-10-13) | | 19 | + | | 20 | + | | 21 | +### Features | | 22 | + | | 23 | +* The Makefile generator will now output shared libraries directly to the product directory on all platforms (previously only macOS). | | 24 | + | | 25 | +## [0.5.0](https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0) (2020-09-30) | | 26 | + | | 27 | + | | 28 | +### Features | | 29 | + | | 30 | +* Extended compile_commands_json generator to consider more file extensions than just `c` and `cc`. `cpp` and `cxx` are now supported. | | 31 | +* Source files with duplicate basenames are now supported. | 21 | 32 |
| 22 | 33 | ### Removed | 23 | | -- The `--no-duplicate-basename-check` option was removed. | 24 | | -- The `msvs_enable_marmasm` configuration option was removed in favor of | 25 | | - auto-inclusion of the "marmasm" sections for Windows on ARM. | 26 | 34 |
| 27 | | -## [0.4.0] - 2020-07-14 | | 35 | +* The `--no-duplicate-basename-check` option was removed. | | 36 | +* The `msvs_enable_marmasm` configuration option was removed in favor of auto-inclusion of the "marmasm" sections for Windows on ARM. | | 37 | + | | 38 | +## [0.4.0](https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0) (2020-07-14) | | 39 | + | | 40 | + | | 41 | +### Features | | 42 | + | | 43 | +* Added support for passing arbitrary architectures to Xcode builds, enables `arm64` builds. | | 44 | + | | 45 | +### Bug Fixes | | 46 | + | | 47 | +* Fixed a bug on Solaris where copying archives failed. | | 48 | + | | 49 | +## [0.3.0](https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0) (2020-06-06) | | 50 | + | 28 | 51 |
| 29 | | -### Added | 30 | | -- Added support for passing arbitrary architectures to Xcode builds, enables `arm64` builds. | | 52 | +### Features | 31 | 53 |
| 32 | | -### Fixed | 33 | | -- Fixed a bug on Solaris where copying archives failed. | | 54 | +* Added support for MSVC cross-compilation. This allows compilation on x64 for a Windows ARM target. | 34 | 55 |
| 35 | | -## [0.3.0] - 2020-06-06 | | 56 | +### Bug Fixes | 36 | 57 |
| 37 | | -### Added | 38 | | -- Added support for MSVC cross-compilation. This allows compilation on x64 for | 39 | | - a Windows ARM target. | | 58 | +* Fixed XCode CLT version detection on macOS Catalina. | 40 | 59 |
| 41 | | -### Fixed | 42 | | -- Fixed XCode CLT version detection on macOS Catalina. | | 60 | +### [0.2.1](https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1) (2020-05-05) | 43 | 61 |
| 44 | | -## [0.2.1] - 2020-05-05 | 45 | 62 |
| 46 | | -### Fixed | 47 | | -- Relicensed to Node.js contributors. | 48 | | -- Fixed Windows bug introduced in v0.2.0. | | 63 | +### Bug Fixes | 49 | 64 |
| 50 | | -## [0.2.0] - 2020-04-06 | | 65 | +* Relicensed to Node.js contributors. | | 66 | +* Fixed Windows bug introduced in v0.2.0. | 51 | 67 |
| 52 | | -This is the first release of this project, based on https://chromium.googlesource.com/external/gyp | 53 | | -with changes made over the years in Node.js and node-gyp. | | 68 | +## [0.2.0](https://github.com/nodejs/gyp-next/releases/tag/v0.2.0) (2020-04-06) | 54 | 69 |
| 55 | | -[Unreleased]: https://github.com/nodejs/gyp-next/compare/v0.6.0...HEAD | 56 | | -[0.6.0]: https://github.com/nodejs/gyp-next/compare/v0.5.0...v0.6.0 | 57 | | -[0.5.0]: https://github.com/nodejs/gyp-next/compare/v0.4.0...v0.5.0 | 58 | | -[0.4.0]: https://github.com/nodejs/gyp-next/compare/v0.3.0...v0.4.0 | 59 | | -[0.3.0]: https://github.com/nodejs/gyp-next/compare/v0.2.1...v0.3.0 | 60 | | -[0.2.1]: https://github.com/nodejs/gyp-next/compare/v0.2.0...v0.2.1 | 61 | | -[0.2.0]: https://github.com/nodejs/gyp-next/releases/tag/v0.2.0 | | 70 | +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. |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp/pylib/gyp/generator/msvs.py +21-11Lines changed: 21 additions & 11 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -2177,7 +2177,12 @@ def GenerateOutput(target_list, target_dicts, data, params): | 2177 | 2177 |
| 2178 | 2178 |
| 2179 | 2179 | def _GenerateMSBuildFiltersFile( | 2180 | | - filters_path, source_files, rule_dependencies, extension_to_rule_name, platforms | | 2180 | + filters_path, | | 2181 | + source_files, | | 2182 | + rule_dependencies, | | 2183 | + extension_to_rule_name, | | 2184 | + platforms, | | 2185 | + toolset, | 2181 | 2186 | ): | 2182 | 2187 | """Generate the filters file. | 2183 | 2188 |
| @@ -2197,6 +2202,7 @@ def _GenerateMSBuildFiltersFile( | 2197 | 2202 | rule_dependencies, | 2198 | 2203 | extension_to_rule_name, | 2199 | 2204 | platforms, | | 2205 | + toolset, | 2200 | 2206 | filter_group, | 2201 | 2207 | source_group, | 2202 | 2208 | ) | @@ -2222,6 +2228,7 @@ def _AppendFiltersForMSBuild( | 2222 | 2228 | rule_dependencies, | 2223 | 2229 | extension_to_rule_name, | 2224 | 2230 | platforms, | | 2231 | + toolset, | 2225 | 2232 | filter_group, | 2226 | 2233 | source_group, | 2227 | 2234 | ): | @@ -2257,13 +2264,14 @@ def _AppendFiltersForMSBuild( | 2257 | 2264 | rule_dependencies, | 2258 | 2265 | extension_to_rule_name, | 2259 | 2266 | platforms, | | 2267 | + toolset, | 2260 | 2268 | filter_group, | 2261 | 2269 | source_group, | 2262 | 2270 | ) | 2263 | 2271 | else: | 2264 | 2272 | # It's a source. Create a source entry. | 2265 | 2273 | _, element = _MapFileToMsBuildSourceType( | 2266 | | - source, rule_dependencies, extension_to_rule_name, platforms | | 2274 | + source, rule_dependencies, extension_to_rule_name, platforms, toolset | 2267 | 2275 | ) | 2268 | 2276 | source_entry = [element, {"Include": source}] | 2269 | 2277 | # Specify the filter it is part of, if any. | @@ -2273,7 +2281,7 @@ def _AppendFiltersForMSBuild( | 2273 | 2281 |
| 2274 | 2282 |
| 2275 | 2283 | def _MapFileToMsBuildSourceType( | 2276 | | - source, rule_dependencies, extension_to_rule_name, platforms | | 2284 | + source, rule_dependencies, extension_to_rule_name, platforms, toolset | 2277 | 2285 | ): | 2278 | 2286 | """Returns the group and element type of the source file. | 2279 | 2287 |
| @@ -2301,9 +2309,8 @@ def _MapFileToMsBuildSourceType( | 2301 | 2309 | elif ext in [".s", ".asm"]: | 2302 | 2310 | group = "masm" | 2303 | 2311 | element = "MASM" | 2304 | | - for platform in platforms: | 2305 | | - if platform.lower() in ["arm", "arm64"]: | 2306 | | - element = "MARMASM" | | 2312 | + if "arm64" in platforms and toolset == "target": | | 2313 | + element = "MARMASM" | 2307 | 2314 | elif ext == ".idl": | 2308 | 2315 | group = "midl" | 2309 | 2316 | element = "Midl" | @@ -3613,14 +3620,16 @@ def _AddSources2( | 3613 | 3620 | rule_dependencies, | 3614 | 3621 | extension_to_rule_name, | 3615 | 3622 | _GetUniquePlatforms(spec), | | 3623 | + spec["toolset"], | 3616 | 3624 | ) | 3617 | | - if group == "compile": | 3618 | | - # Always add an <ObjectFileName> value to support duplicate | 3619 | | - # source file basenames. | | 3625 | + if group == "compile" and not os.path.isabs(source): | | 3626 | + # Add an <ObjectFileName> value to support duplicate source | | 3627 | + # file basenames, except for absolute paths to avoid paths | | 3628 | + # with more than 260 characters. | 3620 | 3629 | file_name = os.path.splitext(source)[0] + ".obj" | 3621 | | - if (file_name.startswith("..\\")): | | 3630 | + if file_name.startswith("..\\"): | 3622 | 3631 | file_name = re.sub(r"^(\.\.\\)+", "", file_name) | 3623 | | - elif (file_name.startswith("$(")): | | 3632 | + elif file_name.startswith("$("): | 3624 | 3633 | file_name = re.sub(r"^\$\([^)]+\)\\", "", file_name) | 3625 | 3634 | detail.append(["ObjectFileName", "$(IntDir)\\" + file_name]) | 3626 | 3635 | grouped_sources[group].append([element, {"Include": source}] + detail) | @@ -3728,6 +3737,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags, spec): | 3728 | 3737 | rule_dependencies, | 3729 | 3738 | extension_to_rule_name, | 3730 | 3739 | platforms, | | 3740 | + toolset, | 3731 | 3741 | ) | 3732 | 3742 | missing_sources = _VerifySourcesExist(sources, project_dir) | 3733 | 3743 |
| |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp/setup.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 15 | 15 |
| 16 | 16 | setup( | 17 | 17 | name="gyp-next", | 18 | | - version="0.6.0", | | 18 | + version="0.6.2", | 19 | 19 | description="A fork of the GYP build system for use in the Node.js projects", | 20 | 20 | long_description=long_description, | 21 | 21 | long_description_content_type="text/markdown", | |
|