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

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 += [
+SOURCES += ['nsBrowserApp.cpp']
-    'nsBrowserApp.cpp',
-]
 
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
-LOCAL_INCLUDES += [
+LOCAL_INCLUDES += ['!/build']
-    '!/build',
-]
 
 LOCAL_INCLUDES += [
     '/toolkit/xre',
@@ -37,9 +32,7 @@ LOCAL_INCLUDES += [
     '/xpcom/build',
 ]
 
-USE_LIBS += [
+USE_LIBS += ['mozglue']
-    'mozglue',
-]
 
 if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're

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']

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']

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']

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']

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

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']

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

application/palemoon/components/feeds/moz.build

@@ -13,9 +13,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'browser-feeds'
 
-SOURCES += [
+SOURCES += ['nsFeedSniffer.cpp']
-    '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 += [
+LOCAL_INCLUDES += ['../build']
-    '../build',
-]

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

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']

application/palemoon/components/places/moz.build

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

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']

application/palemoon/components/sessionstore/moz.build

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

application/palemoon/components/shell/moz.build

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

application/palemoon/fonts/moz.build

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

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

application/palemoon/moz.build

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

application/palemoon/themes/moz.build

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