Bug 1654103: Standardize on Black for Python code in `mozilla-central`.

Allow-list all Python code in tree for use with the black linter, and re-format all code in-tree accordingly.

To produce this patch I did all of the following:

1. Make changes to tools/lint/black.yml to remove include: stanza and update list of source extensions.

2. Run ./mach lint --linter black --fix

3. Make some ad-hoc manual updates to python/mozbuild/mozbuild/test/configure/test_configure.py -- it has some hard-coded line numbers that the reformat breaks.

4. Make some ad-hoc manual updates to `testing/marionette/client/setup.py`, `testing/marionette/harness/setup.py`, and `testing/firefox-ui/harness/setup.py`, which have hard-coded regexes that break after the reformat.

5. Add a set of exclusions to black.yml. These will be deleted in a follow-up bug (1672023).

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D94045
This commit is contained in:
Ricky Stewart 2020-10-26 18:34:53 +00:00
Родитель 4f4f42a563
Коммит 02a7b4ebdf
3432 изменённых файлов: 164119 добавлений и 128510 удалений

Просмотреть файл

@ -12,56 +12,55 @@ import sys
old_bytecode = sys.dont_write_bytecode
sys.dont_write_bytecode = True
path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'mach'))
path = os.path.abspath(os.path.join(os.path.dirname(__file__), "mach"))
# If mach is not here, we're on the objdir go to the srcdir.
if not os.path.exists(path):
with open(os.path.join(os.path.dirname(__file__), 'mozinfo.json')) as info:
with open(os.path.join(os.path.dirname(__file__), "mozinfo.json")) as info:
config = json.loads(info.read())
path = os.path.join(config['topsrcdir'], 'mach')
path = os.path.join(config["topsrcdir"], "mach")
sys.dont_write_bytecode = old_bytecode
def _is_likely_cpp_header(filename):
if not filename.endswith('.h'):
if not filename.endswith(".h"):
return False
if filename.endswith('Inlines.h') or filename.endswith('-inl.h'):
if filename.endswith("Inlines.h") or filename.endswith("-inl.h"):
return True
cpp_file = filename[:-1] + 'cpp'
cpp_file = filename[:-1] + "cpp"
return os.path.exists(cpp_file)
def Settings(**kwargs):
if kwargs[ 'language' ] == 'cfamily':
return FlagsForFile(kwargs['filename'])
if kwargs["language"] == "cfamily":
return FlagsForFile(kwargs["filename"])
# This is useful for generic language server protocols, like rust-analyzer,
# to discover the right project root instead of guessing based on where the
# closest Cargo.toml is.
return {
'project_directory': '.',
"project_directory": ".",
}
def FlagsForFile(filename):
output = subprocess.check_output([path, 'compileflags', filename])
output = output.decode('utf-8')
output = subprocess.check_output([path, "compileflags", filename])
output = output.decode("utf-8")
flag_list = shlex.split(output)
# This flag is added by Fennec for android build and causes ycmd to fail to parse the file.
# Removing this flag is a workaround until ycmd starts to handle this flag properly.
# https://github.com/Valloric/YouCompleteMe/issues/1490
final_flags = [x for x in flag_list if not x.startswith('-march=armv')]
final_flags = [x for x in flag_list if not x.startswith("-march=armv")]
if _is_likely_cpp_header(filename):
final_flags += ["-x", "c++"]
return {
'flags': final_flags,
'do_cache': True
}
return {"flags": final_flags, "do_cache": True}
if __name__ == '__main__':
if __name__ == "__main__":
print(FlagsForFile(sys.argv[1]))

Просмотреть файл

@ -4,38 +4,39 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS.mozilla.a11y += ['AccessibleWrap.h',
'HyperTextAccessibleWrap.h',
'SessionAccessibility.h',
'TraversalRule.h',
EXPORTS.mozilla.a11y += [
"AccessibleWrap.h",
"HyperTextAccessibleWrap.h",
"SessionAccessibility.h",
"TraversalRule.h",
]
SOURCES += [
'AccessibleWrap.cpp',
'DocAccessibleWrap.cpp',
'Platform.cpp',
'ProxyAccessibleWrap.cpp',
'RootAccessibleWrap.cpp',
'SessionAccessibility.cpp',
'TraversalRule.cpp',
"AccessibleWrap.cpp",
"DocAccessibleWrap.cpp",
"Platform.cpp",
"ProxyAccessibleWrap.cpp",
"RootAccessibleWrap.cpp",
"SessionAccessibility.cpp",
"TraversalRule.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/ipc',
'/accessible/ipc/other',
'/accessible/xpcom',
'/accessible/xul',
'/dom/base',
'/widget',
'/widget/android',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/ipc",
"/accessible/ipc/other",
"/accessible/xpcom",
"/accessible/xul",
"/dom/base",
"/widget",
"/widget/android",
]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]

Просмотреть файл

@ -5,40 +5,40 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS.mozilla.dom += [
'AccessibleNode.h',
"AccessibleNode.h",
]
UNIFIED_SOURCES += [
'AccessibleNode.cpp',
"AccessibleNode.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
"/accessible/base",
"/accessible/generic",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
LOCAL_INCLUDES += [
'/accessible/windows/ia2',
'/accessible/windows/msaa',
"/accessible/windows/ia2",
"/accessible/windows/msaa",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/mac',
"/accessible/mac",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -5,61 +5,61 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'HyperTextAccessibleWrap.h',
"AccessibleWrap.h",
"HyperTextAccessibleWrap.h",
]
SOURCES += [
'AccessibleWrap.cpp',
'ApplicationAccessibleWrap.cpp',
'AtkSocketAccessible.cpp',
'DocAccessibleWrap.cpp',
'DOMtoATK.cpp',
'nsMaiHyperlink.cpp',
'nsMaiInterfaceAction.cpp',
'nsMaiInterfaceComponent.cpp',
'nsMaiInterfaceDocument.cpp',
'nsMaiInterfaceEditableText.cpp',
'nsMaiInterfaceHyperlinkImpl.cpp',
'nsMaiInterfaceHypertext.cpp',
'nsMaiInterfaceImage.cpp',
'nsMaiInterfaceSelection.cpp',
'nsMaiInterfaceTable.cpp',
'nsMaiInterfaceTableCell.cpp',
'nsMaiInterfaceText.cpp',
'nsMaiInterfaceValue.cpp',
'Platform.cpp',
'RootAccessibleWrap.cpp',
'UtilInterface.cpp',
"AccessibleWrap.cpp",
"ApplicationAccessibleWrap.cpp",
"AtkSocketAccessible.cpp",
"DocAccessibleWrap.cpp",
"DOMtoATK.cpp",
"nsMaiHyperlink.cpp",
"nsMaiInterfaceAction.cpp",
"nsMaiInterfaceComponent.cpp",
"nsMaiInterfaceDocument.cpp",
"nsMaiInterfaceEditableText.cpp",
"nsMaiInterfaceHyperlinkImpl.cpp",
"nsMaiInterfaceHypertext.cpp",
"nsMaiInterfaceImage.cpp",
"nsMaiInterfaceSelection.cpp",
"nsMaiInterfaceTable.cpp",
"nsMaiInterfaceTableCell.cpp",
"nsMaiInterfaceText.cpp",
"nsMaiInterfaceValue.cpp",
"Platform.cpp",
"RootAccessibleWrap.cpp",
"UtilInterface.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/ipc',
'/accessible/ipc/other',
'/accessible/xpcom',
'/accessible/xul',
'/other-licenses/atk-1.0',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/ipc",
"/accessible/ipc/other",
"/accessible/xpcom",
"/accessible/xul",
"/other-licenses/atk-1.0",
]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
CFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CFLAGS += CONFIG["TK_CFLAGS"]
CXXFLAGS += CONFIG["TK_CFLAGS"]
if CONFIG['MOZ_ENABLE_DBUS']:
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
if CONFIG["MOZ_ENABLE_DBUS"]:
CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
# Used in G_DEFINE_TYPE_EXTENDED macro, probably fixed in newer glib /
# gobject headers. See bug 1243331 comment 3.
CXXFLAGS += [
'-Wno-error=unused-function',
'-Wno-error=shadow',
'-Wno-unused-local-typedefs',
"-Wno-error=unused-function",
"-Wno-error=shadow",
"-Wno-unused-local-typedefs",
]

Просмотреть файл

@ -4,117 +4,114 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS += [
'AccEvent.h',
'nsAccessibilityService.h'
]
EXPORTS += ["AccEvent.h", "nsAccessibilityService.h"]
EXPORTS.mozilla.a11y += [
'AccTypes.h',
'DocManager.h',
'FocusManager.h',
'IDSet.h',
'Platform.h',
'RelationType.h',
'Role.h',
'SelectionManager.h',
'States.h',
"AccTypes.h",
"DocManager.h",
"FocusManager.h",
"IDSet.h",
"Platform.h",
"RelationType.h",
"Role.h",
"SelectionManager.h",
"States.h",
]
if CONFIG['MOZ_DEBUG']:
if CONFIG["MOZ_DEBUG"]:
EXPORTS.mozilla.a11y += [
'Logging.h',
"Logging.h",
]
UNIFIED_SOURCES += [
'AccessibleOrProxy.cpp',
'AccEvent.cpp',
'AccGroupInfo.cpp',
'AccIterator.cpp',
'ARIAMap.cpp',
'ARIAStateMap.cpp',
'Asserts.cpp',
'DocManager.cpp',
'EmbeddedObjCollector.cpp',
'EventQueue.cpp',
'EventTree.cpp',
'Filters.cpp',
'FocusManager.cpp',
'NotificationController.cpp',
'nsAccessibilityService.cpp',
'nsAccessiblePivot.cpp',
'nsAccUtils.cpp',
'nsCoreUtils.cpp',
'nsEventShell.cpp',
'nsTextEquivUtils.cpp',
'Pivot.cpp',
'SelectionManager.cpp',
'StyleInfo.cpp',
'TextAttrs.cpp',
'TextRange.cpp',
'TextUpdater.cpp',
'TreeWalker.cpp',
"AccessibleOrProxy.cpp",
"AccEvent.cpp",
"AccGroupInfo.cpp",
"AccIterator.cpp",
"ARIAMap.cpp",
"ARIAStateMap.cpp",
"Asserts.cpp",
"DocManager.cpp",
"EmbeddedObjCollector.cpp",
"EventQueue.cpp",
"EventTree.cpp",
"Filters.cpp",
"FocusManager.cpp",
"NotificationController.cpp",
"nsAccessibilityService.cpp",
"nsAccessiblePivot.cpp",
"nsAccUtils.cpp",
"nsCoreUtils.cpp",
"nsEventShell.cpp",
"nsTextEquivUtils.cpp",
"Pivot.cpp",
"SelectionManager.cpp",
"StyleInfo.cpp",
"TextAttrs.cpp",
"TextRange.cpp",
"TextUpdater.cpp",
"TreeWalker.cpp",
]
if CONFIG['A11Y_LOG']:
if CONFIG["A11Y_LOG"]:
UNIFIED_SOURCES += [
'Logging.cpp',
"Logging.cpp",
]
LOCAL_INCLUDES += [
'/accessible/generic',
'/accessible/html',
'/accessible/ipc',
'/dom/base',
'/dom/xul',
"/accessible/generic",
"/accessible/html",
"/accessible/ipc",
"/dom/base",
"/dom/xul",
]
if CONFIG['OS_ARCH'] == 'WINNT':
if CONFIG["OS_ARCH"] == "WINNT":
LOCAL_INCLUDES += [
'/accessible/ipc/win',
"/accessible/ipc/win",
]
else:
LOCAL_INCLUDES += [
'/accessible/ipc/other',
"/accessible/ipc/other",
]
LOCAL_INCLUDES += [
'/accessible/xpcom',
'/accessible/xul',
'/dom/base',
'/ipc/chromium/src',
'/layout/generic',
'/layout/style',
'/layout/xul',
'/layout/xul/tree/',
"/accessible/xpcom",
"/accessible/xul",
"/dom/base",
"/ipc/chromium/src",
"/layout/generic",
"/layout/style",
"/layout/xul",
"/layout/xul/tree/",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
CXXFLAGS += CONFIG["MOZ_CAIRO_CFLAGS"]
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
LOCAL_INCLUDES += [
'/accessible/windows/ia2',
'/accessible/windows/msaa',
"/accessible/windows/ia2",
"/accessible/windows/msaa",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/mac',
"/accessible/mac",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]

Просмотреть файл

@ -5,73 +5,73 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS.mozilla.a11y += [
'Accessible.h',
'DocAccessible.h',
'HyperTextAccessible.h',
'OuterDocAccessible.h',
"Accessible.h",
"DocAccessible.h",
"HyperTextAccessible.h",
"OuterDocAccessible.h",
]
UNIFIED_SOURCES += [
'Accessible.cpp',
'ApplicationAccessible.cpp',
'ARIAGridAccessible.cpp',
'BaseAccessibles.cpp',
'DocAccessible.cpp',
'FormControlAccessible.cpp',
'HyperTextAccessible.cpp',
'ImageAccessible.cpp',
'OuterDocAccessible.cpp',
'RootAccessible.cpp',
'TableAccessible.cpp',
'TableCellAccessible.cpp',
'TextLeafAccessible.cpp',
"Accessible.cpp",
"ApplicationAccessible.cpp",
"ARIAGridAccessible.cpp",
"BaseAccessibles.cpp",
"DocAccessible.cpp",
"FormControlAccessible.cpp",
"HyperTextAccessible.cpp",
"ImageAccessible.cpp",
"OuterDocAccessible.cpp",
"RootAccessible.cpp",
"TableAccessible.cpp",
"TableCellAccessible.cpp",
"TextLeafAccessible.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/html',
'/accessible/xpcom',
'/accessible/xul',
'/dom/base',
'/dom/xul',
'/layout/generic',
'/layout/xul',
"/accessible/base",
"/accessible/html",
"/accessible/xpcom",
"/accessible/xul",
"/dom/base",
"/dom/xul",
"/layout/generic",
"/layout/xul",
]
if CONFIG['OS_ARCH'] == 'WINNT':
if CONFIG["OS_ARCH"] == "WINNT":
LOCAL_INCLUDES += [
'/accessible/ipc/win',
"/accessible/ipc/win",
]
else:
LOCAL_INCLUDES += [
'/accessible/ipc/other',
"/accessible/ipc/other",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
LOCAL_INCLUDES += [
'/accessible/windows/ia2',
'/accessible/windows/msaa',
"/accessible/windows/ia2",
"/accessible/windows/msaa",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/mac',
"/accessible/mac",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]

Просмотреть файл

@ -5,51 +5,51 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
UNIFIED_SOURCES += [
'HTMLCanvasAccessible.cpp',
'HTMLElementAccessibles.cpp',
'HTMLFormControlAccessible.cpp',
'HTMLImageMapAccessible.cpp',
'HTMLLinkAccessible.cpp',
'HTMLListAccessible.cpp',
'HTMLSelectAccessible.cpp',
'HTMLTableAccessible.cpp',
"HTMLCanvasAccessible.cpp",
"HTMLElementAccessibles.cpp",
"HTMLFormControlAccessible.cpp",
"HTMLImageMapAccessible.cpp",
"HTMLLinkAccessible.cpp",
"HTMLListAccessible.cpp",
"HTMLSelectAccessible.cpp",
"HTMLTableAccessible.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/xpcom',
'/layout/forms',
'/layout/generic',
'/layout/tables',
'/layout/xul',
"/accessible/base",
"/accessible/generic",
"/accessible/xpcom",
"/layout/forms",
"/layout/generic",
"/layout/tables",
"/layout/xul",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
LOCAL_INCLUDES += [
'/accessible/windows/ia2',
'/accessible/windows/msaa',
"/accessible/windows/ia2",
"/accessible/windows/msaa",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/mac',
"/accessible/mac",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]

Просмотреть файл

@ -4,30 +4,36 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GeneratedFile('IGeckoCustom.h', 'IGeckoCustom_p.c', 'IGeckoCustom_i.c',
'IGeckoCustom_dlldata.c', 'IGeckoCustom.tlb',
inputs=['IGeckoCustom.idl'],
script='/build/midl.py', entry_point='midl',
flags=['-dlldata', OBJDIR + '/IGeckoCustom_dlldata.c'])
GeneratedFile(
"IGeckoCustom.h",
"IGeckoCustom_p.c",
"IGeckoCustom_i.c",
"IGeckoCustom_dlldata.c",
"IGeckoCustom.tlb",
inputs=["IGeckoCustom.idl"],
script="/build/midl.py",
entry_point="midl",
flags=["-dlldata", OBJDIR + "/IGeckoCustom_dlldata.c"],
)
SOURCES += [
'!IGeckoCustom_dlldata.c',
'!IGeckoCustom_i.c',
'!IGeckoCustom_p.c',
"!IGeckoCustom_dlldata.c",
"!IGeckoCustom_i.c",
"!IGeckoCustom_p.c",
]
EXPORTS += [
'!IGeckoCustom.h',
'!IGeckoCustom_i.c',
"!IGeckoCustom.h",
"!IGeckoCustom_i.c",
]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
# Suppress warnings from the MIDL generated code.
if CONFIG['CC_TYPE'] == 'clang-cl':
if CONFIG["CC_TYPE"] == "clang-cl":
CFLAGS += [
'-Wno-extern-initializer',
'-Wno-incompatible-pointer-types',
'-Wno-missing-braces',
'-Wno-unused-const-variable',
"-Wno-extern-initializer",
"-Wno-incompatible-pointer-types",
"-Wno-missing-braces",
"-Wno-unused-const-variable",
]

Просмотреть файл

@ -4,94 +4,128 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GeckoSharedLibrary('IA2Marshal', linkage=None)
GeckoSharedLibrary("IA2Marshal", linkage=None)
DEFINES['REGISTER_PROXY_DLL'] = True
DEFINES["REGISTER_PROXY_DLL"] = True
DEFFILE = 'IA2Marshal.def'
DEFFILE = "IA2Marshal.def"
OS_LIBS += [
'uuid',
'kernel32',
'rpcrt4',
'ole32',
'oleaut32',
"uuid",
"kernel32",
"rpcrt4",
"ole32",
"oleaut32",
]
midl_enums = [
'AccessibleEventId',
'AccessibleRole',
'AccessibleStates',
'IA2CommonTypes',
"AccessibleEventId",
"AccessibleRole",
"AccessibleStates",
"IA2CommonTypes",
]
midl_interfaces = [
'Accessible2',
'Accessible2_2',
'Accessible2_3',
'AccessibleAction',
'AccessibleApplication',
'AccessibleComponent',
'AccessibleDocument',
'AccessibleEditableText',
'AccessibleHyperlink',
'AccessibleHypertext',
'AccessibleHypertext2',
'AccessibleImage',
'AccessibleRelation',
'AccessibleTable',
'AccessibleTable2',
'AccessibleTableCell',
'AccessibleText',
'AccessibleText2',
'AccessibleValue',
"Accessible2",
"Accessible2_2",
"Accessible2_3",
"AccessibleAction",
"AccessibleApplication",
"AccessibleComponent",
"AccessibleDocument",
"AccessibleEditableText",
"AccessibleHyperlink",
"AccessibleHypertext",
"AccessibleHypertext2",
"AccessibleImage",
"AccessibleRelation",
"AccessibleTable",
"AccessibleTable2",
"AccessibleTableCell",
"AccessibleText",
"AccessibleText2",
"AccessibleValue",
]
for enum in midl_enums:
GeneratedFile(enum + '.h', inputs=['/other-licenses/ia2/' + enum + '.idl'],
script='/build/midl.py', entry_point='midl',
flags=['-app_config', '-I', TOPSRCDIR + '/other-licenses/ia2'])
GeneratedFile(
enum + ".h",
inputs=["/other-licenses/ia2/" + enum + ".idl"],
script="/build/midl.py",
entry_point="midl",
flags=["-app_config", "-I", TOPSRCDIR + "/other-licenses/ia2"],
)
EXPORTS += ['!' + enum + '.h']
EXPORTS += ["!" + enum + ".h"]
for iface in midl_interfaces:
GeneratedFile(iface + '.h', iface + '_p.c', iface + '_i.c', iface + '_dlldata.c',
inputs=['/other-licenses/ia2/' + iface + '.idl'],
script='/build/midl.py', entry_point='midl',
flags=['-app_config', '-I', TOPSRCDIR + '/other-licenses/ia2',
'-dlldata', OBJDIR + '/' + iface + '_dlldata.c'])
GeneratedFile(
iface + ".h",
iface + "_p.c",
iface + "_i.c",
iface + "_dlldata.c",
inputs=["/other-licenses/ia2/" + iface + ".idl"],
script="/build/midl.py",
entry_point="midl",
flags=[
"-app_config",
"-I",
TOPSRCDIR + "/other-licenses/ia2",
"-dlldata",
OBJDIR + "/" + iface + "_dlldata.c",
],
)
EXPORTS += ['!' + iface + '.h', '!' + iface + '_i.c']
EXPORTS += ["!" + iface + ".h", "!" + iface + "_i.c"]
for p in [iface + '_p.c', iface + '_i.c']:
SOURCES += ['!%s' % p]
for p in [iface + "_p.c", iface + "_i.c"]:
SOURCES += ["!%s" % p]
# Give some symbols a unique name in each translation unit, to avoid
# collisions caused by https://llvm.org/pr41817.
if CONFIG['CC_TYPE'] == 'clang-cl':
SOURCES['!%s' % p].flags += ['-DObject_StubDesc=Object_StubDesc__%s' % p[:-2]]
SOURCES['!%s' % p].flags += ['-DUserMarshalRoutines=UserMarshalRoutines__%s' % p[:-2]]
if CONFIG["CC_TYPE"] == "clang-cl":
SOURCES["!%s" % p].flags += [
"-DObject_StubDesc=Object_StubDesc__%s" % p[:-2]
]
SOURCES["!%s" % p].flags += [
"-DUserMarshalRoutines=UserMarshalRoutines__%s" % p[:-2]
]
# Warning: the build system doesn't know about the dependency of IA2Marshal.rc on
# IA2Typelib.tlb. We rely on the IA2Typelib.h output forcing the command to run
# during export, before rc files are treated during compile.
GeneratedFile('IA2Typelib.h', 'IA2Typelib_i.c', 'IA2Typelib.tlb',
inputs=['IA2Typelib.idl'], script='/build/midl.py', entry_point='midl',
flags=['-app_config', '-I', TOPSRCDIR + '/other-licenses/ia2',
'-D', '_MIDL_DECLARE_WIREM_HANDLE'])
GeneratedFile(
"IA2Typelib.h",
"IA2Typelib_i.c",
"IA2Typelib.tlb",
inputs=["IA2Typelib.idl"],
script="/build/midl.py",
entry_point="midl",
flags=[
"-app_config",
"-I",
TOPSRCDIR + "/other-licenses/ia2",
"-D",
"_MIDL_DECLARE_WIREM_HANDLE",
],
)
GeneratedFile('dlldata.c', inputs=['!' + iface + '_dlldata.c' for iface in midl_interfaces],
script='/build/midl.py', entry_point='merge_dlldata')
GeneratedFile(
"dlldata.c",
inputs=["!" + iface + "_dlldata.c" for iface in midl_interfaces],
script="/build/midl.py",
entry_point="merge_dlldata",
)
SOURCES += ['!dlldata.c']
SOURCES += ["!dlldata.c"]
RCINCLUDE = 'IA2Marshal.rc'
RCINCLUDE = "IA2Marshal.rc"
# Suppress warnings from the MIDL generated code.
if CONFIG['CC_TYPE'] == 'clang-cl':
if CONFIG["CC_TYPE"] == "clang-cl":
CFLAGS += [
'-Wno-extern-initializer',
'-Wno-incompatible-pointer-types',
'-Wno-missing-braces',
'-Wno-unused-const-variable',
"-Wno-extern-initializer",
"-Wno-incompatible-pointer-types",
"-Wno-missing-braces",
"-Wno-unused-const-variable",
]

Просмотреть файл

@ -4,42 +4,42 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows' and CONFIG['COMPILE_ENVIRONMENT']:
DIRS += ['gecko', 'msaa', 'ia2']
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows" and CONFIG["COMPILE_ENVIRONMENT"]:
DIRS += ["gecko", "msaa", "ia2"]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
XPIDL_SOURCES += ['nsIAccessibleMacInterface.idl']
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
XPIDL_SOURCES += ["nsIAccessibleMacInterface.idl"]
XPIDL_SOURCES += [
'nsIAccessibilityService.idl',
'nsIAccessible.idl',
'nsIAccessibleAnnouncementEvent.idl',
'nsIAccessibleApplication.idl',
'nsIAccessibleCaretMoveEvent.idl',
'nsIAccessibleDocument.idl',
'nsIAccessibleEditableText.idl',
'nsIAccessibleEvent.idl',
'nsIAccessibleHideEvent.idl',
'nsIAccessibleHyperLink.idl',
'nsIAccessibleHyperText.idl',
'nsIAccessibleImage.idl',
'nsIAccessibleObjectAttributeChangedEvent.idl',
'nsIAccessiblePivot.idl',
'nsIAccessibleRelation.idl',
'nsIAccessibleRole.idl',
'nsIAccessibleScrollingEvent.idl',
'nsIAccessibleSelectable.idl',
'nsIAccessibleStateChangeEvent.idl',
'nsIAccessibleStates.idl',
'nsIAccessibleTable.idl',
'nsIAccessibleTableChangeEvent.idl',
'nsIAccessibleText.idl',
'nsIAccessibleTextChangeEvent.idl',
'nsIAccessibleTextRange.idl',
'nsIAccessibleTextSelectionChangeEvent.idl',
'nsIAccessibleTypes.idl',
'nsIAccessibleValue.idl',
'nsIAccessibleVirtualCursorChangeEvent.idl',
"nsIAccessibilityService.idl",
"nsIAccessible.idl",
"nsIAccessibleAnnouncementEvent.idl",
"nsIAccessibleApplication.idl",
"nsIAccessibleCaretMoveEvent.idl",
"nsIAccessibleDocument.idl",
"nsIAccessibleEditableText.idl",
"nsIAccessibleEvent.idl",
"nsIAccessibleHideEvent.idl",
"nsIAccessibleHyperLink.idl",
"nsIAccessibleHyperText.idl",
"nsIAccessibleImage.idl",
"nsIAccessibleObjectAttributeChangedEvent.idl",
"nsIAccessiblePivot.idl",
"nsIAccessibleRelation.idl",
"nsIAccessibleRole.idl",
"nsIAccessibleScrollingEvent.idl",
"nsIAccessibleSelectable.idl",
"nsIAccessibleStateChangeEvent.idl",
"nsIAccessibleStates.idl",
"nsIAccessibleTable.idl",
"nsIAccessibleTableChangeEvent.idl",
"nsIAccessibleText.idl",
"nsIAccessibleTextChangeEvent.idl",
"nsIAccessibleTextRange.idl",
"nsIAccessibleTextSelectionChangeEvent.idl",
"nsIAccessibleTypes.idl",
"nsIAccessibleValue.idl",
"nsIAccessibleVirtualCursorChangeEvent.idl",
]
XPIDL_MODULE = 'accessibility'
XPIDL_MODULE = "accessibility"

Просмотреть файл

@ -4,48 +4,54 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GeckoSharedLibrary('AccessibleMarshal', linkage=None)
GeckoSharedLibrary("AccessibleMarshal", linkage=None)
# Missing here, is the notion that changes to the idl files included by
# ISimpleDOM.idl (e.g. ISimpleDOMNode.idl) should rebuild the outputs.
GeneratedFile('ISimpleDOM.h', 'ISimpleDOM_p.c', 'ISimpleDOM_i.c',
'ISimpleDOM_dlldata.c', 'ISimpleDOM.tlb',
inputs=['ISimpleDOM.idl'],
script='/build/midl.py', entry_point='midl',
flags=['-I', SRCDIR, '-robust', '-dlldata', OBJDIR + '/ISimpleDOM_dlldata.c'])
GeneratedFile(
"ISimpleDOM.h",
"ISimpleDOM_p.c",
"ISimpleDOM_i.c",
"ISimpleDOM_dlldata.c",
"ISimpleDOM.tlb",
inputs=["ISimpleDOM.idl"],
script="/build/midl.py",
entry_point="midl",
flags=["-I", SRCDIR, "-robust", "-dlldata", OBJDIR + "/ISimpleDOM_dlldata.c"],
)
SOURCES += [
'!ISimpleDOM_dlldata.c',
'!ISimpleDOM_i.c',
'!ISimpleDOM_p.c',
'AccessibleMarshalThunk.c',
"!ISimpleDOM_dlldata.c",
"!ISimpleDOM_i.c",
"!ISimpleDOM_p.c",
"AccessibleMarshalThunk.c",
]
EXPORTS += [
'!ISimpleDOM.h',
'!ISimpleDOM_i.c',
"!ISimpleDOM.h",
"!ISimpleDOM_i.c",
]
DEFINES['REGISTER_PROXY_DLL'] = True
DEFINES["REGISTER_PROXY_DLL"] = True
# The following line is required to preserve compatibility with older versions
# of AccessibleMarshal.dll.
DEFINES['PROXY_CLSID'] = 'IID_ISimpleDOMNode'
DEFINES["PROXY_CLSID"] = "IID_ISimpleDOMNode"
DEFFILE = 'AccessibleMarshal.def'
DEFFILE = "AccessibleMarshal.def"
OS_LIBS += [
'kernel32',
'rpcrt4',
'oleaut32',
"kernel32",
"rpcrt4",
"oleaut32",
]
RCINCLUDE = 'AccessibleMarshal.rc'
RCINCLUDE = "AccessibleMarshal.rc"
# Suppress warnings from the MIDL generated code.
if CONFIG['CC_TYPE'] == 'clang-cl':
if CONFIG["CC_TYPE"] == "clang-cl":
CFLAGS += [
'-Wno-extern-initializer',
'-Wno-incompatible-pointer-types',
'-Wno-missing-braces',
'-Wno-unused-const-variable',
"-Wno-extern-initializer",
"-Wno-incompatible-pointer-types",
"-Wno-missing-braces",
"-Wno-unused-const-variable",
]

Просмотреть файл

@ -4,26 +4,26 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['ACCESSIBILITY']:
IPDL_SOURCES += ['PDocAccessiblePlatformExt.ipdl']
if CONFIG["ACCESSIBILITY"]:
IPDL_SOURCES += ["PDocAccessiblePlatformExt.ipdl"]
EXPORTS.mozilla.a11y += [
'DocAccessiblePlatformExtChild.h',
'DocAccessiblePlatformExtParent.h',
"DocAccessiblePlatformExtChild.h",
"DocAccessiblePlatformExtParent.h",
]
SOURCES += [
'DocAccessiblePlatformExtChild.cpp',
'DocAccessiblePlatformExtParent.cpp',
"DocAccessiblePlatformExtChild.cpp",
"DocAccessiblePlatformExtParent.cpp",
]
LOCAL_INCLUDES += [
'/accessible/android',
'/accessible/generic',
'/accessible/ipc/other',
'/widget/android',
"/accessible/android",
"/accessible/generic",
"/accessible/ipc/other",
"/widget/android",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -4,25 +4,25 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['ACCESSIBILITY']:
IPDL_SOURCES += ['PDocAccessiblePlatformExt.ipdl']
if CONFIG["ACCESSIBILITY"]:
IPDL_SOURCES += ["PDocAccessiblePlatformExt.ipdl"]
EXPORTS.mozilla.a11y += [
'DocAccessiblePlatformExtChild.h',
'DocAccessiblePlatformExtParent.h',
"DocAccessiblePlatformExtChild.h",
"DocAccessiblePlatformExtParent.h",
]
SOURCES += [
'DocAccessiblePlatformExtChild.cpp',
"DocAccessiblePlatformExtChild.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/ipc/other',
'/accessible/mac',
"/accessible/base",
"/accessible/generic",
"/accessible/ipc/other",
"/accessible/mac",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -4,11 +4,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
toolkit = CONFIG["MOZ_WIDGET_TOOLKIT"]
if toolkit == 'android':
DIRS += ['android']
elif toolkit == 'cocoa':
DIRS += ['mac']
if toolkit == "android":
DIRS += ["android"]
elif toolkit == "cocoa":
DIRS += ["mac"]
else:
DIRS += ['other']
DIRS += ["other"]

Просмотреть файл

@ -4,14 +4,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['ACCESSIBILITY']:
IPDL_SOURCES += ['PDocAccessiblePlatformExt.ipdl']
if CONFIG["ACCESSIBILITY"]:
IPDL_SOURCES += ["PDocAccessiblePlatformExt.ipdl"]
EXPORTS.mozilla.a11y += [
'DocAccessiblePlatformExtChild.h',
'DocAccessiblePlatformExtParent.h',
"DocAccessiblePlatformExtChild.h",
"DocAccessiblePlatformExtParent.h",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -4,65 +4,65 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['OS_ARCH'] == 'WINNT':
DIRS += ['win']
if CONFIG["OS_ARCH"] == "WINNT":
DIRS += ["win"]
LOCAL_INCLUDES += [
'/accessible/ipc/win',
'/accessible/windows/ia2',
'/accessible/windows/msaa',
"/accessible/ipc/win",
"/accessible/windows/ia2",
"/accessible/windows/msaa",
]
else:
DIRS += ['other', 'extension']
DIRS += ["other", "extension"]
LOCAL_INCLUDES += [
'/accessible/ipc/other',
"/accessible/ipc/other",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/mac',
"/accessible/mac",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
EXPORTS.mozilla.a11y += [
'IPCTypes.h',
"IPCTypes.h",
]
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]
if CONFIG['ACCESSIBILITY']:
if CONFIG["ACCESSIBILITY"]:
EXPORTS.mozilla.a11y += [
'DocAccessibleChildBase.h',
'DocAccessibleParent.h',
'ProxyAccessibleBase.h',
'ProxyAccessibleShared.h',
"DocAccessibleChildBase.h",
"DocAccessibleParent.h",
"ProxyAccessibleBase.h",
"ProxyAccessibleShared.h",
]
UNIFIED_SOURCES += [
'DocAccessibleChildBase.cpp',
'DocAccessibleParent.cpp',
'ProxyAccessibleBase.cpp',
"DocAccessibleChildBase.cpp",
"DocAccessibleParent.cpp",
"ProxyAccessibleBase.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/xpcom',
"/accessible/base",
"/accessible/generic",
"/accessible/xpcom",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
include("/tools/fuzzing/libfuzzer-config.mozbuild")

Просмотреть файл

@ -5,48 +5,48 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['ACCESSIBILITY']:
IPDL_SOURCES += ['PDocAccessible.ipdl']
if CONFIG["ACCESSIBILITY"]:
IPDL_SOURCES += ["PDocAccessible.ipdl"]
EXPORTS.mozilla.a11y += [
'DocAccessibleChild.h',
'ProxyAccessible.h',
"DocAccessibleChild.h",
"ProxyAccessible.h",
]
SOURCES += [
'DocAccessibleChild.cpp',
'ProxyAccessible.cpp',
"DocAccessibleChild.cpp",
"ProxyAccessible.cpp",
]
LOCAL_INCLUDES += [
'../../base',
'../../generic',
'../../xpcom',
"../../base",
"../../generic",
"../../xpcom",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/mac',
"/accessible/mac",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
include("/tools/fuzzing/libfuzzer-config.mozbuild")
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -4,16 +4,16 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
SharedLibrary('AccessibleHandler')
SharedLibrary("AccessibleHandler")
EXPORTS.mozilla.a11y += [
'AccessibleHandler.h',
'HandlerDataCleanup.h',
"AccessibleHandler.h",
"HandlerDataCleanup.h",
]
LOCAL_INCLUDES += [
'/accessible/interfaces/ia2',
'/ipc/mscom/oop',
"/accessible/interfaces/ia2",
"/ipc/mscom/oop",
]
# We want to generate distinct UUIDs on a per-channel basis, so we need
@ -21,79 +21,103 @@ LOCAL_INCLUDES += [
# These defines allow us to separate local builds from automated builds,
# as well as separate beta from release.
flags = []
if CONFIG['MOZ_UPDATE_CHANNEL'] == 'default':
flags += ['-DUSE_LOCAL_UUID']
elif CONFIG['MOZ_UPDATE_CHANNEL'] == 'beta':
flags += ['-DUSE_BETA_UUID']
if CONFIG["MOZ_UPDATE_CHANNEL"] == "default":
flags += ["-DUSE_LOCAL_UUID"]
elif CONFIG["MOZ_UPDATE_CHANNEL"] == "beta":
flags += ["-DUSE_BETA_UUID"]
GeneratedFile('HandlerData.h', 'HandlerData_p.c', 'HandlerData_i.c', 'HandlerData_c.c',
'HandlerData_dlldata.c', 'HandlerData.tlb',
inputs=['HandlerData.idl'],
script='/build/midl.py', entry_point='midl',
flags=flags + ['-I', TOPOBJDIR, '-I', TOPOBJDIR + '/dist/include',
'-I', TOPSRCDIR + '/other-licenses/ia2', '-I', SRCDIR,
'-acf', SRCDIR + '/HandlerData.acf',
'-dlldata', OBJDIR + '/HandlerData_dlldata.c'])
GeneratedFile(
"HandlerData.h",
"HandlerData_p.c",
"HandlerData_i.c",
"HandlerData_c.c",
"HandlerData_dlldata.c",
"HandlerData.tlb",
inputs=["HandlerData.idl"],
script="/build/midl.py",
entry_point="midl",
flags=flags
+ [
"-I",
TOPOBJDIR,
"-I",
TOPOBJDIR + "/dist/include",
"-I",
TOPSRCDIR + "/other-licenses/ia2",
"-I",
SRCDIR,
"-acf",
SRCDIR + "/HandlerData.acf",
"-dlldata",
OBJDIR + "/HandlerData_dlldata.c",
],
)
SOURCES += [
'!HandlerData_c.c',
'!HandlerData_dlldata.c',
'!HandlerData_i.c',
'!HandlerData_p.c',
'AccessibleHandler.cpp',
'AccessibleHandlerControl.cpp',
'HandlerChildEnumerator.cpp',
'HandlerRelation.cpp',
'HandlerTextLeaf.cpp',
"!HandlerData_c.c",
"!HandlerData_dlldata.c",
"!HandlerData_i.c",
"!HandlerData_p.c",
"AccessibleHandler.cpp",
"AccessibleHandlerControl.cpp",
"HandlerChildEnumerator.cpp",
"HandlerRelation.cpp",
"HandlerTextLeaf.cpp",
]
EXPORTS += [
'!HandlerData.h',
'!HandlerData_i.c',
"!HandlerData.h",
"!HandlerData_i.c",
]
# Give some symbols a unique name in each translation unit, to avoid
# collisions caused by https://llvm.org/pr41817.
if CONFIG['CC_TYPE'] == 'clang-cl':
SOURCES['!HandlerData_p.c'].flags += ['-DHandlerData__MIDL_ProcFormatString=HandlerData__MIDL_ProcFormatString__HandlerData_p']
SOURCES['!HandlerData_p.c'].flags += ['-DHandlerData__MIDL_TypeFormatString=HandlerData__MIDL_TypeFormatString__HandlerData_p']
for p in ('dlldata', 'c', 'i', 'p'):
SOURCES['!HandlerData_%s.c' % p].flags += ['-DUserMarshalRoutines=UserMarshalRoutines__HandlerData_%s' % p]
if CONFIG["CC_TYPE"] == "clang-cl":
SOURCES["!HandlerData_p.c"].flags += [
"-DHandlerData__MIDL_ProcFormatString=HandlerData__MIDL_ProcFormatString__HandlerData_p"
]
SOURCES["!HandlerData_p.c"].flags += [
"-DHandlerData__MIDL_TypeFormatString=HandlerData__MIDL_TypeFormatString__HandlerData_p"
]
for p in ("dlldata", "c", "i", "p"):
SOURCES["!HandlerData_%s.c" % p].flags += [
"-DUserMarshalRoutines=UserMarshalRoutines__HandlerData_%s" % p
]
DEFFILE = 'AccessibleHandler.def'
DEFFILE = "AccessibleHandler.def"
USE_LIBS += [
'mscom_oop',
"mscom_oop",
]
OS_LIBS += [
'rpcrt4',
'oleacc',
"rpcrt4",
"oleacc",
]
RCINCLUDE = 'AccessibleHandler.rc'
RCINCLUDE = "AccessibleHandler.rc"
# Suppress warnings from the MIDL generated code.
if CONFIG['CC_TYPE'] == 'clang-cl':
if CONFIG["CC_TYPE"] == "clang-cl":
CFLAGS += [
'-Wno-extern-initializer',
'-Wno-incompatible-pointer-types',
'-Wno-missing-braces',
'-Wno-unused-const-variable',
"-Wno-extern-initializer",
"-Wno-incompatible-pointer-types",
"-Wno-missing-braces",
"-Wno-unused-const-variable",
]
# Since we are defining our own COM entry points (DllRegisterServer et al),
# but we still want to be able to delegate some work to the generated code,
# we add the prefix "Proxy" to all of the generated counterparts.
DEFINES['ENTRY_PREFIX'] = 'Proxy'
DEFINES['REGISTER_PROXY_DLL'] = True
LIBRARY_DEFINES['MOZ_MSCOM_REMARSHAL_NO_HANDLER'] = True
DEFINES["ENTRY_PREFIX"] = "Proxy"
DEFINES["REGISTER_PROXY_DLL"] = True
LIBRARY_DEFINES["MOZ_MSCOM_REMARSHAL_NO_HANDLER"] = True
# This DLL may be loaded into other processes, so we need static libs for
# Windows 7 and Windows 8.
USE_STATIC_LIBS = True
LIBRARY_DEFINES['UNICODE'] = True
LIBRARY_DEFINES['_UNICODE'] = True
LIBRARY_DEFINES['MOZ_NO_MOZALLOC'] = True
LIBRARY_DEFINES["UNICODE"] = True
LIBRARY_DEFINES["_UNICODE"] = True
LIBRARY_DEFINES["MOZ_NO_MOZALLOC"] = True
DisableStlWrapping()

Просмотреть файл

@ -4,67 +4,69 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['COMPILE_ENVIRONMENT'] and CONFIG['ACCESSIBILITY']:
if CONFIG["COMPILE_ENVIRONMENT"] and CONFIG["ACCESSIBILITY"]:
DIRS += [
'handler',
'typelib',
"handler",
"typelib",
]
if CONFIG['ACCESSIBILITY']:
IPDL_SOURCES += ['PDocAccessible.ipdl']
if CONFIG["ACCESSIBILITY"]:
IPDL_SOURCES += ["PDocAccessible.ipdl"]
if not CONFIG['HAVE_64BIT_BUILD']:
if not CONFIG["HAVE_64BIT_BUILD"]:
EXPORTS += [
'IAccessible32.manifest',
"IAccessible32.manifest",
]
EXPORTS += [
'IAccessible64.manifest',
"IAccessible64.manifest",
]
EXPORTS.mozilla.a11y += [
'COMPtrTypes.h',
'DocAccessibleChild.h',
'HandlerProvider.h',
'PlatformChild.h',
'ProxyAccessible.h'
"COMPtrTypes.h",
"DocAccessibleChild.h",
"HandlerProvider.h",
"PlatformChild.h",
"ProxyAccessible.h",
]
SOURCES += [
'!./handler/HandlerData_c.c',
'COMPtrTypes.cpp',
'DocAccessibleChild.cpp',
'HandlerProvider.cpp',
'PlatformChild.cpp',
'ProxyAccessible.cpp',
"!./handler/HandlerData_c.c",
"COMPtrTypes.cpp",
"DocAccessibleChild.cpp",
"HandlerProvider.cpp",
"PlatformChild.cpp",
"ProxyAccessible.cpp",
]
# Give some symbols a unique name in each translation unit, to avoid
# collisions caused by https://llvm.org/pr41817.
if CONFIG['CC_TYPE'] == 'clang-cl':
SOURCES['!./handler/HandlerData_c.c'].flags += ['-DUserMarshalRoutines=UserMarshalRoutines__HandlerData_c']
if CONFIG["CC_TYPE"] == "clang-cl":
SOURCES["!./handler/HandlerData_c.c"].flags += [
"-DUserMarshalRoutines=UserMarshalRoutines__HandlerData_c"
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/windows/ia2',
'/accessible/windows/msaa',
'/accessible/xpcom',
"/accessible/base",
"/accessible/generic",
"/accessible/windows/ia2",
"/accessible/windows/msaa",
"/accessible/xpcom",
]
# Suppress warnings from the MIDL generated code.
if CONFIG['CC_TYPE'] == 'clang-cl':
if CONFIG["CC_TYPE"] == "clang-cl":
CFLAGS += [
'-Wno-extern-initializer',
'-Wno-incompatible-pointer-types',
'-Wno-missing-braces',
'-Wno-unused-const-variable',
"-Wno-extern-initializer",
"-Wno-incompatible-pointer-types",
"-Wno-missing-braces",
"-Wno-unused-const-variable",
]
CXXFLAGS += [
'-Wno-missing-braces',
"-Wno-missing-braces",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -5,9 +5,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
FINAL_TARGET_FILES += [
'!Accessible.tlb',
"!Accessible.tlb",
]
GeneratedFile('Accessible.tlb',
inputs=['Accessible.idl'],
script='/build/midl.py', entry_point='midl')
GeneratedFile(
"Accessible.tlb",
inputs=["Accessible.idl"],
script="/build/midl.py",
entry_point="midl",
)

Просмотреть файл

@ -28,8 +28,9 @@ def gen_mm(fd, protocol_file):
fd.write("#import <Foundation/Foundation.h>\n\n")
fd.write("namespace mozilla {\nnamespace a11y {\nnamespace mac {\n\n")
sections = re.findall(r"#pragma mark - (\w+)\n(.*?)(?=(?:#pragma mark|@end))",
protocol, re.DOTALL)
sections = re.findall(
r"#pragma mark - (\w+)\n(.*?)(?=(?:#pragma mark|@end))", protocol, re.DOTALL
)
for name, text in sections:
write_map(fd, name, text)
@ -38,8 +39,9 @@ def gen_mm(fd, protocol_file):
def gen_h(fd, protocol_file):
protocol = open(protocol_file).read()
sections = re.findall(r"#pragma mark - (\w+)\n(.*?)(?=(?:#pragma mark|@end))",
protocol, re.DOTALL)
sections = re.findall(
r"#pragma mark - (\w+)\n(.*?)(?=(?:#pragma mark|@end))", protocol, re.DOTALL
)
fd.write("/* THIS FILE IS AUTOGENERATED - DO NOT EDIT */\n\n")
fd.write("#ifndef _MacSelectorMap_H_\n")
@ -55,6 +57,7 @@ def gen_h(fd, protocol_file):
# For debugging
if __name__ == "__main__":
import sys
gen_mm(sys.stdout, "accessible/mac/MOXAccessibleProtocol.h")
gen_h(sys.stdout, "accessible/mac/MOXAccessibleProtocol.h")

Просмотреть файл

@ -5,63 +5,69 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS += [
'mozAccessibleProtocol.h',
"mozAccessibleProtocol.h",
]
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'HyperTextAccessibleWrap.h',
'RangeTypes.h',
"AccessibleWrap.h",
"HyperTextAccessibleWrap.h",
"RangeTypes.h",
]
UNIFIED_SOURCES += [
'AccessibleWrap.mm',
'DocAccessibleWrap.mm',
'GeckoTextMarker.mm',
'HyperTextAccessibleWrap.mm',
'MacUtils.mm',
'MOXAccessibleBase.mm',
'MOXLandmarkAccessibles.mm',
'MOXMathAccessibles.mm',
'MOXSearchInfo.mm',
'MOXTextMarkerDelegate.mm',
'MOXWebAreaAccessible.mm',
'mozAccessible.mm',
'mozActionElements.mm',
'mozHTMLAccessible.mm',
'mozRootAccessible.mm',
'mozSelectableElements.mm',
'mozTableAccessible.mm',
'mozTextAccessible.mm',
'Platform.mm',
'RootAccessibleWrap.mm',
'RotorRules.mm',
"AccessibleWrap.mm",
"DocAccessibleWrap.mm",
"GeckoTextMarker.mm",
"HyperTextAccessibleWrap.mm",
"MacUtils.mm",
"MOXAccessibleBase.mm",
"MOXLandmarkAccessibles.mm",
"MOXMathAccessibles.mm",
"MOXSearchInfo.mm",
"MOXTextMarkerDelegate.mm",
"MOXWebAreaAccessible.mm",
"mozAccessible.mm",
"mozActionElements.mm",
"mozHTMLAccessible.mm",
"mozRootAccessible.mm",
"mozSelectableElements.mm",
"mozTableAccessible.mm",
"mozTextAccessible.mm",
"Platform.mm",
"RootAccessibleWrap.mm",
"RotorRules.mm",
]
SOURCES += [
'!MacSelectorMap.mm',
"!MacSelectorMap.mm",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/ipc',
'/accessible/ipc/other',
'/accessible/xul',
'/layout/generic',
'/layout/xul',
'/widget',
'/widget/cocoa',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/ipc",
"/accessible/ipc/other",
"/accessible/xul",
"/layout/generic",
"/layout/xul",
"/widget",
"/widget/cocoa",
]
GeneratedFile('MacSelectorMap.h',
script='/accessible/mac/SelectorMapGen.py', entry_point='gen_h',
inputs=['MOXAccessibleProtocol.h'])
GeneratedFile('MacSelectorMap.mm',
script='/accessible/mac/SelectorMapGen.py', entry_point='gen_mm',
inputs=['MOXAccessibleProtocol.h'])
GeneratedFile(
"MacSelectorMap.h",
script="/accessible/mac/SelectorMapGen.py",
entry_point="gen_h",
inputs=["MOXAccessibleProtocol.h"],
)
GeneratedFile(
"MacSelectorMap.mm",
script="/accessible/mac/SelectorMapGen.py",
entry_point="gen_mm",
inputs=["MOXAccessibleProtocol.h"],
)
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")

Просмотреть файл

@ -4,46 +4,39 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
toolkit = CONFIG["MOZ_WIDGET_TOOLKIT"]
if toolkit == 'gtk':
DIRS += ['atk']
elif toolkit == 'windows':
DIRS += ['windows']
elif toolkit == 'cocoa':
DIRS += ['mac']
elif toolkit == 'android':
DIRS += ['android']
if toolkit == "gtk":
DIRS += ["atk"]
elif toolkit == "windows":
DIRS += ["windows"]
elif toolkit == "cocoa":
DIRS += ["mac"]
elif toolkit == "android":
DIRS += ["android"]
else:
DIRS += ['other']
DIRS += ["other"]
DIRS += [ 'aom',
'base',
'generic',
'html',
'interfaces',
'ipc',
'xpcom'
]
DIRS += ["aom", "base", "generic", "html", "interfaces", "ipc", "xpcom"]
if CONFIG['MOZ_XUL']:
DIRS += ['xul']
if CONFIG["MOZ_XUL"]:
DIRS += ["xul"]
TEST_DIRS += ['tests/mochitest']
TEST_DIRS += ["tests/mochitest"]
BROWSER_CHROME_MANIFESTS += [
'tests/browser/bounds/browser.ini',
'tests/browser/browser.ini',
'tests/browser/e10s/browser.ini',
'tests/browser/events/browser.ini',
'tests/browser/fission/browser.ini',
'tests/browser/general/browser.ini',
'tests/browser/hittest/browser.ini',
'tests/browser/mac/browser.ini',
'tests/browser/scroll/browser.ini',
'tests/browser/states/browser.ini',
'tests/browser/telemetry/browser.ini',
'tests/browser/tree/browser.ini'
"tests/browser/bounds/browser.ini",
"tests/browser/browser.ini",
"tests/browser/e10s/browser.ini",
"tests/browser/events/browser.ini",
"tests/browser/fission/browser.ini",
"tests/browser/general/browser.ini",
"tests/browser/hittest/browser.ini",
"tests/browser/mac/browser.ini",
"tests/browser/scroll/browser.ini",
"tests/browser/states/browser.ini",
"tests/browser/telemetry/browser.ini",
"tests/browser/tree/browser.ini",
]
with Files("**"):

Просмотреть файл

@ -5,23 +5,23 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'HyperTextAccessibleWrap.h',
"AccessibleWrap.h",
"HyperTextAccessibleWrap.h",
]
SOURCES += [
'AccessibleWrap.cpp',
'Platform.cpp',
"AccessibleWrap.cpp",
"Platform.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/xul',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/xul",
]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]

Просмотреть файл

@ -5,33 +5,33 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
A11Y_MANIFESTS += [
'a11y.ini',
'actions/a11y.ini',
'aom/a11y.ini',
'attributes/a11y.ini',
'bounds/a11y.ini',
'editabletext/a11y.ini',
'elm/a11y.ini',
'events/a11y.ini',
'events/docload/a11y.ini',
'focus/a11y.ini',
'hittest/a11y.ini',
'hyperlink/a11y.ini',
'hypertext/a11y.ini',
'name/a11y.ini',
'pivot/a11y.ini',
'relations/a11y.ini',
'role/a11y.ini',
'scroll/a11y.ini',
'selectable/a11y.ini',
'states/a11y.ini',
'table/a11y.ini',
'text/a11y.ini',
'textattrs/a11y.ini',
'textcaret/a11y.ini',
'textrange/a11y.ini',
'textselection/a11y.ini',
'tree/a11y.ini',
'treeupdate/a11y.ini',
'value/a11y.ini',
"a11y.ini",
"actions/a11y.ini",
"aom/a11y.ini",
"attributes/a11y.ini",
"bounds/a11y.ini",
"editabletext/a11y.ini",
"elm/a11y.ini",
"events/a11y.ini",
"events/docload/a11y.ini",
"focus/a11y.ini",
"hittest/a11y.ini",
"hyperlink/a11y.ini",
"hypertext/a11y.ini",
"name/a11y.ini",
"pivot/a11y.ini",
"relations/a11y.ini",
"role/a11y.ini",
"scroll/a11y.ini",
"selectable/a11y.ini",
"states/a11y.ini",
"table/a11y.ini",
"text/a11y.ini",
"textattrs/a11y.ini",
"textcaret/a11y.ini",
"textrange/a11y.ini",
"textselection/a11y.ini",
"tree/a11y.ini",
"treeupdate/a11y.ini",
"value/a11y.ini",
]

Просмотреть файл

@ -5,54 +5,54 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS += [
'ia2Accessible.h',
'ia2AccessibleAction.h',
'ia2AccessibleComponent.h',
'ia2AccessibleEditableText.h',
'ia2AccessibleHyperlink.h',
'ia2AccessibleHypertext.h',
'ia2AccessibleText.h',
'ia2AccessibleValue.h',
"ia2Accessible.h",
"ia2AccessibleAction.h",
"ia2AccessibleComponent.h",
"ia2AccessibleEditableText.h",
"ia2AccessibleHyperlink.h",
"ia2AccessibleHypertext.h",
"ia2AccessibleText.h",
"ia2AccessibleValue.h",
]
UNIFIED_SOURCES += [
'ia2Accessible.cpp',
'ia2AccessibleAction.cpp',
'ia2AccessibleComponent.cpp',
'ia2AccessibleEditableText.cpp',
'ia2AccessibleHyperlink.cpp',
'ia2AccessibleHypertext.cpp',
'ia2AccessibleImage.cpp',
'ia2AccessibleRelation.cpp',
'ia2AccessibleText.cpp',
'ia2AccessibleValue.cpp',
"ia2Accessible.cpp",
"ia2AccessibleAction.cpp",
"ia2AccessibleComponent.cpp",
"ia2AccessibleEditableText.cpp",
"ia2AccessibleHyperlink.cpp",
"ia2AccessibleHypertext.cpp",
"ia2AccessibleImage.cpp",
"ia2AccessibleRelation.cpp",
"ia2AccessibleText.cpp",
"ia2AccessibleValue.cpp",
]
# These files cannot be built in unified mode because they both include
# AccessibleTable2_i.c.
SOURCES += [
'ia2AccessibleTable.cpp',
'ia2AccessibleTableCell.cpp',
"ia2AccessibleTable.cpp",
"ia2AccessibleTableCell.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/windows',
'/accessible/windows/msaa',
'/accessible/xpcom',
'/accessible/xul',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/windows",
"/accessible/windows/msaa",
"/accessible/xpcom",
"/accessible/xul",
]
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
# The Windows MIDL code generator creates things like:
#
# #endif !_MIDL_USE_GUIDDEF_
#
# which clang-cl complains about. MSVC doesn't, so turn this warning off.
if CONFIG['CC_TYPE'] == 'clang-cl':
CXXFLAGS += ['-Wno-extra-tokens']
if CONFIG["CC_TYPE"] == "clang-cl":
CXXFLAGS += ["-Wno-extra-tokens"]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")

Просмотреть файл

@ -4,8 +4,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['msaa', 'ia2', 'sdn', 'uia']
DIRS += ["msaa", "ia2", "sdn", "uia"]
EXPORTS.mozilla.a11y += [
'ProxyWrappers.h',
"ProxyWrappers.h",
]

Просмотреть файл

@ -5,71 +5,71 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS += [
'IUnknownImpl.h',
"IUnknownImpl.h",
]
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'Compatibility.h',
'HyperTextAccessibleWrap.h',
'LazyInstantiator.h',
'MsaaIdGenerator.h',
'nsWinUtils.h',
"AccessibleWrap.h",
"Compatibility.h",
"HyperTextAccessibleWrap.h",
"LazyInstantiator.h",
"MsaaIdGenerator.h",
"nsWinUtils.h",
]
UNIFIED_SOURCES += [
'AccessibleWrap.cpp',
'ApplicationAccessibleWrap.cpp',
'ARIAGridAccessibleWrap.cpp',
'Compatibility.cpp',
'CompatibilityUIA.cpp',
'DocAccessibleWrap.cpp',
'EnumVariant.cpp',
'GeckoCustom.cpp',
'HTMLTableAccessibleWrap.cpp',
'HTMLWin32ObjectAccessible.cpp',
'HyperTextAccessibleWrap.cpp',
'ImageAccessibleWrap.cpp',
'IUnknownImpl.cpp',
'MsaaIdGenerator.cpp',
'nsWinUtils.cpp',
'Platform.cpp',
'RootAccessibleWrap.cpp',
'TextLeafAccessibleWrap.cpp',
"AccessibleWrap.cpp",
"ApplicationAccessibleWrap.cpp",
"ARIAGridAccessibleWrap.cpp",
"Compatibility.cpp",
"CompatibilityUIA.cpp",
"DocAccessibleWrap.cpp",
"EnumVariant.cpp",
"GeckoCustom.cpp",
"HTMLTableAccessibleWrap.cpp",
"HTMLWin32ObjectAccessible.cpp",
"HyperTextAccessibleWrap.cpp",
"ImageAccessibleWrap.cpp",
"IUnknownImpl.cpp",
"MsaaIdGenerator.cpp",
"nsWinUtils.cpp",
"Platform.cpp",
"RootAccessibleWrap.cpp",
"TextLeafAccessibleWrap.cpp",
]
SOURCES += [
# This file cannot be built in unified mode because it redefines _WIN32_WINNT
'LazyInstantiator.cpp',
"LazyInstantiator.cpp",
# This file cannot be built in unified mode because it includes ISimpleDOMNode_i.c.
'ServiceProvider.cpp',
"ServiceProvider.cpp",
]
OS_LIBS += [
'ntdll',
"ntdll",
]
if CONFIG['MOZ_XUL']:
if CONFIG["MOZ_XUL"]:
UNIFIED_SOURCES += [
'XULListboxAccessibleWrap.cpp',
'XULMenuAccessibleWrap.cpp',
'XULTreeGridAccessibleWrap.cpp',
"XULListboxAccessibleWrap.cpp",
"XULMenuAccessibleWrap.cpp",
"XULTreeGridAccessibleWrap.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/ipc',
'/accessible/ipc/win',
'/accessible/windows',
'/accessible/windows/ia2',
'/accessible/windows/sdn',
'/accessible/windows/uia',
'/accessible/xpcom',
'/accessible/xul',
'/dom/base',
'/layout/style',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/ipc",
"/accessible/ipc/win",
"/accessible/windows",
"/accessible/windows/ia2",
"/accessible/windows/sdn",
"/accessible/windows/uia",
"/accessible/xpcom",
"/accessible/xul",
"/dom/base",
"/layout/style",
]
# The Windows MIDL code generator creates things like:
@ -77,9 +77,9 @@ LOCAL_INCLUDES += [
# #endif !_MIDL_USE_GUIDDEF_
#
# which clang-cl complains about. MSVC doesn't, so turn this warning off.
if CONFIG['CC_TYPE'] == 'clang-cl':
CXXFLAGS += ['-Wno-extra-tokens']
if CONFIG["CC_TYPE"] == "clang-cl":
CXXFLAGS += ["-Wno-extra-tokens"]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -5,20 +5,20 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
UNIFIED_SOURCES += [
'sdnAccessible.cpp',
'sdnDocAccessible.cpp',
'sdnTextAccessible.cpp',
"sdnAccessible.cpp",
"sdnDocAccessible.cpp",
"sdnTextAccessible.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/windows/msaa',
'/accessible/xpcom',
'/accessible/xul',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/windows/msaa",
"/accessible/xpcom",
"/accessible/xul",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -5,18 +5,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [
'uiaRawElmProvider.cpp',
"uiaRawElmProvider.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/windows/msaa',
'/accessible/xpcom',
'/accessible/xul',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/windows/msaa",
"/accessible/xpcom",
"/accessible/xul",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"

Просмотреть файл

@ -14,8 +14,13 @@ from xpidl import xpidl
# Load the webidl configuration file.
glbl = {}
exec(open(mozpath.join(buildconfig.topsrcdir, 'dom', 'bindings', 'Bindings.conf')).read(), glbl)
webidlconfig = glbl['DOMInterfaces']
exec(
open(
mozpath.join(buildconfig.topsrcdir, "dom", "bindings", "Bindings.conf")
).read(),
glbl,
)
webidlconfig = glbl["DOMInterfaces"]
# Instantiate the parser.
p = xpidl.IDLParser()
@ -26,13 +31,14 @@ def findIDL(includePath, interfaceFileName):
path = mozpath.join(d, interfaceFileName)
if os.path.exists(path):
return path
raise BaseException("No IDL file found for interface %s "
"in include path %r"
% (interfaceFileName, includePath))
raise BaseException(
"No IDL file found for interface %s "
"in include path %r" % (interfaceFileName, includePath)
)
def loadEventIDL(parser, includePath, eventname):
eventidl = ("nsIAccessible%s.idl" % eventname)
eventidl = "nsIAccessible%s.idl" % eventname
idlFile = findIDL(includePath, eventidl)
idl = p.parse(open(idlFile).read(), idlFile)
idl.resolve(includePath, p, webidlconfig)
@ -43,7 +49,7 @@ class Configuration:
def __init__(self, filename):
config = {}
exec(open(filename).read(), config)
self.simple_events = config.get('simple_events', [])
self.simple_events = config.get("simple_events", [])
def firstCap(str):
@ -51,26 +57,28 @@ def firstCap(str):
def writeAttributeParams(a):
return ("%s a%s" % (a.realtype.nativeType('in'), firstCap(a.name)))
return "%s a%s" % (a.realtype.nativeType("in"), firstCap(a.name))
def print_header_file(fd, conf, incdirs):
idl_paths = set()
fd.write("/* THIS FILE IS AUTOGENERATED - DO NOT EDIT */\n")
fd.write("#ifndef _mozilla_a11y_generated_AccEvents_h_\n"
"#define _mozilla_a11y_generated_AccEvents_h_\n\n")
fd.write("#include \"nscore.h\"\n")
fd.write("#include \"nsCOMPtr.h\"\n")
fd.write("#include \"nsCycleCollectionParticipant.h\"\n")
fd.write("#include \"nsString.h\"\n")
fd.write(
"#ifndef _mozilla_a11y_generated_AccEvents_h_\n"
"#define _mozilla_a11y_generated_AccEvents_h_\n\n"
)
fd.write('#include "nscore.h"\n')
fd.write('#include "nsCOMPtr.h"\n')
fd.write('#include "nsCycleCollectionParticipant.h"\n')
fd.write('#include "nsString.h"\n')
for e in conf.simple_events:
fd.write("#include \"nsIAccessible%s.h\"\n" % e)
fd.write('#include "nsIAccessible%s.h"\n' % e)
for e in conf.simple_events:
idl, idl_path = loadEventIDL(p, incdirs, e)
idl_paths.add(idl_path)
for iface in filter(lambda p: p.kind == "interface", idl.productions):
classname = ("xpcAcc%s" % e)
classname = "xpcAcc%s" % e
baseinterfaces = interfaces(iface)
fd.write("\nclass %s final : public %s\n" % (classname, iface.name))
@ -114,7 +122,7 @@ def interfaceAttributeTypes(idl):
def print_cpp(idl, fd, conf, eventname):
for p in idl.productions:
if p.kind == 'interface':
if p.kind == "interface":
write_cpp(eventname, p, fd)
@ -135,7 +143,7 @@ def print_cpp_file(fd, conf, incdirs):
types.extend(interfaceAttributeTypes(idl))
for c in types:
fd.write("#include \"%s.h\"\n" % c)
fd.write('#include "%s.h"\n' % c)
fd.write("\n")
for e in conf.simple_events:
@ -147,37 +155,40 @@ def print_cpp_file(fd, conf, incdirs):
def attributeVariableTypeAndName(a):
if a.realtype.nativeType('in').endswith('*'):
l = ["nsCOMPtr<%s> m%s;" % (a.realtype.nativeType('in').strip('* '),
firstCap(a.name))]
elif a.realtype.nativeType('in').count("nsAString"):
if a.realtype.nativeType("in").endswith("*"):
l = [
"nsCOMPtr<%s> m%s;"
% (a.realtype.nativeType("in").strip("* "), firstCap(a.name))
]
elif a.realtype.nativeType("in").count("nsAString"):
l = ["nsString m%s;" % firstCap(a.name)]
elif a.realtype.nativeType('in').count("nsACString"):
elif a.realtype.nativeType("in").count("nsACString"):
l = ["nsCString m%s;" % firstCap(a.name)]
else:
l = ["%sm%s;" % (a.realtype.nativeType('in'),
firstCap(a.name))]
l = ["%sm%s;" % (a.realtype.nativeType("in"), firstCap(a.name))]
return ", ".join(l)
def writeAttributeGetter(fd, classname, a):
fd.write("NS_IMETHODIMP\n")
fd.write("%s::Get%s(" % (classname, firstCap(a.name)))
if a.realtype.nativeType('in').endswith('*'):
fd.write("%s** a%s" % (a.realtype.nativeType('in').strip('* '), firstCap(a.name)))
elif a.realtype.nativeType('in').count("nsAString"):
if a.realtype.nativeType("in").endswith("*"):
fd.write(
"%s** a%s" % (a.realtype.nativeType("in").strip("* "), firstCap(a.name))
)
elif a.realtype.nativeType("in").count("nsAString"):
fd.write("nsAString& a%s" % firstCap(a.name))
elif a.realtype.nativeType('in').count("nsACString"):
elif a.realtype.nativeType("in").count("nsACString"):
fd.write("nsACString& a%s" % firstCap(a.name))
else:
fd.write("%s*a%s" % (a.realtype.nativeType('in'), firstCap(a.name)))
fd.write("%s*a%s" % (a.realtype.nativeType("in"), firstCap(a.name)))
fd.write(")\n")
fd.write("{\n")
if a.realtype.nativeType('in').endswith('*'):
if a.realtype.nativeType("in").endswith("*"):
fd.write(" NS_IF_ADDREF(*a%s = m%s);\n" % (firstCap(a.name), firstCap(a.name)))
elif a.realtype.nativeType('in').count("nsAString"):
elif a.realtype.nativeType("in").count("nsAString"):
fd.write(" a%s = m%s;\n" % (firstCap(a.name), firstCap(a.name)))
elif a.realtype.nativeType('in').count("nsACString"):
elif a.realtype.nativeType("in").count("nsACString"):
fd.write(" a%s = m%s;\n" % (firstCap(a.name), firstCap(a.name)))
else:
fd.write(" *a%s = m%s;\n" % (firstCap(a.name), firstCap(a.name)))
@ -207,7 +218,9 @@ def allAttributes(iface):
def write_cpp(eventname, iface, fd):
classname = "xpcAcc%s" % eventname
attributes = allAttributes(iface)
ccattributes = filter(lambda m: m.realtype.nativeType('in').endswith('*'), attributes)
ccattributes = filter(
lambda m: m.realtype.nativeType("in").endswith("*"), attributes
)
fd.write("NS_IMPL_CYCLE_COLLECTION(%s" % classname)
for c in ccattributes:
fd.write(", m%s" % firstCap(c.name))
@ -228,8 +241,8 @@ def write_cpp(eventname, iface, fd):
def get_conf(conf_file):
conf = Configuration(conf_file)
inc_dir = [
mozpath.join(buildconfig.topsrcdir, 'accessible', 'interfaces'),
mozpath.join(buildconfig.topsrcdir, 'xpcom', 'base'),
mozpath.join(buildconfig.topsrcdir, "accessible", "interfaces"),
mozpath.join(buildconfig.topsrcdir, "xpcom", "base"),
]
return conf, inc_dir
@ -238,6 +251,8 @@ def gen_files(fd, conf_file):
deps = set()
conf, inc_dir = get_conf(conf_file)
deps.update(print_header_file(fd, conf, inc_dir))
with open(os.path.join(os.path.dirname(fd.name), 'xpcAccEvents.cpp'), 'w') as cpp_fd:
with open(
os.path.join(os.path.dirname(fd.name), "xpcAccEvents.cpp"), "w"
) as cpp_fd:
deps.update(print_cpp_file(cpp_fd, conf, inc_dir))
return deps

Просмотреть файл

@ -5,76 +5,77 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
UNIFIED_SOURCES += [
'nsAccessibleRelation.cpp',
'xpcAccessibilityService.cpp',
'xpcAccessible.cpp',
'xpcAccessibleApplication.cpp',
'xpcAccessibleDocument.cpp',
'xpcAccessibleGeneric.cpp',
'xpcAccessibleHyperLink.cpp',
'xpcAccessibleHyperText.cpp',
'xpcAccessibleImage.cpp',
'xpcAccessibleSelectable.cpp',
'xpcAccessibleTable.cpp',
'xpcAccessibleTableCell.cpp',
'xpcAccessibleTextRange.cpp',
'xpcAccessibleValue.cpp',
"nsAccessibleRelation.cpp",
"xpcAccessibilityService.cpp",
"xpcAccessible.cpp",
"xpcAccessibleApplication.cpp",
"xpcAccessibleDocument.cpp",
"xpcAccessibleGeneric.cpp",
"xpcAccessibleHyperLink.cpp",
"xpcAccessibleHyperText.cpp",
"xpcAccessibleImage.cpp",
"xpcAccessibleSelectable.cpp",
"xpcAccessibleTable.cpp",
"xpcAccessibleTableCell.cpp",
"xpcAccessibleTextRange.cpp",
"xpcAccessibleValue.cpp",
]
SOURCES += [
'!xpcAccEvents.cpp',
"!xpcAccEvents.cpp",
]
EXPORTS += [
'!xpcAccEvents.h',
'xpcAccessibilityService.h',
"!xpcAccEvents.h",
"xpcAccessibilityService.h",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
"/accessible/base",
"/accessible/generic",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
LOCAL_INCLUDES += [
'/accessible/windows/msaa',
"/accessible/windows/msaa",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/ipc',
'/accessible/ipc/other',
'/accessible/mac',
]
UNIFIED_SOURCES += [
'xpcAccessibleMacInterface.mm'
"/accessible/ipc",
"/accessible/ipc/other",
"/accessible/mac",
]
UNIFIED_SOURCES += ["xpcAccessibleMacInterface.mm"]
EXPORTS += [
'xpcAccessibleMacInterface.h',
"xpcAccessibleMacInterface.h",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
GeneratedFile(
'xpcAccEvents.h', 'xpcAccEvents.cpp',
script='AccEventGen.py', entry_point='gen_files',
"xpcAccEvents.h",
"xpcAccEvents.cpp",
script="AccEventGen.py",
entry_point="gen_files",
inputs=[
'AccEvents.conf',
])
"AccEvents.conf",
],
)
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]

Просмотреть файл

@ -5,55 +5,55 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
UNIFIED_SOURCES += [
'XULAlertAccessible.cpp',
'XULComboboxAccessible.cpp',
'XULElementAccessibles.cpp',
'XULFormControlAccessible.cpp',
'XULListboxAccessible.cpp',
'XULMenuAccessible.cpp',
'XULSelectControlAccessible.cpp',
'XULTabAccessible.cpp',
'XULTreeAccessible.cpp',
'XULTreeGridAccessible.cpp',
"XULAlertAccessible.cpp",
"XULComboboxAccessible.cpp",
"XULElementAccessibles.cpp",
"XULFormControlAccessible.cpp",
"XULListboxAccessible.cpp",
"XULMenuAccessible.cpp",
"XULSelectControlAccessible.cpp",
"XULTabAccessible.cpp",
"XULTreeAccessible.cpp",
"XULTreeGridAccessible.cpp",
]
LOCAL_INCLUDES += [
'/accessible/base',
'/accessible/generic',
'/accessible/html',
'/accessible/xpcom',
'/dom/base',
'/dom/xul',
'/layout/generic',
'/layout/xul',
'/layout/xul/tree',
"/accessible/base",
"/accessible/generic",
"/accessible/html",
"/accessible/xpcom",
"/dom/base",
"/dom/xul",
"/layout/generic",
"/layout/xul",
"/layout/xul/tree",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += [
'/accessible/atk',
"/accessible/atk",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
LOCAL_INCLUDES += [
'/accessible/windows/ia2',
'/accessible/windows/msaa',
"/accessible/windows/ia2",
"/accessible/windows/msaa",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
LOCAL_INCLUDES += [
'/accessible/mac',
"/accessible/mac",
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
LOCAL_INCLUDES += [
'/accessible/android',
"/accessible/android",
]
else:
LOCAL_INCLUDES += [
'/accessible/other',
"/accessible/other",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'
FINAL_LIBRARY = "xul"
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
if CONFIG["CC_TYPE"] in ("clang", "gcc"):
CXXFLAGS += ["-Wno-error=shadow"]

Просмотреть файл

@ -29,61 +29,61 @@ with Files("WebRTCChild.jsm"):
BUG_COMPONENT = ("Firefox", "Site Permissions")
FINAL_TARGET_FILES.actors += [
'AboutNewInstallChild.jsm',
'AboutNewInstallParent.jsm',
'AboutNewTabChild.jsm',
'AboutNewTabParent.jsm',
'AboutPluginsChild.jsm',
'AboutPluginsParent.jsm',
'AboutPrivateBrowsingChild.jsm',
'AboutPrivateBrowsingParent.jsm',
'AboutProtectionsChild.jsm',
'AboutProtectionsParent.jsm',
'AboutReaderChild.jsm',
'AboutReaderParent.jsm',
'AboutTabCrashedChild.jsm',
'AboutTabCrashedParent.jsm',
'BlockedSiteChild.jsm',
'BlockedSiteParent.jsm',
'BrowserProcessChild.jsm',
'BrowserTabChild.jsm',
'BrowserTabParent.jsm',
'ClickHandlerChild.jsm',
'ClickHandlerParent.jsm',
'ContentMetaChild.jsm',
'ContentMetaParent.jsm',
'ContentSearchChild.jsm',
'ContentSearchParent.jsm',
'ContextMenuChild.jsm',
'ContextMenuParent.jsm',
'DecoderDoctorChild.jsm',
'DecoderDoctorParent.jsm',
'DOMFullscreenChild.jsm',
'DOMFullscreenParent.jsm',
'EncryptedMediaChild.jsm',
'EncryptedMediaParent.jsm',
'FormValidationChild.jsm',
'FormValidationParent.jsm',
'LightweightThemeChild.jsm',
'LinkHandlerChild.jsm',
'LinkHandlerParent.jsm',
'NetErrorChild.jsm',
'NetErrorParent.jsm',
'PageInfoChild.jsm',
'PageStyleChild.jsm',
'PageStyleParent.jsm',
'PluginChild.jsm',
'PluginParent.jsm',
'PointerLockChild.jsm',
'PointerLockParent.jsm',
'PromptParent.jsm',
'RefreshBlockerChild.jsm',
'RefreshBlockerParent.jsm',
'RFPHelperChild.jsm',
'RFPHelperParent.jsm',
'SearchTelemetryChild.jsm',
'SearchTelemetryParent.jsm',
'SwitchDocumentDirectionChild.jsm',
'WebRTCChild.jsm',
'WebRTCParent.jsm',
"AboutNewInstallChild.jsm",
"AboutNewInstallParent.jsm",
"AboutNewTabChild.jsm",
"AboutNewTabParent.jsm",
"AboutPluginsChild.jsm",
"AboutPluginsParent.jsm",
"AboutPrivateBrowsingChild.jsm",
"AboutPrivateBrowsingParent.jsm",
"AboutProtectionsChild.jsm",
"AboutProtectionsParent.jsm",
"AboutReaderChild.jsm",
"AboutReaderParent.jsm",
"AboutTabCrashedChild.jsm",
"AboutTabCrashedParent.jsm",
"BlockedSiteChild.jsm",
"BlockedSiteParent.jsm",
"BrowserProcessChild.jsm",
"BrowserTabChild.jsm",
"BrowserTabParent.jsm",
"ClickHandlerChild.jsm",
"ClickHandlerParent.jsm",
"ContentMetaChild.jsm",
"ContentMetaParent.jsm",
"ContentSearchChild.jsm",
"ContentSearchParent.jsm",
"ContextMenuChild.jsm",
"ContextMenuParent.jsm",
"DecoderDoctorChild.jsm",
"DecoderDoctorParent.jsm",
"DOMFullscreenChild.jsm",
"DOMFullscreenParent.jsm",
"EncryptedMediaChild.jsm",
"EncryptedMediaParent.jsm",
"FormValidationChild.jsm",
"FormValidationParent.jsm",
"LightweightThemeChild.jsm",
"LinkHandlerChild.jsm",
"LinkHandlerParent.jsm",
"NetErrorChild.jsm",
"NetErrorParent.jsm",
"PageInfoChild.jsm",
"PageStyleChild.jsm",
"PageStyleParent.jsm",
"PluginChild.jsm",
"PluginParent.jsm",
"PointerLockChild.jsm",
"PointerLockParent.jsm",
"PromptParent.jsm",
"RefreshBlockerChild.jsm",
"RefreshBlockerParent.jsm",
"RFPHelperChild.jsm",
"RFPHelperParent.jsm",
"SearchTelemetryChild.jsm",
"SearchTelemetryParent.jsm",
"SwitchDocumentDirectionChild.jsm",
"WebRTCChild.jsm",
"WebRTCParent.jsm",
]

Просмотреть файл

@ -6,14 +6,20 @@
defs = []
for s in ('MOZ_GECKODRIVER', 'MOZ_ASAN', 'MOZ_TSAN', 'MOZ_CRASHREPORTER',
'MOZ_APP_NAME'):
for s in (
"MOZ_GECKODRIVER",
"MOZ_ASAN",
"MOZ_TSAN",
"MOZ_CRASHREPORTER",
"MOZ_APP_NAME",
):
if CONFIG[s]:
defs.append('-D%s=%s' % (s, '1' if CONFIG[s] is True else CONFIG[s]))
defs.append("-D%s=%s" % (s, "1" if CONFIG[s] is True else CONFIG[s]))
GeneratedFile(
'MacOS-files.txt',
script='/python/mozbuild/mozbuild/action/preprocessor.py',
entry_point='generate',
inputs=['MacOS-files.in'],
flags=defs)
"MacOS-files.txt",
script="/python/mozbuild/mozbuild/action/preprocessor.py",
entry_point="generate",
inputs=["MacOS-files.in"],
flags=defs,
)

Просмотреть файл

@ -10,17 +10,17 @@ import sys
import re
o = OptionParser()
o.add_option('--buildid', dest='buildid')
o.add_option('--version', dest='version')
o.add_option("--buildid", dest="buildid")
o.add_option("--version", dest="version")
(options, args) = o.parse_args()
if not options.buildid:
print('--buildid is required', file=sys.stderr)
print("--buildid is required", file=sys.stderr)
sys.exit(1)
if not options.version:
print('--version is required', file=sys.stderr)
print("--version is required", file=sys.stderr)
sys.exit(1)
# We want to build a version number that matches the format allowed for
@ -29,18 +29,19 @@ if not options.version:
# builds), but also so that newly-built older versions (e.g. beta build) aren't
# considered "newer" than previously-built newer versions (e.g. a trunk nightly)
define, MOZ_BUILDID, buildid = io.open(
options.buildid, 'r', encoding='utf-8').read().split()
define, MOZ_BUILDID, buildid = (
io.open(options.buildid, "r", encoding="utf-8").read().split()
)
# extract only the major version (i.e. "14" from "14.0b1")
majorVersion = re.match(r'^(\d+)[^\d].*', options.version).group(1)
majorVersion = re.match(r"^(\d+)[^\d].*", options.version).group(1)
# last two digits of the year
twodigityear = buildid[2:4]
month = buildid[4:6]
if month[0] == '0':
if month[0] == "0":
month = month[1]
day = buildid[6:8]
if day[0] == '0':
if day[0] == "0":
day = day[1]
print('%s.%s.%s' % (majorVersion + twodigityear, month, day))
print("%s.%s.%s" % (majorVersion + twodigityear, month, day))

Просмотреть файл

@ -29,90 +29,90 @@ with Files("profile/channel-prefs.js"):
with Files("profile/firefox.js"):
BUG_COMPONENT = ("Firefox", "General")
if CONFIG['MOZ_MACBUNDLE_NAME']:
DIRS += ['macbuild/Contents']
if CONFIG["MOZ_MACBUNDLE_NAME"]:
DIRS += ["macbuild/Contents"]
if CONFIG['MOZ_NO_PIE_COMPAT']:
GeckoProgram(CONFIG['MOZ_APP_NAME'] + '-bin')
if CONFIG["MOZ_NO_PIE_COMPAT"]:
GeckoProgram(CONFIG["MOZ_APP_NAME"] + "-bin")
DIRS += ['no-pie']
DIRS += ["no-pie"]
else:
GeckoProgram(CONFIG['MOZ_APP_NAME'])
GeckoProgram(CONFIG["MOZ_APP_NAME"])
SOURCES += [
'nsBrowserApp.cpp',
"nsBrowserApp.cpp",
]
# Neither channel-prefs.js nor firefox.exe want to end up in dist/bin/browser.
DIST_SUBDIR = ""
LOCAL_INCLUDES += [
'!/build',
'/toolkit/xre',
'/xpcom/base',
'/xpcom/build',
"!/build",
"/toolkit/xre",
"/xpcom/base",
"/xpcom/build",
]
if CONFIG['LIBFUZZER']:
USE_LIBS += [ 'fuzzer' ]
if CONFIG["LIBFUZZER"]:
USE_LIBS += ["fuzzer"]
LOCAL_INCLUDES += [
'/tools/fuzzing/libfuzzer',
"/tools/fuzzing/libfuzzer",
]
if CONFIG['ENABLE_GECKODRIVER']:
DEFINES['MOZ_GECKODRIVER'] = True
if CONFIG["ENABLE_GECKODRIVER"]:
DEFINES["MOZ_GECKODRIVER"] = True
if CONFIG['CC_TYPE'] == 'clang-cl':
if CONFIG["CC_TYPE"] == "clang-cl":
# Always enter a Windows program through wmain, whether or not we're
# a console application.
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
WIN32_EXE_LDFLAGS += ["-ENTRY:wmainCRTStartup"]
if CONFIG['OS_ARCH'] == 'WINNT':
RCINCLUDE = 'splash.rc'
if CONFIG["OS_ARCH"] == "WINNT":
RCINCLUDE = "splash.rc"
DIRS += [
'winlauncher',
"winlauncher",
]
USE_LIBS += [
'winlauncher',
"winlauncher",
]
LOCAL_INCLUDES += [
'/browser/app/winlauncher',
"/browser/app/winlauncher",
]
DELAYLOAD_DLLS += [
'oleaut32.dll',
'ole32.dll',
'rpcrt4.dll',
'version.dll',
"oleaut32.dll",
"ole32.dll",
"rpcrt4.dll",
"version.dll",
]
if CONFIG['CC_TYPE'] == 'clang-cl':
libpath_flag = '-LIBPATH:'
if CONFIG["CC_TYPE"] == "clang-cl":
libpath_flag = "-LIBPATH:"
else:
libpath_flag = '-L'
libpath_flag = "-L"
WIN32_EXE_LDFLAGS += [
libpath_flag + OBJDIR + '/winlauncher/freestanding',
libpath_flag + OBJDIR + "/winlauncher/freestanding",
]
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'Darwin':
if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "Darwin":
USE_LIBS += [
'mozsandbox',
"mozsandbox",
]
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "WINNT":
# For sandbox includes and the include dependencies those have
LOCAL_INCLUDES += [
'/security/sandbox/chromium',
'/security/sandbox/chromium-shim',
"/security/sandbox/chromium",
"/security/sandbox/chromium-shim",
]
USE_LIBS += [
'sandbox_s',
"sandbox_s",
]
DELAYLOAD_DLLS += [
'winmm.dll',
'user32.dll',
"winmm.dll",
"user32.dll",
]
# Control the default heap size.
@ -123,23 +123,29 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
# The heap will grow if need be.
#
# Set it to 256k. See bug 127069.
if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] not in ('clang', 'gcc'):
LDFLAGS += ['/HEAP:0x40000']
if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["CC_TYPE"] not in ("clang", "gcc"):
LDFLAGS += ["/HEAP:0x40000"]
DisableStlWrapping()
if CONFIG['HAVE_CLOCK_MONOTONIC']:
OS_LIBS += CONFIG['REALTIME_LIBS']
if CONFIG["HAVE_CLOCK_MONOTONIC"]:
OS_LIBS += CONFIG["REALTIME_LIBS"]
if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERROR']:
DEFINES['MOZ_LINUX_32_SSE2_STARTUP_ERROR'] = True
COMPILE_FLAGS['OS_CXXFLAGS'] = [
f for f in COMPILE_FLAGS.get('OS_CXXFLAGS', [])
if not f.startswith('-march=') and f not in ('-msse', '-msse2', '-mfpmath=sse')
if CONFIG["MOZ_LINUX_32_SSE2_STARTUP_ERROR"]:
DEFINES["MOZ_LINUX_32_SSE2_STARTUP_ERROR"] = True
COMPILE_FLAGS["OS_CXXFLAGS"] = [
f
for f in COMPILE_FLAGS.get("OS_CXXFLAGS", [])
if not f.startswith("-march=") and f not in ("-msse", "-msse2", "-mfpmath=sse")
] + [
'-mno-sse', '-mno-sse2', '-mfpmath=387',
"-mno-sse",
"-mno-sse2",
"-mfpmath=387",
]
for icon in ('firefox', 'document', 'newwindow', 'newtab', 'pbmode'):
DEFINES[icon.upper() + '_ICO'] = '"%s/%s/%s.ico"' % (
TOPSRCDIR, CONFIG['MOZ_BRANDING_DIRECTORY'], icon)
for icon in ("firefox", "document", "newwindow", "newtab", "pbmode"):
DEFINES[icon.upper() + "_ICO"] = '"%s/%s/%s.ico"' % (
TOPSRCDIR,
CONFIG["MOZ_BRANDING_DIRECTORY"],
icon,
)

Просмотреть файл

@ -4,25 +4,21 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Program(CONFIG['MOZ_APP_NAME'])
Program(CONFIG["MOZ_APP_NAME"])
SOURCES += [
'NoPie.c',
"NoPie.c",
]
# For some reason, LTO messes things up. We don't care anyways.
CFLAGS += [
'-fno-lto',
"-fno-lto",
]
# Use OS_LIBS instead of LDFLAGS to "force" the flag to come after -pie
# from MOZ_PROGRAM_LDFLAGS.
if CONFIG['CC_TYPE'] == 'clang':
if CONFIG["CC_TYPE"] == "clang":
# clang < 5.0 doesn't support -no-pie.
OS_LIBS += [
'-nopie'
]
OS_LIBS += ["-nopie"]
else:
OS_LIBS += [
'-no-pie'
]
OS_LIBS += ["-no-pie"]

Просмотреть файл

@ -20,11 +20,11 @@ def main(output_fd, def_file, llvm_dlltool, *llvm_dlltool_args):
try:
cmd = [llvm_dlltool]
cmd.extend(llvm_dlltool_args)
cmd += ['-d', def_file, '-l', tmp_output]
cmd += ["-d", def_file, "-l", tmp_output]
subprocess.check_call(cmd)
with open(tmp_output, 'rb') as tmplib:
with open(tmp_output, "rb") as tmplib:
output_fd.write(tmplib.read())
finally:
os.remove(tmp_output)

Просмотреть файл

@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Library('winlauncher-freestanding')
Library("winlauncher-freestanding")
FORCE_STATIC_LIB = True
@ -14,43 +14,43 @@ FORCE_STATIC_LIB = True
NO_PGO = True
UNIFIED_SOURCES += [
'DllBlocklist.cpp',
'FunctionTableResolver.cpp',
'LoaderPrivateAPI.cpp',
'ModuleLoadFrame.cpp',
"DllBlocklist.cpp",
"FunctionTableResolver.cpp",
"LoaderPrivateAPI.cpp",
"ModuleLoadFrame.cpp",
]
# This library must be compiled in a freestanding environment, as its code must
# not assume that it has access to any runtime libraries.
if CONFIG['CC_TYPE'] == 'clang-cl':
CXXFLAGS += ['-Xclang']
if CONFIG["CC_TYPE"] == "clang-cl":
CXXFLAGS += ["-Xclang"]
CXXFLAGS += [
'-ffreestanding',
"-ffreestanding",
]
# Forcibly include Freestanding.h into all source files in this library.
if CONFIG['CC_TYPE'] == 'clang-cl':
CXXFLAGS += ['-FI']
if CONFIG["CC_TYPE"] == "clang-cl":
CXXFLAGS += ["-FI"]
else:
CXXFLAGS += ['-include']
CXXFLAGS += ["-include"]
CXXFLAGS += [ SRCDIR + '/Freestanding.h' ]
CXXFLAGS += [SRCDIR + "/Freestanding.h"]
OS_LIBS += [
'ntdll',
'ntdll_freestanding',
"ntdll",
"ntdll_freestanding",
]
if CONFIG['COMPILE_ENVIRONMENT'] and CONFIG['LLVM_DLLTOOL']:
if CONFIG["COMPILE_ENVIRONMENT"] and CONFIG["LLVM_DLLTOOL"]:
GeneratedFile(
'%sntdll_freestanding.%s' % (CONFIG['LIB_PREFIX'],
CONFIG['LIB_SUFFIX']),
script='gen_ntdll_freestanding_lib.py',
inputs=['ntdll_freestanding.def'],
flags=[CONFIG['LLVM_DLLTOOL']] + CONFIG['LLVM_DLLTOOL_FLAGS'])
"%sntdll_freestanding.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]),
script="gen_ntdll_freestanding_lib.py",
inputs=["ntdll_freestanding.def"],
flags=[CONFIG["LLVM_DLLTOOL"]] + CONFIG["LLVM_DLLTOOL_FLAGS"],
)
DisableStlWrapping()
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Launcher Process')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Launcher Process")

Просмотреть файл

@ -4,48 +4,48 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Library('winlauncher')
Library("winlauncher")
FORCE_STATIC_LIB = True
UNIFIED_SOURCES += [
'/ipc/mscom/ProcessRuntime.cpp',
'/widget/windows/WindowsConsole.cpp',
'DllBlocklistInit.cpp',
'ErrorHandler.cpp',
'LauncherProcessWin.cpp',
'LaunchUnelevated.cpp',
'NtLoaderAPI.cpp',
"/ipc/mscom/ProcessRuntime.cpp",
"/widget/windows/WindowsConsole.cpp",
"DllBlocklistInit.cpp",
"ErrorHandler.cpp",
"LauncherProcessWin.cpp",
"LaunchUnelevated.cpp",
"NtLoaderAPI.cpp",
]
OS_LIBS += [
'oleaut32',
'ole32',
'rpcrt4',
'version',
"oleaut32",
"ole32",
"rpcrt4",
"version",
]
DIRS += [
'freestanding',
"freestanding",
]
USE_LIBS += [
'winlauncher-freestanding',
"winlauncher-freestanding",
]
TEST_DIRS += [
'test',
"test",
]
if CONFIG['MOZ_LAUNCHER_PROCESS']:
if CONFIG["MOZ_LAUNCHER_PROCESS"]:
UNIFIED_SOURCES += [
'/toolkit/xre/LauncherRegistryInfo.cpp',
'/toolkit/xre/WinTokenUtils.cpp',
"/toolkit/xre/LauncherRegistryInfo.cpp",
"/toolkit/xre/WinTokenUtils.cpp",
]
for var in ('MOZ_APP_BASENAME', 'MOZ_APP_VENDOR'):
for var in ("MOZ_APP_BASENAME", "MOZ_APP_VENDOR"):
DEFINES[var] = '"%s"' % CONFIG[var]
DisableStlWrapping()
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Launcher Process')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Launcher Process")

Просмотреть файл

@ -8,22 +8,22 @@ DisableStlWrapping()
GeckoCppUnitTests(
[
'TestSafeThreadLocal',
'TestSameBinary',
"TestSafeThreadLocal",
"TestSameBinary",
],
linkage=None
linkage=None,
)
LOCAL_INCLUDES += [
'/browser/app/winlauncher',
"/browser/app/winlauncher",
]
OS_LIBS += [
'ntdll',
"ntdll",
]
if CONFIG['CC_TYPE'] in ('gcc', 'clang'):
if CONFIG["CC_TYPE"] in ("gcc", "clang"):
# This allows us to use wmain as the entry point on mingw
LDFLAGS += [
'-municode',
"-municode",
]

Просмотреть файл

@ -11,8 +11,10 @@ import sys
def find_error_ids(filename, known_strings):
with open(filename, 'r', encoding="utf-8") as f:
known_strings += [m.id.name for m in parse(f.read()).body if isinstance(m, Message)]
with open(filename, "r", encoding="utf-8") as f:
known_strings += [
m.id.name for m in parse(f.read()).body if isinstance(m, Message)
]
def main(output, *filenames):
@ -20,11 +22,11 @@ def main(output, *filenames):
for filename in filenames:
find_error_ids(filename, known_strings)
output.write('const KNOWN_ERROR_MESSAGE_IDS = new Set([\n')
output.write("const KNOWN_ERROR_MESSAGE_IDS = new Set([\n")
for known_string in known_strings:
output.write(' "{}",\n'.format(known_string))
output.write(']);\n')
output.write("]);\n")
if __name__ == '__main__':
if __name__ == "__main__":
sys.exit(main(sys.stdout, *sys.argv[1:]))

Просмотреть файл

@ -7,80 +7,80 @@
with Files("**"):
BUG_COMPONENT = ("Firefox", "General")
SPHINX_TREES['sslerrorreport'] = 'content/docs/sslerrorreport'
SPHINX_TREES['tabbrowser'] = 'content/docs/tabbrowser'
SPHINX_TREES["sslerrorreport"] = "content/docs/sslerrorreport"
SPHINX_TREES["tabbrowser"] = "content/docs/tabbrowser"
with Files('content/docs/sslerrorreport/**'):
SCHEDULES.exclusive = ['docs']
with Files("content/docs/sslerrorreport/**"):
SCHEDULES.exclusive = ["docs"]
MOCHITEST_CHROME_MANIFESTS += [
'content/test/chrome/chrome.ini',
"content/test/chrome/chrome.ini",
]
BROWSER_CHROME_MANIFESTS += [
'content/test/about/browser.ini',
'content/test/alerts/browser.ini',
'content/test/backforward/browser.ini',
'content/test/caps/browser.ini',
'content/test/captivePortal/browser.ini',
'content/test/contextMenu/browser.ini',
'content/test/favicons/browser.ini',
'content/test/forms/browser.ini',
'content/test/fullscreen/browser.ini',
'content/test/general/browser.ini',
'content/test/historySwipeAnimation/browser.ini',
'content/test/keyboard/browser.ini',
'content/test/menubar/browser.ini',
'content/test/metaTags/browser.ini',
'content/test/outOfProcess/browser.ini',
'content/test/pageActions/browser.ini',
'content/test/pageinfo/browser.ini',
'content/test/pageStyle/browser.ini',
'content/test/performance/browser.ini',
'content/test/performance/hidpi/browser.ini',
'content/test/performance/io/browser.ini',
'content/test/performance/lowdpi/browser.ini',
'content/test/permissions/browser.ini',
'content/test/plugins/browser.ini',
'content/test/popupNotifications/browser.ini',
'content/test/popups/browser.ini',
'content/test/protectionsUI/browser.ini',
'content/test/referrer/browser.ini',
'content/test/sanitize/browser.ini',
'content/test/sidebar/browser.ini',
'content/test/siteIdentity/browser.ini',
'content/test/static/browser.ini',
'content/test/statuspanel/browser.ini',
'content/test/sync/browser.ini',
'content/test/tabcrashed/browser.ini',
'content/test/tabdialogs/browser.ini',
'content/test/tabMediaIndicator/browser.ini',
'content/test/tabPrompts/browser.ini',
'content/test/tabs/browser.ini',
'content/test/touch/browser.ini',
'content/test/webextensions/browser.ini',
'content/test/webrtc/browser.ini',
'content/test/webrtc/legacyIndicator/browser.ini',
'content/test/zoom/browser.ini',
"content/test/about/browser.ini",
"content/test/alerts/browser.ini",
"content/test/backforward/browser.ini",
"content/test/caps/browser.ini",
"content/test/captivePortal/browser.ini",
"content/test/contextMenu/browser.ini",
"content/test/favicons/browser.ini",
"content/test/forms/browser.ini",
"content/test/fullscreen/browser.ini",
"content/test/general/browser.ini",
"content/test/historySwipeAnimation/browser.ini",
"content/test/keyboard/browser.ini",
"content/test/menubar/browser.ini",
"content/test/metaTags/browser.ini",
"content/test/outOfProcess/browser.ini",
"content/test/pageActions/browser.ini",
"content/test/pageinfo/browser.ini",
"content/test/pageStyle/browser.ini",
"content/test/performance/browser.ini",
"content/test/performance/hidpi/browser.ini",
"content/test/performance/io/browser.ini",
"content/test/performance/lowdpi/browser.ini",
"content/test/permissions/browser.ini",
"content/test/plugins/browser.ini",
"content/test/popupNotifications/browser.ini",
"content/test/popups/browser.ini",
"content/test/protectionsUI/browser.ini",
"content/test/referrer/browser.ini",
"content/test/sanitize/browser.ini",
"content/test/sidebar/browser.ini",
"content/test/siteIdentity/browser.ini",
"content/test/static/browser.ini",
"content/test/statuspanel/browser.ini",
"content/test/sync/browser.ini",
"content/test/tabcrashed/browser.ini",
"content/test/tabdialogs/browser.ini",
"content/test/tabMediaIndicator/browser.ini",
"content/test/tabPrompts/browser.ini",
"content/test/tabs/browser.ini",
"content/test/touch/browser.ini",
"content/test/webextensions/browser.ini",
"content/test/webrtc/browser.ini",
"content/test/webrtc/legacyIndicator/browser.ini",
"content/test/zoom/browser.ini",
]
PERFTESTS_MANIFESTS += [
'content/test/perftest.ini'
]
PERFTESTS_MANIFESTS += ["content/test/perftest.ini"]
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"]
DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("windows", "gtk", "cocoa"):
DEFINES["CONTEXT_COPY_IMAGE_CONTENTS"] = 1
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk'):
DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("windows", "gtk"):
DEFINES["MENUBAR_CAN_AUTOHIDE"] = 1
JAR_MANIFESTS += ['jar.mn']
GeneratedFile('content/aboutNetErrorCodes.js', script='gen_aboutneterror_codes.py',
inputs=['/browser/locales/en-US/browser/nsserrors.ftl'])
JAR_MANIFESTS += ["jar.mn"]
GeneratedFile(
"content/aboutNetErrorCodes.js",
script="gen_aboutneterror_codes.py",
inputs=["/browser/locales/en-US/browser/nsserrors.ftl"],
)

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,6 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
DEFINES["MOZ_DISTRIBUTION_ID_UNQUOTED"] = CONFIG["MOZ_DISTRIBUTION_ID"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,10 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales']
DIRS += ["content", "locales"]
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
DIST_SUBDIR = "browser"
export("DIST_SUBDIR")
include('../branding-common.mozbuild')
include("../branding-common.mozbuild")
FirefoxBranding()

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,6 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
DEFINES["MOZ_DISTRIBUTION_ID_UNQUOTED"] = CONFIG["MOZ_DISTRIBUTION_ID"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,10 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales']
DIRS += ["content", "locales"]
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
DIST_SUBDIR = "browser"
export("DIST_SUBDIR")
include('../branding-common.mozbuild')
include("../branding-common.mozbuild")
FirefoxBranding()

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,10 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales']
DIRS += ["content", "locales"]
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
DIST_SUBDIR = "browser"
export("DIST_SUBDIR")
include('../branding-common.mozbuild')
include("../branding-common.mozbuild")
FirefoxBranding()

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,6 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
DEFINES["MOZ_DISTRIBUTION_ID_UNQUOTED"] = CONFIG["MOZ_DISTRIBUTION_ID"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,10 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales']
DIRS += ["content", "locales"]
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
DIST_SUBDIR = "browser"
export("DIST_SUBDIR")
include('../branding-common.mozbuild')
include("../branding-common.mozbuild")
FirefoxBranding()

Просмотреть файл

@ -8,25 +8,25 @@ with Files("**"):
BUG_COMPONENT = ("Firefox", "General")
EXPORTS.mozilla.browser += [
'AboutRedirector.h',
"AboutRedirector.h",
]
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
SOURCES += [
'AboutRedirector.cpp',
"AboutRedirector.cpp",
]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
FINAL_LIBRARY = 'browsercomps'
FINAL_LIBRARY = "browsercomps"
LOCAL_INCLUDES += [
'../build',
'/dom/base',
'/ipc/chromium/src',
"../build",
"/dom/base",
"/ipc/chromium/src",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")

Просмотреть файл

@ -4,6 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,20 +4,20 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'about:logins')
with Files("**"):
BUG_COMPONENT = ("Firefox", "about:logins")
EXTRA_JS_MODULES += [
'LoginBreaches.jsm',
"LoginBreaches.jsm",
]
FINAL_TARGET_FILES.actors += [
'AboutLoginsChild.jsm',
'AboutLoginsParent.jsm',
"AboutLoginsChild.jsm",
"AboutLoginsParent.jsm",
]
BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"]
MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"]
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]

Просмотреть файл

@ -7,31 +7,31 @@
with Files("**"):
BUG_COMPONENT = ("Toolkit", "Telemetry")
XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"]
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
EXTRA_JS_MODULES += [
'AttributionCode.jsm',
"AttributionCode.jsm",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
XPIDL_SOURCES += [
'nsIMacAttribution.idl',
"nsIMacAttribution.idl",
]
XPIDL_MODULE = 'attribution'
XPIDL_MODULE = "attribution"
EXPORTS += [
'nsMacAttribution.h',
"nsMacAttribution.h",
]
SOURCES += [
'nsMacAttribution.cpp',
"nsMacAttribution.cpp",
]
FINAL_LIBRARY = 'browsercomps'
FINAL_LIBRARY = "browsercomps"
EXTRA_JS_MODULES += [
'MacAttribution.jsm',
"MacAttribution.jsm",
]

Просмотреть файл

@ -8,15 +8,15 @@ with Files("**"):
BUG_COMPONENT = ("Firefox Build System", "General")
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
Library('browsercomps')
FINAL_LIBRARY = 'xul'
Library("browsercomps")
FINAL_LIBRARY = "xul"
LOCAL_INCLUDES += [
'../about',
'../migration',
'../sessionstore',
'../shell',
"../about",
"../migration",
"../sessionstore",
"../shell",
]

Просмотреть файл

@ -5,10 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
"test/browser/browser.ini",
]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
with Files('**'):
BUG_COMPONENT = ('Core', 'DOM: Security')
with Files("**"):
BUG_COMPONENT = ("Core", "DOM: Security")

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -5,23 +5,23 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
'content',
"content",
]
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser.ini"]
TESTING_JS_MODULES += [
'test/CustomizableUITestUtils.jsm',
"test/CustomizableUITestUtils.jsm",
]
EXTRA_JS_MODULES += [
'CustomizableUI.jsm',
'CustomizableWidgets.jsm',
'CustomizeMode.jsm',
'DragPositionManager.jsm',
'PanelMultiView.jsm',
'SearchWidgetTracker.jsm',
"CustomizableUI.jsm",
"CustomizableWidgets.jsm",
"CustomizeMode.jsm",
"DragPositionManager.jsm",
"PanelMultiView.jsm",
"SearchWidgetTracker.jsm",
]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Toolbars and Customization')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Toolbars and Customization")

Просмотреть файл

@ -4,15 +4,15 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Security')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Security")
EXTRA_JS_MODULES += [
'DoHConfig.jsm',
'DoHController.jsm',
'DoHHeuristics.jsm',
'TRRPerformance.jsm',
"DoHConfig.jsm",
"DoHController.jsm",
"DoHHeuristics.jsm",
"TRRPerformance.jsm",
]
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]

Просмотреть файл

@ -4,27 +4,27 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
with Files('*'):
BUG_COMPONENT = ('Firefox', 'Downloads Panel')
with Files("*"):
BUG_COMPONENT = ("Firefox", "Downloads Panel")
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
EXTRA_JS_MODULES += [
'DownloadsCommon.jsm',
'DownloadsSubview.jsm',
'DownloadsTaskbar.jsm',
'DownloadsViewableInternally.jsm',
'DownloadsViewUI.jsm',
"DownloadsCommon.jsm",
"DownloadsSubview.jsm",
"DownloadsTaskbar.jsm",
"DownloadsViewableInternally.jsm",
"DownloadsViewUI.jsm",
]
toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
toolkit = CONFIG["MOZ_WIDGET_TOOLKIT"]
if toolkit == 'cocoa':
EXTRA_JS_MODULES += ['DownloadsMacFinderProgress.jsm']
if toolkit == "cocoa":
EXTRA_JS_MODULES += ["DownloadsMacFinderProgress.jsm"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Downloads Panel')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Downloads Panel")
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]

Просмотреть файл

@ -8,7 +8,7 @@ with Files("**"):
BUG_COMPONENT = ("Firefox", "Enterprise Policies")
EXTRA_JS_MODULES.policies += [
'BookmarksPolicies.jsm',
'ProxyPolicies.jsm',
'WebsiteFilter.jsm',
"BookmarksPolicies.jsm",
"ProxyPolicies.jsm",
"WebsiteFilter.jsm",
]

Просмотреть файл

@ -7,21 +7,19 @@
with Files("**"):
BUG_COMPONENT = ("Firefox", "Enterprise Policies")
SPHINX_TREES['docs'] = 'docs'
SPHINX_TREES["docs"] = "docs"
DIRS += [
'helpers',
'schemas',
"helpers",
"schemas",
]
TEST_DIRS += [
'tests'
]
TEST_DIRS += ["tests"]
EXTRA_JS_MODULES.policies += [
'Policies.jsm',
"Policies.jsm",
]
FINAL_LIBRARY = 'browsercomps'
FINAL_LIBRARY = "browsercomps"
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -8,5 +8,5 @@ with Files("**"):
BUG_COMPONENT = ("Firefox", "Enterprise Policies")
EXTRA_PP_JS_MODULES.policies += [
'schema.jsm',
"schema.jsm",
]

Просмотреть файл

@ -5,14 +5,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += [
'browser/browser.ini',
'browser/disable_app_update/browser.ini',
'browser/disable_default_bookmarks/browser.ini',
'browser/disable_developer_tools/browser.ini',
'browser/disable_forget_button/browser.ini',
'browser/disable_fxscreenshots/browser.ini',
'browser/hardware_acceleration/browser.ini',
'browser/managedbookmarks/browser.ini',
"browser/browser.ini",
"browser/disable_app_update/browser.ini",
"browser/disable_default_bookmarks/browser.ini",
"browser/disable_developer_tools/browser.ini",
"browser/disable_forget_button/browser.ini",
"browser/disable_fxscreenshots/browser.ini",
"browser/hardware_acceleration/browser.ini",
"browser/managedbookmarks/browser.ini",
]
XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["xpcshell/xpcshell.ini"]

Просмотреть файл

@ -7,25 +7,25 @@
with Files("**"):
BUG_COMPONENT = ("WebExtensions", "Untriaged")
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
EXTRA_COMPONENTS += [
'extensions-browser.manifest',
"extensions-browser.manifest",
]
EXTRA_JS_MODULES += [
'ExtensionControlledPopup.jsm',
'ExtensionPopups.jsm',
"ExtensionControlledPopup.jsm",
"ExtensionPopups.jsm",
]
DIRS += ['schemas']
DIRS += ["schemas"]
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser-private.ini',
'test/browser/browser.ini',
"test/browser/browser-private.ini",
"test/browser/browser.ini",
]
MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"]
XPCSHELL_TESTS_MANIFESTS += [
'test/xpcshell/xpcshell.ini',
"test/xpcshell/xpcshell.ini",
]

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,14 +4,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Firefox Monitor')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Firefox Monitor")
EXTRA_JS_MODULES += [
'FirefoxMonitor.jsm',
"FirefoxMonitor.jsm",
]
JAR_MANIFESTS += ['jar.mn']
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
JAR_MANIFESTS += ["jar.mn"]
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]

Просмотреть файл

@ -4,15 +4,15 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Installer')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Installer")
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
EXTRA_JS_MODULES += [
'InstallerPrefs.jsm',
"InstallerPrefs.jsm",
]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]

Просмотреть файл

@ -4,14 +4,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'General')
with Files("**"):
BUG_COMPONENT = ("Firefox", "General")
TESTING_JS_MODULES += [
'schemas/IonContentSchema.json',
'schemas/IonStudyAddonsSchema.json',
"schemas/IonContentSchema.json",
"schemas/IonStudyAddonsSchema.json",
]

Просмотреть файл

@ -4,64 +4,64 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]
MARIONETTE_UNIT_MANIFESTS += ['tests/marionette/manifest.ini']
MARIONETTE_UNIT_MANIFESTS += ["tests/marionette/manifest.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
XPIDL_SOURCES += [
'nsIBrowserProfileMigrator.idl',
"nsIBrowserProfileMigrator.idl",
]
XPIDL_MODULE = 'migration'
XPIDL_MODULE = "migration"
EXTRA_JS_MODULES += [
'ChromeMigrationUtils.jsm',
'ChromeProfileMigrator.jsm',
'FirefoxProfileMigrator.jsm',
'MigrationUtils.jsm',
'ProfileMigrator.jsm',
"ChromeMigrationUtils.jsm",
"ChromeProfileMigrator.jsm",
"FirefoxProfileMigrator.jsm",
"MigrationUtils.jsm",
"ProfileMigrator.jsm",
]
if CONFIG['OS_ARCH'] == 'WINNT':
if CONFIG['ENABLE_TESTS']:
if CONFIG["OS_ARCH"] == "WINNT":
if CONFIG["ENABLE_TESTS"]:
DIRS += [
'tests/unit/insertIEHistory',
"tests/unit/insertIEHistory",
]
SOURCES += [
'nsIEHistoryEnumerator.cpp',
"nsIEHistoryEnumerator.cpp",
]
EXTRA_JS_MODULES += [
'360seProfileMigrator.jsm',
'ChromeWindowsLoginCrypto.jsm',
'EdgeProfileMigrator.jsm',
'ESEDBReader.jsm',
'IEProfileMigrator.jsm',
'MSMigrationUtils.jsm',
"360seProfileMigrator.jsm",
"ChromeWindowsLoginCrypto.jsm",
"EdgeProfileMigrator.jsm",
"ESEDBReader.jsm",
"IEProfileMigrator.jsm",
"MSMigrationUtils.jsm",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
EXPORTS += [
'nsKeychainMigrationUtils.h',
"nsKeychainMigrationUtils.h",
]
EXTRA_JS_MODULES += [
'ChromeMacOSLoginCrypto.jsm',
'SafariProfileMigrator.jsm',
"ChromeMacOSLoginCrypto.jsm",
"SafariProfileMigrator.jsm",
]
SOURCES += [
'nsKeychainMigrationUtils.mm',
"nsKeychainMigrationUtils.mm",
]
XPIDL_SOURCES += [
'nsIKeychainMigrationUtils.idl',
"nsIKeychainMigrationUtils.idl",
]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
FINAL_LIBRARY = 'browsercomps'
FINAL_LIBRARY = "browsercomps"
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Migration')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Migration")

Просмотреть файл

@ -4,14 +4,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
FINAL_TARGET = '_tests/xpcshell/browser/components/migration/tests/unit'
FINAL_TARGET = "_tests/xpcshell/browser/components/migration/tests/unit"
Program('InsertIEHistory')
Program("InsertIEHistory")
OS_LIBS += [
'ole32',
"ole32",
]
SOURCES += [
'InsertIEHistory.cpp',
"InsertIEHistory.cpp",
]
NO_PGO = True

Просмотреть файл

@ -22,88 +22,86 @@ with Files("tests/unit/test_distribution.js"):
with Files("safebrowsing/**"):
BUG_COMPONENT = ("Toolkit", "Safe Browsing")
with Files('controlcenter/**'):
BUG_COMPONENT = ('Firefox', 'General')
with Files("controlcenter/**"):
BUG_COMPONENT = ("Firefox", "General")
DIRS += [
'about',
'aboutconfig',
'aboutlogins',
'attribution',
'contextualidentity',
'customizableui',
'doh',
'downloads',
'enterprisepolicies',
'extensions',
'fxmonitor',
'migration',
'newtab',
'originattributes',
'ion',
'places',
'pocket',
'preferences',
'privatebrowsing',
'prompts',
'protections',
'protocolhandler',
'resistfingerprinting',
'search',
'sessionstore',
'shell',
'ssb',
'syncedtabs',
'uitour',
'urlbar',
'translation',
"about",
"aboutconfig",
"aboutlogins",
"attribution",
"contextualidentity",
"customizableui",
"doh",
"downloads",
"enterprisepolicies",
"extensions",
"fxmonitor",
"migration",
"newtab",
"originattributes",
"ion",
"places",
"pocket",
"preferences",
"privatebrowsing",
"prompts",
"protections",
"protocolhandler",
"resistfingerprinting",
"search",
"sessionstore",
"shell",
"ssb",
"syncedtabs",
"uitour",
"urlbar",
"translation",
]
DIRS += ['build']
DIRS += ["build"]
if CONFIG['NIGHTLY_BUILD']:
if CONFIG["NIGHTLY_BUILD"]:
DIRS += [
'payments',
"payments",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
DIRS += ['touchbar']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
DIRS += ['installerprefs']
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
DIRS += ["touchbar"]
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
DIRS += ["installerprefs"]
XPIDL_SOURCES += [
'nsIBrowserHandler.idl',
"nsIBrowserHandler.idl",
]
XPIDL_MODULE = 'browsercompsbase'
XPIDL_MODULE = "browsercompsbase"
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
EXTRA_COMPONENTS += [
'BrowserComponents.manifest',
'tests/startupRecorder.js',
'tests/testComponents.manifest',
"BrowserComponents.manifest",
"tests/startupRecorder.js",
"tests/testComponents.manifest",
]
EXTRA_JS_MODULES += [
'BrowserContentHandler.jsm',
'BrowserGlue.jsm',
'distribution.js',
"BrowserContentHandler.jsm",
"BrowserGlue.jsm",
"distribution.js",
]
BROWSER_CHROME_MANIFESTS += [
'safebrowsing/content/test/browser.ini',
'tests/browser/browser.ini',
"safebrowsing/content/test/browser.ini",
"tests/browser/browser.ini",
]
if CONFIG['MOZ_UPDATER']:
if CONFIG["MOZ_UPDATER"]:
BROWSER_CHROME_MANIFESTS += [
'tests/browser/whats_new_page/browser.ini',
"tests/browser/whats_new_page/browser.ini",
]
XPCSHELL_TESTS_MANIFESTS += [
'tests/unit/xpcshell.ini'
]
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]

Просмотреть файл

@ -8,36 +8,36 @@ with Files("**"):
BUG_COMPONENT = ("Firefox", "New Tab Page")
BROWSER_CHROME_MANIFESTS += [
'test/browser/abouthomecache/browser.ini',
'test/browser/browser.ini',
"test/browser/abouthomecache/browser.ini",
"test/browser/browser.ini",
]
SPHINX_TREES['docs'] = 'docs'
SPHINX_TREES['content-src/asrouter/docs'] = 'content-src/asrouter/docs'
SPHINX_TREES["docs"] = "docs"
SPHINX_TREES["content-src/asrouter/docs"] = "content-src/asrouter/docs"
XPCSHELL_TESTS_MANIFESTS += [
'test/xpcshell/xpcshell.ini',
"test/xpcshell/xpcshell.ini",
]
XPIDL_SOURCES += [
'nsIAboutNewTabService.idl',
"nsIAboutNewTabService.idl",
]
XPIDL_MODULE = 'browser-newtab'
XPIDL_MODULE = "browser-newtab"
EXTRA_JS_MODULES += [
'AboutNewTabService.jsm',
"AboutNewTabService.jsm",
]
FINAL_TARGET_FILES.actors += [
'aboutwelcome/AboutWelcomeChild.jsm',
'aboutwelcome/AboutWelcomeParent.jsm',
'actors/ASRouterChild.jsm',
'actors/ASRouterParent.jsm',
"aboutwelcome/AboutWelcomeChild.jsm",
"aboutwelcome/AboutWelcomeParent.jsm",
"actors/ASRouterChild.jsm",
"actors/ASRouterParent.jsm",
]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -5,12 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
"test/browser/browser.ini",
]
MOCHITEST_MANIFESTS += [
'test/mochitest/mochitest.ini'
]
MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"]
with Files('**'):
BUG_COMPONENT = ('Core', 'DOM: Security')
with Files("**"):
BUG_COMPONENT = ("Core", "DOM: Security")

Просмотреть файл

@ -4,33 +4,33 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'WebPayments UI')
with Files("**"):
BUG_COMPONENT = ("Firefox", "WebPayments UI")
EXTRA_JS_MODULES += [
'PaymentUIService.jsm',
"PaymentUIService.jsm",
]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
MOCHITEST_MANIFESTS += [
'test/mochitest/formautofill/mochitest.ini',
'test/mochitest/mochitest.ini',
"test/mochitest/formautofill/mochitest.ini",
"test/mochitest/mochitest.ini",
]
SPHINX_TREES['docs'] = 'docs'
SPHINX_TREES["docs"] = "docs"
with Files('docs/**'):
SCHEDULES.exclusive = ['docs']
with Files("docs/**"):
SCHEDULES.exclusive = ["docs"]
TESTING_JS_MODULES += [
'test/PaymentTestUtils.jsm',
"test/PaymentTestUtils.jsm",
]
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]

Просмотреть файл

@ -11,14 +11,13 @@ class RequestHandler(SimpleHTTPRequestHandler, object):
def translate_path(self, path):
# Map autofill paths to their own directory
autofillPath = "/formautofill"
if (path.startswith(autofillPath)):
path = "browser/extensions/formautofill/content" + \
path[len(autofillPath):]
if path.startswith(autofillPath):
path = "browser/extensions/formautofill/content" + path[len(autofillPath) :]
else:
path = "browser/components/payments/res" + path
return super(RequestHandler, self).translate_path(path)
if __name__ == '__main__':
if __name__ == "__main__":
BaseHTTPServer.test(RequestHandler, BaseHTTPServer.HTTPServer)

Просмотреть файл

@ -4,15 +4,15 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]
MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"]
BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
EXTRA_JS_MODULES += [
'PlacesUIUtils.jsm',
"PlacesUIUtils.jsm",
]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Bookmarks & History')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Bookmarks & History")

Просмотреть файл

@ -7,6 +7,6 @@
with Files("**"):
BUG_COMPONENT = ("Firefox", "Pocket")
BROWSER_CHROME_MANIFESTS += ['test/browser.ini', 'test/unit/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser.ini", "test/unit/browser.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,10 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
for var in ("MOZ_APP_NAME", "MOZ_MACBUNDLE_NAME"):
DEFINES[var] = CONFIG[var]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
DEFINES['HAVE_SHELL_SERVICE'] = 1
if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("windows", "gtk", "cocoa"):
DEFINES["HAVE_SHELL_SERVICE"] = 1
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Просмотреть файл

@ -4,22 +4,17 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
'dialogs'
]
DIRS += ["dialogs"]
BROWSER_CHROME_MANIFESTS += [
'tests/browser.ini',
'tests/siteData/browser.ini'
]
BROWSER_CHROME_MANIFESTS += ["tests/browser.ini", "tests/siteData/browser.ini"]
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
for var in ("MOZ_APP_NAME", "MOZ_MACBUNDLE_NAME"):
DEFINES[var] = CONFIG[var]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
DEFINES['HAVE_SHELL_SERVICE'] = 1
if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("windows", "gtk", "cocoa"):
DEFINES["HAVE_SHELL_SERVICE"] = 1
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Preferences')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Preferences")

Просмотреть файл

@ -5,10 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
"test/browser/browser.ini",
]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Private Browsing')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Private Browsing")

Просмотреть файл

@ -6,9 +6,9 @@ with Files("**"):
BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
EXTRA_JS_MODULES += [
'PromptCollection.jsm',
"PromptCollection.jsm",
]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]

Просмотреть файл

@ -4,9 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Protections UI')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Protections UI")

Просмотреть файл

@ -4,15 +4,15 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
EXTRA_JS_MODULES += [
'WebProtocolHandlerRegistrar.jsm',
"WebProtocolHandlerRegistrar.jsm",
]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'General')
with Files("**"):
BUG_COMPONENT = ("Firefox", "General")

Просмотреть файл

@ -8,13 +8,13 @@ with Files("**"):
BUG_COMPONENT = ("Core", "Security")
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
"test/browser/browser.ini",
]
MOCHITEST_MANIFESTS += [
'test/mochitest/mochitest.ini',
"test/mochitest/mochitest.ini",
]
MOCHITEST_CHROME_MANIFESTS += [
'test/chrome/chrome.ini',
]
"test/chrome/chrome.ini",
]

Просмотреть файл

@ -5,21 +5,21 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXTRA_JS_MODULES += [
'SearchOneOffs.jsm',
'SearchTelemetry.jsm',
'SearchUIUtils.jsm',
"SearchOneOffs.jsm",
"SearchTelemetry.jsm",
"SearchUIUtils.jsm",
]
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
'test/browser/google_codes/browser.ini',
"test/browser/browser.ini",
"test/browser/google_codes/browser.ini",
]
MARIONETTE_LAYOUT_MANIFESTS += ['test/marionette/manifest.ini']
MARIONETTE_LAYOUT_MANIFESTS += ["test/marionette/manifest.ini"]
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Search')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Search")

Просмотреть файл

@ -10,12 +10,13 @@ from marionette_harness.marionette_test import MarionetteTestCase
class TestEnginesOnRestart(MarionetteTestCase):
def setUp(self):
super(TestEnginesOnRestart, self).setUp()
self.marionette.enforce_gecko_prefs({
'browser.search.log': True,
})
self.marionette.enforce_gecko_prefs(
{
"browser.search.log": True,
}
)
def get_default_search_engine(self):
"""Retrieve the identifier of the default search engine."""

Просмотреть файл

@ -4,31 +4,31 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
BROWSER_CHROME_MANIFESTS += ["test/browser.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
EXTRA_JS_MODULES.sessionstore = [
'ContentRestore.jsm',
'ContentSessionStore.jsm',
'GlobalState.jsm',
'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
'RunState.jsm',
'SessionCookies.jsm',
'SessionFile.jsm',
'SessionMigration.jsm',
'SessionSaver.jsm',
'SessionStartup.jsm',
'SessionStore.jsm',
'SessionWorker.js',
'SessionWorker.jsm',
'StartupPerformance.jsm',
'TabAttributes.jsm',
'TabState.jsm',
'TabStateCache.jsm',
'TabStateFlusher.jsm',
"ContentRestore.jsm",
"ContentSessionStore.jsm",
"GlobalState.jsm",
"RecentlyClosedTabsAndWindowsMenuUtils.jsm",
"RunState.jsm",
"SessionCookies.jsm",
"SessionFile.jsm",
"SessionMigration.jsm",
"SessionSaver.jsm",
"SessionStartup.jsm",
"SessionStore.jsm",
"SessionWorker.js",
"SessionWorker.jsm",
"StartupPerformance.jsm",
"TabAttributes.jsm",
"TabState.jsm",
"TabStateCache.jsm",
"TabStateFlusher.jsm",
]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Session Restore')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Session Restore")

Просмотреть файл

@ -5,77 +5,75 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# For BinaryPath::GetLong for Windows
LOCAL_INCLUDES += [
'/xpcom/build'
]
LOCAL_INCLUDES += ["/xpcom/build"]
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser.ini"]
MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"]
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
XPIDL_SOURCES += [
'nsIShellService.idl',
"nsIShellService.idl",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
XPIDL_SOURCES += [
'nsIMacShellService.idl',
"nsIMacShellService.idl",
]
SOURCES += [
'nsMacShellService.cpp',
"nsMacShellService.cpp",
]
LOCAL_INCLUDES += [
# For CocoaFileUtils
'/xpcom/io'
"/xpcom/io"
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
XPIDL_SOURCES += [
'nsIGNOMEShellService.idl',
"nsIGNOMEShellService.idl",
]
SOURCES += [
'nsGNOMEShellService.cpp',
"nsGNOMEShellService.cpp",
]
if CONFIG['MOZ_ENABLE_DBUS']:
if CONFIG["MOZ_ENABLE_DBUS"]:
SOURCES += [
'nsGNOMEShellDBusHelper.cpp',
'nsGNOMEShellSearchProvider.cpp',
"nsGNOMEShellDBusHelper.cpp",
"nsGNOMEShellSearchProvider.cpp",
]
include('/ipc/chromium/chromium-config.mozbuild')
include("/ipc/chromium/chromium-config.mozbuild")
elif CONFIG['OS_ARCH'] == 'WINNT':
elif CONFIG["OS_ARCH"] == "WINNT":
XPIDL_SOURCES += [
'nsIWindowsShellService.idl',
"nsIWindowsShellService.idl",
]
SOURCES += [
'nsWindowsShellService.cpp',
'WindowsDefaultBrowser.cpp',
"nsWindowsShellService.cpp",
"WindowsDefaultBrowser.cpp",
]
LOCAL_INCLUDES += [
'../../../other-licenses/nsis/Contrib/CityHash/cityhash',
"../../../other-licenses/nsis/Contrib/CityHash/cityhash",
]
XPIDL_MODULE = 'shellservice'
XPIDL_MODULE = "shellservice"
if SOURCES:
FINAL_LIBRARY = 'browsercomps'
FINAL_LIBRARY = "browsercomps"
EXTRA_JS_MODULES += [
'HeadlessShell.jsm',
'ScreenshotChild.jsm',
'ShellService.jsm',
"HeadlessShell.jsm",
"ScreenshotChild.jsm",
"ShellService.jsm",
]
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
for var in ("MOZ_APP_NAME", "MOZ_APP_VERSION"):
DEFINES[var] = '"%s"' % CONFIG[var]
CXXFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_ENABLE_DBUS']:
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
CXXFLAGS += CONFIG["TK_CFLAGS"]
if CONFIG["MOZ_ENABLE_DBUS"]:
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Shell Integration')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Shell Integration")

Просмотреть файл

@ -34,24 +34,40 @@ import sys
def main():
parser = argparse.ArgumentParser(description="Utility to print, set, or " +
"check the path to image being used as " +
"the desktop background image. By " +
"default, prints the path to the " +
"current desktop background image.")
parser.add_argument("-v", "--verbose", action="store_true",
help="print verbose debugging information",
default=False)
parser = argparse.ArgumentParser(
description="Utility to print, set, or "
+ "check the path to image being used as "
+ "the desktop background image. By "
+ "default, prints the path to the "
+ "current desktop background image."
)
parser.add_argument(
"-v",
"--verbose",
action="store_true",
help="print verbose debugging information",
default=False,
)
group = parser.add_mutually_exclusive_group()
group.add_argument("-s", "--set-background-image",
dest='newBackgroundImagePath', required=False,
help="path to the new background image to set. A zero " +
"exit code indicates no errors occurred.", default=None)
group.add_argument("-c", "--check-background-image",
dest='checkBackgroundImagePath', required=False,
help="check if the provided background image path " +
"matches the provided path. A zero exit code " +
"indicates the paths match.", default=None)
group.add_argument(
"-s",
"--set-background-image",
dest="newBackgroundImagePath",
required=False,
help="path to the new background image to set. A zero "
+ "exit code indicates no errors occurred.",
default=None,
)
group.add_argument(
"-c",
"--check-background-image",
dest="checkBackgroundImagePath",
required=False,
help="check if the provided background image path "
+ "matches the provided path. A zero exit code "
+ "indicates the paths match.",
default=None,
)
args = parser.parse_args()
# Using logging for verbose output
@ -59,12 +75,14 @@ def main():
logging.basicConfig(level=logging.DEBUG)
else:
logging.basicConfig(level=logging.CRITICAL)
logger = logging.getLogger('desktopImage')
logger = logging.getLogger("desktopImage")
# Print what we're going to do
if args.checkBackgroundImagePath is not None:
logger.debug("checking provided desktop image %s matches current "
"image" % args.checkBackgroundImagePath)
logger.debug(
"checking provided desktop image %s matches current "
"image" % args.checkBackgroundImagePath
)
elif args.newBackgroundImagePath is not None:
logger.debug("setting image to %s " % args.newBackgroundImagePath)
else:
@ -121,7 +139,8 @@ def main():
status = False
(status, error) = ws.setDesktopImageURL_forScreen_options_error_(
newImageURL, focussedScreen, None, None)
newImageURL, focussedScreen, None, None
)
if not status:
raise RuntimeError("setDesktopImageURL error")
@ -145,7 +164,7 @@ def getCurrentDesktopImageURL(focussedScreen, workspace, logger):
return imageURL
if __name__ == '__main__':
if __name__ == "__main__":
if not main():
sys.exit(1)
else:

Просмотреть файл

@ -4,28 +4,28 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['content/jar.mn']
BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
JAR_MANIFESTS += ["content/jar.mn"]
BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"]
XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"]
XPCOM_MANIFESTS += [
'components.conf',
"components.conf",
]
EXTRA_JS_MODULES += [
'SiteSpecificBrowserService.jsm',
"SiteSpecificBrowserService.jsm",
]
EXTRA_JS_MODULES.ssb += [
'ImageTools.jsm',
"ImageTools.jsm",
]
FINAL_TARGET_FILES.actors += [
'SiteSpecificBrowserChild.jsm',
'SiteSpecificBrowserParent.jsm',
"SiteSpecificBrowserChild.jsm",
"SiteSpecificBrowserParent.jsm",
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
EXTRA_JS_MODULES.ssb += [
'WindowsSupport.jsm',
"WindowsSupport.jsm",
]

Просмотреть файл

@ -2,23 +2,22 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["test/browser/browser.ini"]
XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"]
EXTRA_JS_MODULES.syncedtabs += [
'EventEmitter.jsm',
'SyncedTabsDeckComponent.js',
'SyncedTabsDeckStore.js',
'SyncedTabsDeckView.js',
'SyncedTabsListStore.js',
'TabListComponent.js',
'TabListView.js',
'util.js',
"EventEmitter.jsm",
"SyncedTabsDeckComponent.js",
"SyncedTabsDeckStore.js",
"SyncedTabsDeckView.js",
"SyncedTabsListStore.js",
"TabListComponent.js",
"TabListView.js",
"util.js",
]
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Sync')
with Files("**"):
BUG_COMPONENT = ("Firefox", "Sync")

Просмотреть файл

@ -2,14 +2,14 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
with Files('**'):
BUG_COMPONENT = ('Core', 'Widget: Cocoa')
with Files("**"):
BUG_COMPONENT = ("Core", "Widget: Cocoa")
BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"]
EXTRA_COMPONENTS += [
'MacTouchBar.js',
'MacTouchBar.manifest',
"MacTouchBar.js",
"MacTouchBar.manifest",
]
SPHINX_TREES['/browser/touchbar'] = 'docs'
SPHINX_TREES["/browser/touchbar"] = "docs"

Просмотреть файл

@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['jar.mn']
JAR_MANIFESTS += ["jar.mn"]

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше