Commit 70f391e

Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e

1 file changed

Lines changed: 20 additions & 21 deletions

File tree

‎gyp/pylib/gyp/xcode_emulation.py‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
project, then the environment variable was empty. Starting with this
11271128
version, Xcode uses the name of the newest SDK installed.
11281129
"""
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')

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 70f391e
Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e
1 file changed
Lines changed: 20 additions & 21 deletions
File tree
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
 project, then the environment variable was empty. Starting with this
11271128
 version, Xcode uses the name of the newest SDK installed.
11281129
 """
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')
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 70f391e
Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e
1 file changed
Lines changed: 20 additions & 21 deletions
File tree
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
 project, then the environment variable was empty. Starting with this
11271128
 version, Xcode uses the name of the newest SDK installed.
11281129
 """
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')
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 70f391e
Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e
1 file changed
Lines changed: 20 additions & 21 deletions
File tree
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
 project, then the environment variable was empty. Starting with this
11271128
 version, Xcode uses the name of the newest SDK installed.
11281129
 """
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')
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 70f391e
Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e
1 file changed
Lines changed: 20 additions & 21 deletions
File tree
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
 project, then the environment variable was empty. Starting with this
11271128
 version, Xcode uses the name of the newest SDK installed.
11281129
 """
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')
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 70f391e
Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e
1 file changed
Lines changed: 20 additions & 21 deletions
File tree
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
 project, then the environment variable was empty. Starting with this
11271128
 version, Xcode uses the name of the newest SDK installed.
11281129
 """
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')
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 70f391e
Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e
1 file changed
Lines changed: 20 additions & 21 deletions
File tree
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
 project, then the environment variable was empty. Starting with this
11271128
 version, Xcode uses the name of the newest SDK installed.
11281129
 """
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')
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 70f391e
Browse files
cclaussrvagg
cclauss
authored and
rvagg
committed
gyp: fix TypeError in XcodeVersion()
PR-URL: #1939
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
1 parent 9f4f0fa commit 70f391e
1 file changed
Lines changed: 20 additions & 21 deletions
File tree
‎gyp/pylib/gyp/xcode_emulation.py‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None):
855855
# These flags reflect the compilation options used by xcode to compile
856856
# extensions.
857857
ldflags.append('-lpkstart')
858-
ifXcodeVersion() <'0900':
858+
xcode_version, _=XcodeVersion()
859+
ifxcode_version<'0900':
859860
ldflags.append(sdk_root+
860861
'/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit')
861862
ldflags.append('-fapplication-extension')
@@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None):
10881089
cache= {}
10891090
cache['BuildMachineOSBuild'] =self._BuildMachineOSBuild()
10901091

1091-
xcode, xcode_build=XcodeVersion()
1092-
cache['DTXcode'] =xcode
1092+
xcode_version, xcode_build=XcodeVersion()
1093+
cache['DTXcode'] =xcode_version
10931094
cache['DTXcodeBuild'] =xcode_build
10941095

10951096
sdk_root=self._SdkRoot(configname)
10961097
ifnotsdk_root:
10971098
sdk_root=self._DefaultSdkRoot()
10981099
cache['DTSDKName'] =sdk_root
1099-
ifxcode>='0430':
1100+
ifxcode_version>='0430':
11001101
cache['DTSDKBuild'] =self._GetSdkVersionInfoItem(
11011102
sdk_root, 'ProductBuildVersion')
11021103
else:
@@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self):
11261127
 project, then the environment variable was empty. Starting with this
11271128
 version, Xcode uses the name of the newest SDK installed.
11281129
 """
1129-
xcode_version, xcode_build=XcodeVersion()
1130+
xcode_version, _=XcodeVersion()
11301131
ifxcode_version<'0500':
11311132
return''
11321133
default_sdk_path=self._XcodeSdkPath('')
@@ -1263,10 +1264,12 @@ def XcodeVersion():
12631264
# Xcode 3.2.6
12641265
# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0
12651266
# BuildVersion: 10M2518
1266-
# Convert that to '0463', '4H1503'.
1267+
# Convert that to ('0463', '4H1503') or ('0326', '10M2518').
12671268
globalXCODE_VERSION_CACHE
12681269
ifXCODE_VERSION_CACHE:
12691270
returnXCODE_VERSION_CACHE
1271+
version=""
1272+
build=""
12701273
try:
12711274
version_list=GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
12721275
# In some circumstances xcodebuild exits 0 but doesn't return
@@ -1276,21 +1279,16 @@ def XcodeVersion():
12761279
# checking that version.
12771280
iflen(version_list) <2:
12781281
raiseGypError("xcodebuild returned unexpected results")
1279-
exceptGypError:
1280-
version=CLTVersion()
1281-
ifversion:
1282-
version=".".join(version.split(".")[:3])
1283-
else:
1282+
version=version_list[0].split()[-1] # Last word on first line
1283+
build=version_list[-1].split()[-1] # Last word on last line
1284+
exceptGypError: # Xcode not installed so look for XCode Command Line Tools
1285+
version=CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322
1286+
ifnotversion:
12841287
raiseGypError("No Xcode or CLT version detected!")
1285-
# The CLT has no build information, so we return an empty string.
1286-
version_list= [version, '']
1287-
version=version_list[0]
1288-
build=version_list[-1]
1289-
# Be careful to convert "4.2" to "0420" and "10.0" to "1000":
1290-
version=format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]),
1291-
'>04s')
1292-
ifbuild:
1293-
build=build.split()[-1]
1288+
# Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
1289+
version=version.split(".")[:3] # Just major, minor, micro
1290+
version[0] =version[0].zfill(2) # Add a leading zero if major is one digit
1291+
version= ("".join(version) +"00")[:4] # Limit to exactly four characters
12941292
XCODE_VERSION_CACHE= (version, build)
12951293
returnXCODE_VERSION_CACHE
12961294

@@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
15241522
install_name_base=xcode_settings.GetInstallNameBase()
15251523
ifinstall_name_base:
15261524
env['DYLIB_INSTALL_NAME_BASE'] =install_name_base
1527-
ifXcodeVersion() >='0500'andnotenv.get('SDKROOT'):
1525+
xcode_version, _=XcodeVersion()
1526+
ifxcode_version>='0500'andnotenv.get('SDKROOT'):
15281527
sdk_root=xcode_settings._SdkRoot(configuration)
15291528
ifnotsdk_root:
15301529
sdk_root=xcode_settings._XcodeSdkPath('')
0 commit comments
Comments
 (0)