From ae79f996db5cec04999d164552b75b3366cfa54a Mon Sep 17 00:00:00 2001 From: Thomas Groman Date: Fri, 24 Apr 2020 22:38:11 -0700 Subject: Remove AppConstants and do stuff in preproccessor, also remove unsupported OS code https://web.archive.org/web/20200425044233/https://github.com/MoonchildProductions/UXP/issues/65 --- webbrowser/components/shell/moz.build | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'webbrowser/components/shell/moz.build') diff --git a/webbrowser/components/shell/moz.build b/webbrowser/components/shell/moz.build index 16bffd7..925e635 100644 --- a/webbrowser/components/shell/moz.build +++ b/webbrowser/components/shell/moz.build @@ -1,27 +1,16 @@ # -*- 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/. 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']: +if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: XPIDL_SOURCES += ['nsIGNOMEShellService.idl'] XPIDL_MODULE = 'shellservice' -if CONFIG['OS_ARCH'] == 'WINNT': - SOURCES += ['nsWindowsShellService.cpp'] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - SOURCES += ['nsMacShellService.cpp'] -elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: +if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: SOURCES += ['nsGNOMEShellService.cpp'] if SOURCES: @@ -32,7 +21,7 @@ EXTRA_COMPONENTS += [ 'nsSetDefaultBrowser.manifest', ] -EXTRA_JS_MODULES += ['ShellService.jsm'] +EXTRA_PP_JS_MODULES += ['ShellService.jsm'] for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'): DEFINES[var] = '"%s"' % CONFIG[var] -- cgit v1.2.3