Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node-gyp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d460084b241c427655497a1de4ed351a13ffb47f
Choose a base ref
...
head repository: nodejs/node-gyp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 989abc7ec2a3f618c70405600e5f6380e331fb8a
Choose a head ref
Loading
Showing with 32,983 additions and 27,417 deletions.
  1. +49 −0 .github/ISSUE_TEMPLATE.md
  2. +17 −0 .github/PULL_REQUEST_TEMPLATE.md
  3. +45 −0 .github/workflows/tests.yml
  4. +3 −0 .gitignore
  5. +0 −7 .jshintrc
  6. +0 −35 0001-gyp-always-install-into-PRODUCT_DIR.patch
  7. +0 −36 0002-gyp-apply-https-codereview.chromium.org-11361103.patch
  8. +0 −39 0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch
  9. +457 −0 CHANGELOG.md
  10. +34 −0 CONTRIBUTING.md
  11. +0 −41 History.md
  12. +132 −111 README.md
  13. +74 −5 addon.gypi
  14. +26 −19 bin/node-gyp.js
  15. +4 −0 gyp/.flake8
  16. +30 −0 gyp/.github/workflows/Python_tests.yml
  17. +40 −0 gyp/.github/workflows/node-gyp.yml
  18. +27 −0 gyp/.github/workflows/nodejs-windows.yml
  19. +16 −0 gyp/.github/workflows/release-please.yml
  20. +143 −1 gyp/.gitignore
  21. +7 −3 gyp/AUTHORS
  22. +112 −0 gyp/CHANGELOG.md
  23. +4 −0 gyp/CODE_OF_CONDUCT.md
  24. +32 −0 gyp/CONTRIBUTING.md
  25. +0 −24 gyp/DEPS
  26. +1 −0 gyp/LICENSE
  27. +0 −1 gyp/OWNERS
  28. +0 −137 gyp/PRESUBMIT.py
  29. +7 −0 gyp/README.md
  30. +0 −466 gyp/buildbot/aosp_manifest.xml
  31. +0 −136 gyp/buildbot/buildbot_run.py
  32. +0 −6 gyp/buildbot/commit_queue/OWNERS
  33. +0 −3 gyp/buildbot/commit_queue/README
  34. +0 −15 gyp/buildbot/commit_queue/cq_config.json
  35. +0 −10 gyp/codereview.settings
  36. +35 −6 gyp/gyp_main.py
  37. +0 −274 gyp/gyptest.py
  38. +279 −252 gyp/pylib/gyp/MSVSNew.py
  39. +115 −117 gyp/pylib/gyp/MSVSProject.py
  40. +891 −717 gyp/pylib/gyp/MSVSSettings.py
  41. +1,474 −1,410 gyp/pylib/gyp/MSVSSettings_test.py
  42. +34 −33 gyp/pylib/gyp/MSVSToolFile.py
  43. +112 −106 gyp/pylib/gyp/MSVSUserFile.py
  44. +175 −174 gyp/pylib/gyp/MSVSUtil.py
  45. +451 −335 gyp/pylib/gyp/MSVSVersion.py
  46. +585 −467 gyp/pylib/gyp/__init__.py
  47. +437 −391 gyp/pylib/gyp/common.py
  48. +53 −47 gyp/pylib/gyp/common_test.py
  49. +92 −91 gyp/pylib/gyp/easy_xml.py
  50. +94 −88 gyp/pylib/gyp/easy_xml_test.py
  51. +40 −39 gyp/pylib/gyp/flock_tool.py
  52. +598 −531 gyp/pylib/gyp/generator/analyzer.py
  53. +1,079 −1,001 gyp/pylib/gyp/generator/android.py
  54. +1,115 −1,015 gyp/pylib/gyp/generator/cmake.py
  55. +120 −0 gyp/pylib/gyp/generator/compile_commands_json.py
  56. +79 −75 gyp/pylib/gyp/generator/dump_dependency_json.py
  57. +382 −343 gyp/pylib/gyp/generator/eclipse.py
  58. +34 −39 gyp/pylib/gyp/generator/gypd.py
  59. +28 −26 gyp/pylib/gyp/generator/gypsh.py
  60. +2,019 −1,721 gyp/pylib/gyp/generator/make.py
  61. +3,151 −2,643 gyp/pylib/gyp/generator/msvs.py
  62. +32 −25 gyp/pylib/gyp/generator/msvs_test.py
  63. +2,805 −2,283 gyp/pylib/gyp/generator/ninja.py
  64. +44 −36 gyp/pylib/gyp/generator/ninja_test.py
  65. +1,285 −1,191 gyp/pylib/gyp/generator/xcode.py
  66. +10 −8 gyp/pylib/gyp/generator/xcode_test.py
  67. +2,710 −2,467 gyp/pylib/gyp/input.py
  68. +86 −78 gyp/pylib/gyp/input_test.py
  69. +627 −466 gyp/pylib/gyp/mac_tool.py
  70. +1,175 −1,008 gyp/pylib/gyp/msvs_emulation.py
  71. +69 −55 gyp/pylib/gyp/ninja_syntax.py
  72. +0 −289 gyp/pylib/gyp/ordered_dict.py
  73. +31 −16 gyp/pylib/gyp/simple_copy.py
  74. +331 −272 gyp/pylib/gyp/win_tool.py
  75. +1,670 −1,360 gyp/pylib/gyp/xcode_emulation.py
  76. +257 −225 gyp/pylib/gyp/xcode_ninja.py
  77. +2,482 −2,215 gyp/pylib/gyp/xcodeproj_file.py
  78. +39 −43 gyp/pylib/gyp/xml_fix.py
  79. +2 −0 gyp/requirements_dev.txt
  80. +0 −81 gyp/samples/samples
  81. +0 −5 gyp/samples/samples.bat
  82. +33 −10 gyp/setup.py
  83. +267 −0 gyp/test_gyp.py
  84. +1 −1 gyp/tools/README
  85. +68 −66 gyp/tools/graphviz.py
  86. +94 −93 gyp/tools/pretty_gyp.py
  87. +142 −130 gyp/tools/pretty_sln.py
  88. +271 −261 gyp/tools/pretty_vcproj.py
  89. +250 −0 lib/Find-VisualStudio.cs
  90. +56 −136 lib/build.js
  91. +6 −13 lib/clean.js
  92. +183 −255 lib/configure.js
  93. +26 −24 lib/find-node-directory.js
  94. +329 −0 lib/find-python.js
  95. +434 −0 lib/find-visualstudio.js
  96. +266 −359 lib/install.js
  97. +9 −15 lib/list.js
  98. +80 −96 lib/node-gyp.js
  99. +79 −85 lib/process-release.js
  100. +5 −6 lib/rebuild.js
  101. +11 −17 lib/remove.js
  102. +64 −0 lib/util.js
  103. +104 −0 macOS_Catalina.md
  104. +21 −0 macOS_Catalina_acid_test.sh
  105. +19 −21 package.json
  106. +9 −6 src/win_delay_load_hook.cc
  107. +3 −0 test/common.js
  108. +0 −164 test/docker.sh
  109. +1 −0 test/fixtures/VS_2017_BuildTools_minimal.txt
  110. +1 −0 test/fixtures/VS_2017_Community_workload.txt
  111. +1 −0 test/fixtures/VS_2017_Express.txt
  112. +1 −0 test/fixtures/VS_2017_Unusable.txt
  113. +1 −0 test/fixtures/VS_2019_BuildTools_minimal.txt
  114. +1 −0 test/fixtures/VS_2019_Community_workload.txt
  115. +1 −0 test/fixtures/VS_2019_Preview.txt
  116. +19 −19 test/fixtures/ca.crt
  117. +19 −17 test/fixtures/server.crt
  118. +27 −28 test/fixtures/server.key
  119. +31 −0 test/fixtures/test-charmap.py
  120. +3 −4 test/node_modules/hello_world/hello.cc
  121. +140 −0 test/process-exec-sync.js
  122. +13 −10 test/simple-proxy.js
  123. +132 −10 test/test-addon.js
  124. +79 −0 test/test-configure-python.js
  125. +172 −67 test/test-download.js
  126. +18 −20 test/test-find-accessible-sync.js
  127. +24 −20 test/test-find-node-directory.js
  128. +213 −7 test/test-find-python.js
  129. +676 −0 test/test-find-visualstudio.js
  130. +46 −0 test/test-install.js
  131. +15 −9 test/test-options.js
  132. +86 −289 test/test-process-release.js
  133. +46 −0 update-gyp.py
49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<!--
Thank you for reporting an issue!
Remember, this issue tracker is for reporting issues ONLY with node-gyp.
If you have an issue installing a specific module, please file an issue on
that module's issue tracker (`npm issues modulename`). Open issue here only if
you are sure this is an issue with node-gyp, not with the module you are
trying to build.
Fill out the form below. We probably won't investigate an issue that does not
provide the basic information we require.
-->

* **Node Version**: <!-- `node -v` and `npm -v` -->
* **Platform**: <!-- `uname -a` (UNIX), or `systeminfo | findstr /B /C:"OS Name" /C:"OS Version" /C:"System Type"` (Windows) -->
* **Compiler**: <!-- `cc -v` (UNIX) or `msbuild /version & cl` (Windows) -->
* **Module**: <!-- what you tried to build/install -->

<details><summary>Verbose output (from npm or node-gyp):</summary>

```
Paste your log here, between the backticks. It can be:
- npm --verbose output,
- or contents of npm-debug.log,
- or output of node-gyp rebuild --verbose.
Include the command you were trying to run.
This should look like this:
>npm --verbose
npm info it worked if it ends with ok
npm verb cli [
npm verb cli 'C:\\...\\node\\13.9.0\\x64\\node.exe',
npm verb cli 'C:\\...\\node\\13.9.0\\x64\\node_modules\\npm\\bin\\npm-cli.js',
npm verb cli '--verbose'
npm verb cli ]
npm info using npm@6.13.7
npm info using node@v13.9.0
Usage: npm <command>
(...)
```

</details>

<!-- Any further details -->

17 changes: 17 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!--
Thank you for your pull request. Please review the below requirements.
Contributor guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
-->

##### Checklist
<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->

- [ ] `npm install && npm test` passes
- [ ] tests are included <!-- Bug fixes and new features should include tests -->
- [ ] documentation is changed or added
- [ ] commit message follows [commit guidelines](https://github.com/nodejs/node/blob/master/doc/guides/contributing/pull-requests.md#commit-message-guidelines)

##### Description of change
<!-- Provide a description of the change -->

45 changes: 45 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# TODO: Line 43, enable pytest --doctest-modules

name: Tests
on: [push, pull_request]
jobs:
Tests:
strategy:
fail-fast: false
max-parallel: 15
matrix:
node: [10.x, 12.x, 14.x]
python: [3.6, 3.8, 3.9]
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
- name: Use Python ${{ matrix.python }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
env:
PYTHON_VERSION: ${{ matrix.python }}
- name: Install Dependencies
run: |
npm install --no-progress
pip install flake8 pytest
- name: Set Windows environment
if: matrix.os == 'windows-latest'
run: |
echo 'GYP_MSVS_VERSION=2015' >> $Env:GITHUB_ENV
echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
- name: Lint Python
if: matrix.os == 'ubuntu-latest'
run: flake8 . --ignore=E203,W503 --max-complexity=101 --max-line-length=88 --show-source --statistics
- name: Run Python tests
run: python -m pytest
# - name: Run doctests with pytest
# run: python -m pytest --doctest-modules
- name: Run Node tests
run: npm test
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
gyp/test
node_modules
test/.node-gyp
.ncu
.nyc_output
package-lock.json
7 changes: 0 additions & 7 deletions .jshintrc

This file was deleted.

35 changes: 0 additions & 35 deletions 0001-gyp-always-install-into-PRODUCT_DIR.patch

This file was deleted.

36 changes: 0 additions & 36 deletions 0002-gyp-apply-https-codereview.chromium.org-11361103.patch

This file was deleted.

39 changes: 0 additions & 39 deletions 0003-gyp-don-t-use-links-at-all-just-copy-the-files-inste.patch

This file was deleted.

Loading