forked from mirrors/gecko-dev
07f5d65c45
Bug 1324617 added /other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp to the sources for browser/components/shell/, which gets linked into libxul via browsercomps. Bug 1348609 then made toolkit/xre/nsXREDirProvider.cpp use the same file, which made toolkit depend on browser. That busts other XUL apps, which then have to individually satisfy that dependency. This change links city.cpp into libxul directly by compiling it as part of toolkit/xre/.
65 lines
1.6 KiB
Python
65 lines
1.6 KiB
Python
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
|
# vim: set filetype=python:
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# 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']
|
|
|
|
JAR_MANIFESTS += ['jar.mn']
|
|
|
|
XPIDL_SOURCES += [
|
|
'nsIShellService.idl',
|
|
]
|
|
|
|
if CONFIG['OS_ARCH'] == 'WINNT':
|
|
XPIDL_SOURCES += [
|
|
'nsIWindowsShellService.idl',
|
|
]
|
|
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
|
XPIDL_SOURCES += [
|
|
'nsIMacShellService.idl',
|
|
]
|
|
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
|
XPIDL_SOURCES += [
|
|
'nsIGNOMEShellService.idl',
|
|
]
|
|
|
|
XPIDL_MODULE = 'shellservice'
|
|
|
|
if CONFIG['OS_ARCH'] == 'WINNT':
|
|
SOURCES += [
|
|
'nsWindowsShellService.cpp',
|
|
]
|
|
LOCAL_INCLUDES += [
|
|
'../../../other-licenses/nsis/Contrib/CityHash/cityhash',
|
|
]
|
|
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
|
SOURCES += [
|
|
'nsMacShellService.cpp',
|
|
]
|
|
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
|
SOURCES += [
|
|
'nsGNOMEShellService.cpp',
|
|
]
|
|
|
|
if SOURCES:
|
|
FINAL_LIBRARY = 'browsercomps'
|
|
|
|
EXTRA_COMPONENTS += [
|
|
'nsSetDefaultBrowser.js',
|
|
'nsSetDefaultBrowser.manifest',
|
|
]
|
|
|
|
EXTRA_JS_MODULES += [
|
|
'ShellService.jsm',
|
|
]
|
|
|
|
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
|
|
DEFINES[var] = '"%s"' % CONFIG[var]
|
|
|
|
CXXFLAGS += CONFIG['TK_CFLAGS']
|
|
|
|
with Files('**'):
|
|
BUG_COMPONENT = ('Firefox', 'Shell Integration')
|