Commit 79b1f04
tools: sync gyp code base with node-gyp repo
PR-URL: #30563
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent 091b4bf commit 79b1f04
28 files changed
Lines changed: 1354 additions & 821 deletions
File tree
- tools/gyp
- buildbot
- commit_queue
- pylib/gyp
- generator
- tools
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,10 +6,44 @@ | |||
| 6 | 6 | ||
| 7 | 7 | import os | |
| 8 | 8 | import sys | |
| 9 | + import subprocess | ||
| 10 | + | ||
| 11 | + PY3 = bytes != str | ||
| 12 | + | ||
| 13 | + # Below IsCygwin() function copied from pylib/gyp/common.py | ||
| 14 | + def IsCygwin(): | ||
| 15 | + try: | ||
| 16 | + out = subprocess.Popen("uname", | ||
| 17 | + stdout=subprocess.PIPE, | ||
| 18 | + stderr=subprocess.STDOUT) | ||
| 19 | + stdout, stderr = out.communicate() | ||
| 20 | + if PY3: | ||
| 21 | + stdout = stdout.decode("utf-8") | ||
| 22 | + return "CYGWIN" in str(stdout) | ||
| 23 | + except Exception: | ||
| 24 | + return False | ||
| 25 | + | ||
| 26 | + | ||
| 27 | + def UnixifyPath(path): | ||
| 28 | + try: | ||
| 29 | + if not IsCygwin(): | ||
| 30 | + return path | ||
| 31 | + out = subprocess.Popen(["cygpath", "-u", path], | ||
| 32 | + stdout=subprocess.PIPE, | ||
| 33 | + stderr=subprocess.STDOUT) | ||
| 34 | + stdout, _ = out.communicate() | ||
| 35 | + if PY3: | ||
| 36 | + stdout = stdout.decode("utf-8") | ||
| 37 | + return str(stdout) | ||
| 38 | + except Exception: | ||
| 39 | + return path | ||
| 40 | + | ||
| 9 | 41 | ||
| 10 | 42 | # Make sure we're using the version of pylib in this repo, not one installed | |
| 11 | - # elsewhere on the system. | ||
| 12 | - sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), 'pylib')) | ||
| 43 | + # elsewhere on the system. Also convert to Unix style path on Cygwin systems, | ||
| 44 | + # else the 'gyp' library will not be found | ||
| 45 | + path = UnixifyPath(sys.argv[0]) | ||
| 46 | + sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib')) | ||
| 13 | 47 | import gyp | |
| 14 | 48 | ||
| 15 | 49 | if __name__ == '__main__': | |
0 commit comments