Browse Source

Issue #889 - Clean up the Pale Moon tree - Part 2a: Make moz.build consistent

pull/1/head
NTD 4 years ago committed by Roy Tam
parent
commit
e954ea3e95
  1. 13
      application/palemoon/app/moz.build
  2. 1
      application/palemoon/branding/official/content/moz.build
  3. 1
      application/palemoon/branding/official/locales/moz.build
  4. 1
      application/palemoon/branding/unofficial/content/moz.build
  5. 1
      application/palemoon/branding/unstable/content/moz.build
  6. 8
      application/palemoon/components/build/moz.build
  7. 1
      application/palemoon/components/certerror/moz.build
  8. 12
      application/palemoon/components/dirprovider/moz.build
  9. 8
      application/palemoon/components/feeds/moz.build
  10. 12
      application/palemoon/components/fuel/moz.build
  11. 1
      application/palemoon/components/permissions/moz.build
  12. 1
      application/palemoon/components/places/moz.build
  13. 1
      application/palemoon/components/search/moz.build
  14. 4
      application/palemoon/components/sessionstore/moz.build
  15. 32
      application/palemoon/components/shell/moz.build
  16. 4
      application/palemoon/fonts/moz.build
  17. 2
      application/palemoon/modules/moz.build
  18. 4
      application/palemoon/moz.build
  19. 1
      application/palemoon/themes/moz.build

13
application/palemoon/app/moz.build

@ -6,7 +6,6 @@
DIRS += ['profile/extensions']
GeckoProgram(CONFIG['MOZ_APP_NAME'])
JS_PREFERENCE_PP_FILES += [
@ -18,18 +17,14 @@ if CONFIG['LIBXUL_SDK']:
'profile/channel-prefs.js',
]
SOURCES += [
'nsBrowserApp.cpp',
]
SOURCES += ['nsBrowserApp.cpp']
FINAL_TARGET_FILES += ['blocklist.xml']
FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
LOCAL_INCLUDES += [
'!/build',
]
LOCAL_INCLUDES += ['!/build']
LOCAL_INCLUDES += [
'/toolkit/xre',
@ -37,9 +32,7 @@ LOCAL_INCLUDES += [
'/xpcom/build',
]
USE_LIBS += [
'mozglue',
]
USE_LIBS += ['mozglue']
if CONFIG['_MSC_VER']:
# Always enter a Windows program through wmain, whether or not we're

1
application/palemoon/branding/official/content/moz.build

@ -4,5 +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']

1
application/palemoon/branding/official/locales/moz.build

@ -4,5 +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']

1
application/palemoon/branding/unofficial/content/moz.build

@ -4,5 +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']

1
application/palemoon/branding/unstable/content/moz.build

@ -4,5 +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']

8
application/palemoon/components/build/moz.build

@ -4,13 +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/.
EXPORTS += [
'nsBrowserCompsCID.h',
]
EXPORTS += ['nsBrowserCompsCID.h']
SOURCES += [
'nsModule.cpp',
]
SOURCES += ['nsModule.cpp']
XPCOMBinaryComponent('browsercomps')

1
application/palemoon/components/certerror/moz.build

@ -4,5 +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']

12
application/palemoon/components/dirprovider/moz.build

@ -4,16 +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/.
EXPORTS.mozilla.browser += [
'DirectoryProvider.h',
]
EXPORTS.mozilla.browser += ['DirectoryProvider.h']
SOURCES += [
'DirectoryProvider.cpp',
]
SOURCES += ['DirectoryProvider.cpp']
FINAL_LIBRARY = 'browsercomps'
LOCAL_INCLUDES += [
'../build'
]
LOCAL_INCLUDES += ['../build']

8
application/palemoon/components/feeds/moz.build

@ -13,9 +13,7 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'browser-feeds'
SOURCES += [
'nsFeedSniffer.cpp',
]
SOURCES += ['nsFeedSniffer.cpp']
EXTRA_COMPONENTS += [
'BrowserFeeds.manifest',
@ -32,6 +30,4 @@ FINAL_LIBRARY = 'browsercomps'
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
DEFINES[var] = CONFIG[var]
LOCAL_INCLUDES += [
'../build',
]
LOCAL_INCLUDES += ['../build']

12
application/palemoon/components/fuel/moz.build

@ -4,17 +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/.
XPIDL_SOURCES += [
'fuelIApplication.idl',
]
XPIDL_SOURCES += ['fuelIApplication.idl']
XPIDL_MODULE = 'fuel'
EXTRA_COMPONENTS += [
'fuelApplication.manifest',
]
EXTRA_COMPONENTS += ['fuelApplication.manifest']
EXTRA_PP_COMPONENTS += [
'fuelApplication.js',
]
EXTRA_PP_COMPONENTS += ['fuelApplication.js']

1
application/palemoon/components/permissions/moz.build

@ -4,5 +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']

1
application/palemoon/components/places/moz.build

@ -7,4 +7,3 @@
JAR_MANIFESTS += ['jar.mn']
EXTRA_JS_MODULES += [ 'PlacesUIUtils.jsm' ]

1
application/palemoon/components/search/moz.build

@ -4,5 +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']

4
application/palemoon/components/sessionstore/moz.build

@ -26,6 +26,4 @@ EXTRA_JS_MODULES.sessionstore = [
'XPathGenerator.jsm',
]
EXTRA_PP_JS_MODULES.sessionstore += [
'SessionStore.jsm',
]
EXTRA_PP_JS_MODULES.sessionstore += ['SessionStore.jsm']

32
application/palemoon/components/shell/moz.build

@ -6,37 +6,23 @@
JAR_MANIFESTS += ['jar.mn']
XPIDL_SOURCES += [
'nsIShellService.idl',
]
XPIDL_SOURCES += ['nsIShellService.idl']
if CONFIG['OS_ARCH'] == 'WINNT':
XPIDL_SOURCES += [
'nsIWindowsShellService.idl',
]
XPIDL_SOURCES += ['nsIWindowsShellService.idl']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
XPIDL_SOURCES += [
'nsIMacShellService.idl',
]
XPIDL_SOURCES += ['nsIMacShellService.idl']
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
XPIDL_SOURCES += [
'nsIGNOMEShellService.idl',
]
XPIDL_SOURCES += ['nsIGNOMEShellService.idl']
XPIDL_MODULE = 'shellservice'
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'nsWindowsShellService.cpp',
]
SOURCES += ['nsWindowsShellService.cpp']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
'nsMacShellService.cpp',
]
SOURCES += ['nsMacShellService.cpp']
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
SOURCES += [
'nsGNOMEShellService.cpp',
]
SOURCES += ['nsGNOMEShellService.cpp']
if SOURCES:
FINAL_LIBRARY = 'browsercomps'
@ -46,9 +32,7 @@ EXTRA_COMPONENTS += [
'nsSetDefaultBrowser.manifest',
]
EXTRA_JS_MODULES += [
'ShellService.jsm',
]
EXTRA_JS_MODULES += ['ShellService.jsm']
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
DEFINES[var] = '"%s"' % CONFIG[var]

4
application/palemoon/fonts/moz.build

@ -6,6 +6,4 @@
if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
DIST_SUBDIR = ''
FINAL_TARGET_FILES.fonts += [
'TwemojiMozilla.ttf'
]
FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf']

2
application/palemoon/modules/moz.build

@ -4,7 +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/.
EXTRA_JS_MODULES += [
'AutoCompletePopup.jsm',
'BrowserNewTabPreloader.jsm',
@ -38,5 +37,6 @@ EXTRA_PP_JS_MODULES += [
# Pass down 'official build' flags
if CONFIG['MC_OFFICIAL']:
DEFINES['MC_OFFICIAL'] = 1
if CONFIG['MOZILLA_OFFICIAL']:
DEFINES['MOZILLA_OFFICIAL'] = 1

4
application/palemoon/moz.build

@ -15,9 +15,7 @@ DIRS += [
'themes',
]
DIRS += [
'app',
]
DIRS += ['app']
if CONFIG['MAKENSISU']:
DIRS += ['installer/windows']

1
application/palemoon/themes/moz.build

@ -12,4 +12,3 @@ elif toolkit in ('gtk2', 'gtk3', 'qt'):
DIRS += ['linux']
else:
DIRS += ['windows']

Loading…
Cancel
Save