gyp: vendor in GYP3 6.0.3 #1845
Conversation
| @@ -421,7 +423,7 @@ def FixVCMacroSlashes(s): | |||
|
|
|||
|
|
|||
| def ConvertVCMacrosToMSBuild(s): | |||
| """Convert the MSVS macros found in the string to the MSBuild equivalent. | |||
| """Convert the the MSVS macros found in the string to the MSBuild equivalent. | |||
| @@ -476,8 +479,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr): | |||
| (msvs_tool_name, msvs_setting)), | |||
| stderr) | |||
| else: | |||
| print('Warning: unrecognized tool %s while converting to ' | |||
| 'MSBuild.' % msvs_tool_name, file=stderr) | |||
| print(('Warning: unrecognized tool %s while converting to ' | |||
| '\n' \ | ||
| ' export *\n' \ | ||
| ' module * { export * }\n' \ | ||
| '}\n' % (binary, binary) |
There was a problem hiding this comment.
Use () around the whole string and lose the backslashes.
| Returns True if |string| is a canonical integer form str. | ||
| The canonical form is such that str(int(string)) == string. | ||
| """ | ||
| if type(string) is not str: |
| from functools import reduce | ||
|
|
||
| if 'reduce' not in __builtins__: | ||
| from functools import reduce |
There was a problem hiding this comment.
This change is not need. from functools import reduce works everywhere.
|
Heyhey! Welcome back @refack, I hope. Can you give us a status update? I'd love to have you maintain refack/GYP and vendor it in here but it'd be nice to know whether you're going to be around to maintain it. Have you just been taking time off? |
| @@ -1,4 +1,5 @@ | |||
| Copyright (c) 2009 Google Inc. All rights reserved. | |||
| Copyright (c) 2019 Refael Ackermann<refack@gmail.com>. All rights reserved. | |||
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
Yep. Taking a bit of time off.
I do hope to keep maintaining GYP3 for foreseeable future (Independent of my contributions to node related stuff). |
|
A few conflicting files... |
refack
force-pushed
the
GYP3
branch
2 times, most recently
from
b21eaef
to
c2d42af
Compare
|
I think the README should be updated to reflect that we are now bundling GYP3, and not |
|
Can we please rebase this PR? |
|
Closing. The requested rebase above did not happen and I sense we are beyond the point of no return on this one. |
refack/GYP3@8806c63
Checklist
npm install && npm testpassesDescription of change