Skip to content
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.

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

gyp: vendor in GYP3 6.0.3 #1845

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
gyp/test
.*
!.github/
!.gitignore
!.travis.yml

/gyp/test/
/gyp/testlib/

node_modules
test/.node-gyp
.ncu
.nyc_output
package-lock.json

!/test/node_modules/
/test/node_modules/hello_world/build/

/1*/
14 changes: 6 additions & 8 deletions addon.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
'win_delay_load_hook': 'true',
'product_prefix': '',

'conditions': [
[ 'node_engine=="chakracore"', {
'variables': {
'node_engine_include_dir%': 'deps/chakrashim/include'
},
}]
],

'include_dirs': [
'<(node_root_dir)/include/node',
'<(node_root_dir)/src',
Expand Down Expand Up @@ -89,6 +81,12 @@
],

'conditions': [
[ 'node_engine=="chakracore"', {
'variables': {
'node_engine_include_dir%': 'deps/chakrashim/include'
},
}],

[ 'OS=="mac"', {
'defines': [
'_DARWIN_USE_64_BIT_INODE=1'
Expand Down
3 changes: 3 additions & 0 deletions gyp/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
*.pyc
/out/
/.venv/
*.tests
13 changes: 0 additions & 13 deletions gyp/AUTHORS

This file was deleted.

24 changes: 0 additions & 24 deletions gyp/DEPS

This file was deleted.

1 change: 1 addition & 0 deletions gyp/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2009 Google Inc. All rights reserved.
Copyright (c) 2019 Refael Ackermann<[email protected]>. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

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

we might need to get legal confirmation that a stacked copyright is possible, my understanding is that it's locked in to the original claimant and you just have to live with it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Stacked copyright is the legally recommended way to claim rights of forked work. In this case, Google maintains the rights to work done till the fork.


Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down
1 change: 0 additions & 1 deletion gyp/OWNERS

This file was deleted.

138 changes: 0 additions & 138 deletions gyp/PRESUBMIT.py

This file was deleted.

8 changes: 8 additions & 0 deletions gyp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[a fork of the unmaintained [google/GYP](https://chromium.googlesource.com/external/gyp)]

[![Build Status](https://travis-ci.com/refack/GYP.svg?branch=master)](https://travis-ci.com/refack/GYP)

Generate You Projects
===================================

Documentation is available at [http://gyp3.org/](http://gyp3.org/) (or at the [`gh-pages`](https://github.com/refack/GYP/blob/gh-pages/index.md) branch).
10 changes: 0 additions & 10 deletions gyp/codereview.settings

This file was deleted.

8 changes: 0 additions & 8 deletions gyp/gyp

This file was deleted.

5 changes: 0 additions & 5 deletions gyp/gyp.bat

This file was deleted.

Loading