Commit 1ff59cb7 authored by Dorel Luca's avatar Dorel Luca
Browse files

Backed out changeset 7558c8821a07 (bug 1654103) for multiple failures. CLOSED TREE

parent 03c2fad3
......@@ -12,55 +12,56 @@ 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,39 +4,38 @@
# 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,114 +4,117 @@
# 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"]