Commit 5553cd9

Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782 PR-URL: #1817 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9

4 files changed

Lines changed: 66 additions & 4 deletions

File tree

‎gyp/gyp_main.py‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':

‎gyp/pylib/gyp/common.py‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+

‎gyp/pylib/gyp/generator/msvs.py‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
Returns:
166166
The path with all slashes made into backslashes.
167167
"""
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
it does not treat those as relative, which results in bad paths like:
181+
182+
'..\C:\<some path>\some_source_code_file.cc'
183+
"""
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]

‎lib/configure.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 5553cd9
Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782
PR-URL: #1817
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎gyp/gyp_main.py‎
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':
‎gyp/pylib/gyp/common.py‎
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
 Returns:
166166
 The path with all slashes made into backslashes.
167167
 """
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
 On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
 it does not treat those as relative, which results in bad paths like:
181+
182+
 '..\C:\<some path>\some_source_code_file.cc'
183+
 """
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]
‎lib/configure.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 5553cd9
Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782
PR-URL: #1817
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎gyp/gyp_main.py‎
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':
‎gyp/pylib/gyp/common.py‎
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
 Returns:
166166
 The path with all slashes made into backslashes.
167167
 """
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
 On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
 it does not treat those as relative, which results in bad paths like:
181+
182+
 '..\C:\<some path>\some_source_code_file.cc'
183+
 """
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]
‎lib/configure.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 5553cd9
Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782
PR-URL: #1817
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎gyp/gyp_main.py‎
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':
‎gyp/pylib/gyp/common.py‎
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
 Returns:
166166
 The path with all slashes made into backslashes.
167167
 """
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
 On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
 it does not treat those as relative, which results in bad paths like:
181+
182+
 '..\C:\<some path>\some_source_code_file.cc'
183+
 """
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]
‎lib/configure.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 5553cd9
Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782
PR-URL: #1817
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎gyp/gyp_main.py‎
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':
‎gyp/pylib/gyp/common.py‎
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
 Returns:
166166
 The path with all slashes made into backslashes.
167167
 """
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
 On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
 it does not treat those as relative, which results in bad paths like:
181+
182+
 '..\C:\<some path>\some_source_code_file.cc'
183+
 """
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]
‎lib/configure.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 5553cd9
Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782
PR-URL: #1817
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎gyp/gyp_main.py‎
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':
‎gyp/pylib/gyp/common.py‎
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
 Returns:
166166
 The path with all slashes made into backslashes.
167167
 """
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
 On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
 it does not treat those as relative, which results in bad paths like:
181+
182+
 '..\C:\<some path>\some_source_code_file.cc'
183+
 """
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]
‎lib/configure.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 5553cd9
Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782
PR-URL: #1817
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎gyp/gyp_main.py‎
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':
‎gyp/pylib/gyp/common.py‎
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
 Returns:
166166
 The path with all slashes made into backslashes.
167167
 """
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
 On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
 it does not treat those as relative, which results in bad paths like:
181+
182+
 '..\C:\<some path>\some_source_code_file.cc'
183+
 """
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]
‎lib/configure.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 5553cd9
Browse files
Jose Quijadarvagg
Jose Quijada
authored and
rvagg
committed
gyp: improve Windows+Cygwin compatibility
Fixes: #1782
PR-URL: #1817
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
1 parent 8bcb1fb commit 5553cd9
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎gyp/gyp_main.py‎
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,38 @@
66

77
importos
88
importsys
9+
importsubprocess
10+
11+
# Below IsCygwin() function copied from pylib/gyp/common.py
12+
defIsCygwin():
13+
try:
14+
out=subprocess.Popen("uname",
15+
stdout=subprocess.PIPE,
16+
stderr=subprocess.STDOUT)
17+
stdout,stderr=out.communicate()
18+
return"CYGWIN"instr(stdout)
19+
exceptException:
20+
returnFalse
21+
22+
23+
defUnixifyPath(path):
24+
try:
25+
ifnotIsCygwin():
26+
returnpath
27+
out=subprocess.Popen(["cygpath", "-u", path],
28+
stdout=subprocess.PIPE,
29+
stderr=subprocess.STDOUT)
30+
stdout,stderr=out.communicate()
31+
returnstr(stdout)
32+
exceptException:
33+
returnpath
34+
935

1036
# 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'))
37+
# elsewhere on the system. Also convert to Unix style path on Cygwin systems,
38+
# else the 'gyp' library will not be found
39+
path=UnixifyPath(sys.argv[0])
40+
sys.path.insert(0, os.path.join(os.path.dirname(path), 'pylib'))
1341
importgyp
1442

1543
if__name__=='__main__':
‎gyp/pylib/gyp/common.py‎
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importre
1010
importtempfile
1111
importsys
12+
importsubprocess
1213

1314

1415
# A minimal memoizing decorator. It'll blow up if the args aren't immutable,
@@ -337,11 +338,16 @@ def WriteOnDiff(filename):
337338
classWriter(object):
338339
"""Wrapper around file which only covers the target if it differs."""
339340
def__init__(self):
341+
# On Cygwin remove the "dir" argument because `C:` prefixed paths are treated as relative,
342+
# consequently ending up with current dir "/cygdrive/c/..." being prefixed to those, which was
343+
# obviously a non-existent path, for example: "/cygdrive/c/<some folder>/C:\<my win style abs path>".
344+
# See https://docs.python.org/2/library/tempfile.html#tempfile.mkstemp for more details
345+
base_temp_dir=""ifIsCygwin() elseos.path.dirname(filename)
340346
# Pick temporary file.
341347
tmp_fd, self.tmp_path=tempfile.mkstemp(
342348
suffix='.tmp',
343349
prefix=os.path.split(filename)[1] +'.gyp.',
344-
dir=os.path.split(filename)[0])
350+
dir=base_temp_dir)
345351
try:
346352
self.tmp_file=os.fdopen(tmp_fd, 'wb')
347353
exceptException:
@@ -611,3 +617,14 @@ def CrossCompileRequested():
611617
os.environ.get('AR_target') or
612618
os.environ.get('CC_target') or
613619
os.environ.get('CXX_target'))
620+
621+
defIsCygwin():
622+
try:
623+
out=subprocess.Popen("uname",
624+
stdout=subprocess.PIPE,
625+
stderr=subprocess.STDOUT)
626+
stdout,stderr=out.communicate()
627+
return"CYGWIN"instr(stdout)
628+
exceptException:
629+
returnFalse
630+
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def _FixPath(path):
165165
 Returns:
166166
 The path with all slashes made into backslashes.
167167
 """
168-
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$':
168+
iffixpath_prefixandpathandnotos.path.isabs(path) andnotpath[0] =='$'andnot_IsWindowsAbsPath(path):
169169
path=os.path.join(fixpath_prefix, path)
170170
path=path.replace('/', '\\')
171171
path=_NormalizedSource(path)
@@ -174,6 +174,16 @@ def _FixPath(path):
174174
returnpath
175175

176176

177+
def_IsWindowsAbsPath(path):
178+
"""
179+
 On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that
180+
 it does not treat those as relative, which results in bad paths like:
181+
182+
 '..\C:\<some path>\some_source_code_file.cc'
183+
 """
184+
returnpath.startswith('c:') orpath.startswith('C:')
185+
186+
177187
def_FixPaths(paths):
178188
"""Fix each of the paths of the list."""
179189
return [_FixPath(i) foriinpaths]
‎lib/configure.js‎
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ function configure (gyp, argv, callback) {
295295
outputDir=buildDir
296296
}
297297
varnodeGypDir=path.resolve(__dirname,'..')
298+
298299
varnodeLibFile=path.join(nodeDir,
299300
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
300301
release.name+'.lib')
@@ -308,6 +309,12 @@ function configure (gyp, argv, callback) {
308309
argv.push('-Dnode_exp_file='+nodeExpFile)
309310
}
310311
argv.push('-Dnode_gyp_dir='+nodeGypDir)
312+
313+
// Do this to keep Cygwin environments happy, else the unescaped '\' gets eaten up,
314+
// resulting in bad paths, Ex c:parentFolderfolderanotherFolder instead of c:\parentFolder\folder\anotherFolder
315+
if(win){
316+
nodeLibFile=nodeLibFile.replace(/\\/g,'\\\\')
317+
}
311318
argv.push('-Dnode_lib_file='+nodeLibFile)
312319
argv.push('-Dmodule_root_dir='+process.cwd())
313320
argv.push('-Dnode_engine='+
0 commit comments
Comments
 (0)