From 7406a31bca0dcbf6a75f1031637594dd5eff633c Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Fri, 30 Nov 2018 12:55:21 -0500
Subject: Issue #889 - Clean up the Pale Moon tree - Part 2a: Make moz.build
 consistent

---
 application/palemoon/components/build/moz.build    |  8 ++----
 .../palemoon/components/certerror/moz.build        |  1 -
 .../palemoon/components/dirprovider/moz.build      | 12 ++------
 application/palemoon/components/feeds/moz.build    |  8 ++----
 application/palemoon/components/fuel/moz.build     | 12 ++------
 .../palemoon/components/permissions/moz.build      |  1 -
 application/palemoon/components/places/moz.build   |  1 -
 application/palemoon/components/search/moz.build   |  1 -
 .../palemoon/components/sessionstore/moz.build     |  4 +--
 application/palemoon/components/shell/moz.build    | 32 ++++++----------------
 10 files changed, 19 insertions(+), 61 deletions(-)

(limited to 'application/palemoon/components')

diff --git a/application/palemoon/components/build/moz.build b/application/palemoon/components/build/moz.build
index d2b200968..ea1f77163 100644
--- a/application/palemoon/components/build/moz.build
+++ b/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')
 
diff --git a/application/palemoon/components/certerror/moz.build b/application/palemoon/components/certerror/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/components/certerror/moz.build
+++ b/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']
\ No newline at end of file
diff --git a/application/palemoon/components/dirprovider/moz.build b/application/palemoon/components/dirprovider/moz.build
index e51e63449..b01c4a3bc 100644
--- a/application/palemoon/components/dirprovider/moz.build
+++ b/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']
diff --git a/application/palemoon/components/feeds/moz.build b/application/palemoon/components/feeds/moz.build
index 7ae9141aa..736920a73 100644
--- a/application/palemoon/components/feeds/moz.build
+++ b/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']
diff --git a/application/palemoon/components/fuel/moz.build b/application/palemoon/components/fuel/moz.build
index e78eda088..5c468f27d 100644
--- a/application/palemoon/components/fuel/moz.build
+++ b/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']
 
diff --git a/application/palemoon/components/permissions/moz.build b/application/palemoon/components/permissions/moz.build
index a4c26de89..3bbe67297 100644
--- a/application/palemoon/components/permissions/moz.build
+++ b/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']
diff --git a/application/palemoon/components/places/moz.build b/application/palemoon/components/places/moz.build
index 2e35e1951..f8b0d125d 100644
--- a/application/palemoon/components/places/moz.build
+++ b/application/palemoon/components/places/moz.build
@@ -7,4 +7,3 @@
 JAR_MANIFESTS += ['jar.mn']
 
 EXTRA_JS_MODULES += [ 'PlacesUIUtils.jsm' ]
-
diff --git a/application/palemoon/components/search/moz.build b/application/palemoon/components/search/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/components/search/moz.build
+++ b/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']
\ No newline at end of file
diff --git a/application/palemoon/components/sessionstore/moz.build b/application/palemoon/components/sessionstore/moz.build
index 8b38aeba5..84278dafa 100644
--- a/application/palemoon/components/sessionstore/moz.build
+++ b/application/palemoon/components/sessionstore/moz.build
@@ -26,6 +26,4 @@ EXTRA_JS_MODULES.sessionstore = [
     'XPathGenerator.jsm',
 ]
 
-EXTRA_PP_JS_MODULES.sessionstore += [
-    'SessionStore.jsm',
-]
\ No newline at end of file
+EXTRA_PP_JS_MODULES.sessionstore += ['SessionStore.jsm']
\ No newline at end of file
diff --git a/application/palemoon/components/shell/moz.build b/application/palemoon/components/shell/moz.build
index 94ec88571..16bffd7d9 100644
--- a/application/palemoon/components/shell/moz.build
+++ b/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]
-- 
cgit v1.2.3