Commit 721eb69

Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM files. PR-URL: #1679 Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69

2 files changed

Lines changed: 25 additions & 8 deletions

File tree

‎gyp/pylib/gyp/MSVSSettings.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}

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

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
{'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
['Import',
33323339
{'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
['Import',
3342+
{'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
['Import',
3345+
{'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):

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 721eb69
Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM
files.
PR-URL: #1679
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69
2 files changed
Lines changed: 25 additions & 8 deletions
File tree
‎gyp/pylib/gyp/MSVSSettings.py‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
 This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
 {'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
 Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
 ['Import',
33323339
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
 ['Import',
3342+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
 ['Import',
3345+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):
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 721eb69
Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM
files.
PR-URL: #1679
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69
2 files changed
Lines changed: 25 additions & 8 deletions
File tree
‎gyp/pylib/gyp/MSVSSettings.py‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
 This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
 {'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
 Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
 ['Import',
33323339
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
 ['Import',
3342+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
 ['Import',
3345+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):
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 721eb69
Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM
files.
PR-URL: #1679
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69
2 files changed
Lines changed: 25 additions & 8 deletions
File tree
‎gyp/pylib/gyp/MSVSSettings.py‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
 This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
 {'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
 Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
 ['Import',
33323339
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
 ['Import',
3342+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
 ['Import',
3345+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):
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 721eb69
Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM
files.
PR-URL: #1679
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69
2 files changed
Lines changed: 25 additions & 8 deletions
File tree
‎gyp/pylib/gyp/MSVSSettings.py‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
 This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
 {'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
 Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
 ['Import',
33323339
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
 ['Import',
3342+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
 ['Import',
3345+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):
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 721eb69
Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM
files.
PR-URL: #1679
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69
2 files changed
Lines changed: 25 additions & 8 deletions
File tree
‎gyp/pylib/gyp/MSVSSettings.py‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
 This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
 {'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
 Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
 ['Import',
33323339
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
 ['Import',
3342+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
 ['Import',
3345+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):
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 721eb69
Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM
files.
PR-URL: #1679
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69
2 files changed
Lines changed: 25 additions & 8 deletions
File tree
‎gyp/pylib/gyp/MSVSSettings.py‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
 This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
 {'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
 Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
 ['Import',
33323339
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
 ['Import',
3342+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
 ['Import',
3345+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):
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 721eb69
Browse files
jkunkeejoaocgreis
jkunkee
authored and
joaocgreis
committed
gyp: teach MSVS generator about MARMASM Items
This change allows MSVS projects generated for ARM64 to include ASM
files.
PR-URL: #1679
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 91744bf commit 721eb69
2 files changed
Lines changed: 25 additions & 8 deletions
File tree
‎gyp/pylib/gyp/MSVSSettings.py‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ def _ValidateSettings(validators, settings, stderr):
543543
_lib=_Tool('VCLibrarianTool', 'Lib')
544544
_manifest=_Tool('VCManifestTool', 'Manifest')
545545
_masm=_Tool('MASM', 'MASM')
546+
_armasm=_Tool('ARMASM', 'ARMASM')
546547

547548

548549
_AddTool(_compile)
@@ -552,6 +553,7 @@ def _ValidateSettings(validators, settings, stderr):
552553
_AddTool(_lib)
553554
_AddTool(_manifest)
554555
_AddTool(_masm)
556+
_AddTool(_armasm)
555557
# Add sections only found in the MSBuild settings.
556558
_msbuild_validators[''] = {}
557559
_msbuild_validators['ProjectReference'] = {}
‎gyp/pylib/gyp/generator/msvs.py‎
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
20392039

20402040

20412041
def_GenerateMSBuildFiltersFile(filters_path, source_files,
2042-
rule_dependencies, extension_to_rule_name):
2042+
rule_dependencies, extension_to_rule_name,
2043+
platforms):
20432044
"""Generate the filters file.
20442045
20452046
 This file is used by Visual Studio to organize the presentation of source
@@ -2053,7 +2054,8 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20532054
filter_group= []
20542055
source_group= []
20552056
_AppendFiltersForMSBuild('', source_files, rule_dependencies,
2056-
extension_to_rule_name, filter_group, source_group)
2057+
extension_to_rule_name, platforms,
2058+
filter_group, source_group)
20572059
iffilter_group:
20582060
content= ['Project',
20592061
 {'ToolsVersion': '4.0',
@@ -2069,7 +2071,7 @@ def _GenerateMSBuildFiltersFile(filters_path, source_files,
20692071

20702072

20712073
def_AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
2072-
extension_to_rule_name,
2074+
extension_to_rule_name,platforms,
20732075
filter_group, source_group):
20742076
"""Creates the list of filters and sources to be added in the filter file.
20752077
@@ -2095,11 +2097,12 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
20952097
# Recurse and add its dependents.
20962098
_AppendFiltersForMSBuild(filter_name, source.contents,
20972099
rule_dependencies, extension_to_rule_name,
2098-
filter_group, source_group)
2100+
platforms, filter_group, source_group)
20992101
else:
21002102
# It's a source. Create a source entry.
21012103
_, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
2102-
extension_to_rule_name)
2104+
extension_to_rule_name,
2105+
platforms)
21032106
source_entry= [element, {'Include': source}]
21042107
# Specify the filter it is part of, if any.
21052108
ifparent_filter_name:
@@ -2108,7 +2111,7 @@ def _AppendFiltersForMSBuild(parent_filter_name, sources, rule_dependencies,
21082111

21092112

21102113
def_MapFileToMsBuildSourceType(source, rule_dependencies,
2111-
extension_to_rule_name):
2114+
extension_to_rule_name, platforms):
21122115
"""Returns the group and element type of the source file.
21132116
21142117
 Arguments:
@@ -2134,6 +2137,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
21342137
elifext=='.asm':
21352138
group='masm'
21362139
element='MASM'
2140+
forplatforminplatforms:
2141+
ifplatform.lower() in ['arm', 'arm64']:
2142+
element='MARMASM'
21372143
elifext=='.idl':
21382144
group='midl'
21392145
element='Midl'
@@ -3227,7 +3233,8 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
32273233
detail.append(['ForcedIncludeFiles', ''])
32283234

32293235
group, element=_MapFileToMsBuildSourceType(source, rule_dependencies,
3230-
extension_to_rule_name)
3236+
extension_to_rule_name,
3237+
_GetUniquePlatforms(spec))
32313238
grouped_sources[group].append([element, {'Include': source}] +detail)
32323239

32333240

@@ -3310,7 +3317,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33103317

33113318
_GenerateMSBuildFiltersFile(project.path+'.filters', sources,
33123319
rule_dependencies,
3313-
extension_to_rule_name)
3320+
extension_to_rule_name, _GetUniquePlatforms(spec))
33143321
missing_sources=_VerifySourcesExist(sources, project_dir)
33153322

33163323
forconfigurationinconfigurations.itervalues():
@@ -3330,6 +3337,12 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33303337
import_masm_targets_section= [
33313338
 ['Import',
33323339
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\masm.targets'}]]
3340+
import_marmasm_props_section= [
3341+
 ['Import',
3342+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.props'}]]
3343+
import_marmasm_targets_section= [
3344+
 ['Import',
3345+
 {'Project': r'$(VCTargetsPath)\BuildCustomizations\marmasm.targets'}]]
33333346
macro_section= [['PropertyGroup', {'Label': 'UserMacros'}]]
33343347

33353348
content= [
@@ -3349,6 +3362,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33493362
content+=_GetMSBuildLocalProperties(project.msbuild_toolset)
33503363
content+=import_cpp_props_section
33513364
content+=import_masm_props_section
3365+
content+=import_marmasm_props_section
33523366
content+=_GetMSBuildExtensions(props_files_of_rules)
33533367
content+=_GetMSBuildPropertySheets(configurations)
33543368
content+=macro_section
@@ -3361,6 +3375,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
33613375
content+=_GetMSBuildProjectReferences(project)
33623376
content+=import_cpp_targets_section
33633377
content+=import_masm_targets_section
3378+
content+=import_marmasm_targets_section
33643379
content+=_GetMSBuildExtensionTargets(targets_files_of_rules)
33653380

33663381
ifspec.get('msvs_external_builder'):
0 commit comments
Comments
 (0)