Bug 1204154 - Clean up jar manifests that needlessly specify the source file. r=dao
authorJustin Dolske <dolske@mozilla.com>
Tue, 15 Sep 2015 18:33:57 -0700
changeset 295249 d5ea8e4eda6932331c23f0a13d130c026a9b6d68
parent 295248 f1ffe36425983f65d06e1de1378c7347147373b3
child 295250 ff72c4a3db5a3088d5edce319a91cb55168811cd
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1204154
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1204154 - Clean up jar manifests that needlessly specify the source file. r=dao
browser/branding/aurora/content/jar.mn
browser/branding/aurora/locales/jar.mn
browser/branding/nightly/content/jar.mn
browser/branding/nightly/locales/jar.mn
browser/branding/official/content/jar.mn
browser/branding/official/locales/jar.mn
browser/branding/unofficial/content/jar.mn
browser/branding/unofficial/locales/jar.mn
browser/components/extensions/jar.mn
browser/components/pocket/jar.mn
browser/components/tabview/jar.mn
browser/themes/osx/jar.mn
build/docs/jar-manifests.rst
toolkit/components/extensions/jar.mn
toolkit/components/satchel/jar.mn
toolkit/content/jar.mn
toolkit/mozapps/preferences/jar.mn
--- a/browser/branding/aurora/content/jar.mn
+++ b/browser/branding/aurora/content/jar.mn
@@ -1,19 +1,19 @@
 # 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/.
 
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/about-background.png          (about-background.png)
-  content/branding/about-logo.png                (about-logo.png)
-  content/branding/about-logo@2x.png             (about-logo@2x.png)
-  content/branding/about-wordmark.svg            (about-wordmark.svg)
-  content/branding/icon48.png                    (icon48.png)
-  content/branding/icon64.png                    (icon64.png)
+  content/branding/about.png
+  content/branding/about-background.png
+  content/branding/about-logo.png
+  content/branding/about-logo@2x.png
+  content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
   content/branding/icon128.png                   (../mozicon128.png)
-  content/branding/identity-icons-brand.svg      (identity-icons-brand.svg)
-  content/branding/silhouette-40.svg             (silhouette-40.svg)
-  content/branding/aboutDialog.css               (aboutDialog.css)
+  content/branding/identity-icons-brand.svg
+  content/branding/silhouette-40.svg
+  content/branding/aboutDialog.css
--- a/browser/branding/aurora/locales/jar.mn
+++ b/browser/branding/aurora/locales/jar.mn
@@ -4,9 +4,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Aurora branding only exists in en-US
   locale/branding/brand.dtd        (en-US/brand.dtd)
   locale/branding/brand.properties (en-US/brand.properties)
-  locale/branding/browserconfig.properties (browserconfig.properties)
+  locale/branding/browserconfig.properties
--- a/browser/branding/nightly/content/jar.mn
+++ b/browser/branding/nightly/content/jar.mn
@@ -1,19 +1,19 @@
 # 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/.
 
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/about-background.png          (about-background.png)
-  content/branding/about-logo.png                (about-logo.png)
-  content/branding/about-logo@2x.png             (about-logo@2x.png)
-  content/branding/about-wordmark.svg            (about-wordmark.svg)
-  content/branding/icon48.png                    (icon48.png)
-  content/branding/icon64.png                    (icon64.png)
+  content/branding/about.png
+  content/branding/about-background.png
+  content/branding/about-logo.png
+  content/branding/about-logo@2x.png
+  content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
   content/branding/icon128.png                   (../mozicon128.png)
-  content/branding/identity-icons-brand.svg      (identity-icons-brand.svg)
-  content/branding/silhouette-40.svg             (silhouette-40.svg)
-  content/branding/aboutDialog.css               (aboutDialog.css)
+  content/branding/identity-icons-brand.svg
+  content/branding/silhouette-40.svg
+  content/branding/aboutDialog.css
--- a/browser/branding/nightly/locales/jar.mn
+++ b/browser/branding/nightly/locales/jar.mn
@@ -4,9 +4,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Nightly branding only exists in en-US
   locale/branding/brand.dtd        (en-US/brand.dtd)
   locale/branding/brand.properties (en-US/brand.properties)
-  locale/branding/browserconfig.properties (browserconfig.properties)
+  locale/branding/browserconfig.properties
--- a/browser/branding/official/content/jar.mn
+++ b/browser/branding/official/content/jar.mn
@@ -1,18 +1,18 @@
 # 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/.
 
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/about-logo.png                (about-logo.png)
-  content/branding/about-logo@2x.png             (about-logo@2x.png)
-  content/branding/about-wordmark.svg            (about-wordmark.svg)
-  content/branding/icon48.png                    (icon48.png)
-  content/branding/icon64.png                    (icon64.png)
+  content/branding/about.png
+  content/branding/about-logo.png
+  content/branding/about-logo@2x.png
+  content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
   content/branding/icon128.png                   (../mozicon128.png)
-  content/branding/identity-icons-brand.svg      (identity-icons-brand.svg)
-  content/branding/silhouette-40.svg             (silhouette-40.svg)
-  content/branding/aboutDialog.css               (aboutDialog.css)
+  content/branding/identity-icons-brand.svg
+  content/branding/silhouette-40.svg
+  content/branding/aboutDialog.css
--- a/browser/branding/official/locales/jar.mn
+++ b/browser/branding/official/locales/jar.mn
@@ -3,9 +3,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/.
 
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
   locale/branding/brand.dtd        (%brand.dtd)
 * locale/branding/brand.properties (%brand.properties)
-* locale/branding/browserconfig.properties (browserconfig.properties)
+* locale/branding/browserconfig.properties
--- a/browser/branding/unofficial/content/jar.mn
+++ b/browser/branding/unofficial/content/jar.mn
@@ -1,19 +1,19 @@
 # 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/.
 
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/about-background.png          (about-background.png)
-  content/branding/about-logo.png                (about-logo.png)
-  content/branding/about-logo@2x.png             (about-logo@2x.png)
-  content/branding/about-wordmark.svg            (about-wordmark.svg)
-  content/branding/icon48.png                    (icon48.png)
-  content/branding/icon64.png                    (icon64.png)
+  content/branding/about.png
+  content/branding/about-background.png
+  content/branding/about-logo.png
+  content/branding/about-logo@2x.png
+  content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
   content/branding/icon128.png                   (../mozicon128.png)
-  content/branding/identity-icons-brand.svg      (identity-icons-brand.svg)
-  content/branding/silhouette-40.svg             (silhouette-40.svg)
-  content/branding/aboutDialog.css               (aboutDialog.css)
+  content/branding/identity-icons-brand.svg
+  content/branding/silhouette-40.svg
+  content/branding/aboutDialog.css
--- a/browser/branding/unofficial/locales/jar.mn
+++ b/browser/branding/unofficial/locales/jar.mn
@@ -4,9 +4,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Unofficial branding only exists in en-US
   locale/branding/brand.dtd        (en-US/brand.dtd)
   locale/branding/brand.properties (en-US/brand.properties)
-  locale/branding/browserconfig.properties (browserconfig.properties)
+  locale/branding/browserconfig.properties
--- a/browser/components/extensions/jar.mn
+++ b/browser/components/extensions/jar.mn
@@ -1,11 +1,11 @@
 # 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/.
 
 browser.jar:
-    content/browser/extension.svg (extension.svg)
-    content/browser/ext-utils.js (ext-utils.js)
-    content/browser/ext-contextMenus.js (ext-contextMenus.js)
-    content/browser/ext-browserAction.js (ext-browserAction.js)
-    content/browser/ext-tabs.js (ext-tabs.js)
-    content/browser/ext-windows.js (ext-windows.js)
+    content/browser/extension.svg
+    content/browser/ext-utils.js
+    content/browser/ext-contextMenus.js
+    content/browser/ext-browserAction.js
+    content/browser/ext-tabs.js
+    content/browser/ext-windows.js
--- a/browser/components/pocket/jar.mn
+++ b/browser/components/pocket/jar.mn
@@ -1,15 +1,15 @@
 # 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/.
 
 browser.jar:
-  content/browser/pocket/main.js                 (main.js)
-  content/browser/pocket/pktApi.js               (pktApi.js)
+  content/browser/pocket/main.js
+  content/browser/pocket/pktApi.js
   content/browser/pocket/panels/saved.html       (panels/saved.html)
   content/browser/pocket/panels/signup.html      (panels/signup.html)
   content/browser/pocket/panels/css/normalize.css       (panels/css/normalize.css)
   content/browser/pocket/panels/css/firasans.css        (panels/css/firasans.css)
   content/browser/pocket/panels/css/saved.css           (panels/css/saved.css)
   content/browser/pocket/panels/css/signup.css           (panels/css/signup.css)
   content/browser/pocket/panels/fonts/FiraSans-Regular.woff (panels/fonts/FiraSans-Regular.woff)
   content/browser/pocket/panels/img/pocketerror@1x.png             (panels/img/pocketerror@1x.png)
--- a/browser/components/tabview/jar.mn
+++ b/browser/components/tabview/jar.mn
@@ -1,9 +1,9 @@
 # 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/.
 
 browser.jar:
-        content/browser/tabview.css                   (tabview.css)
-*       content/browser/tabview.js                    (tabview.js)
-        content/browser/tabview.html                  (tabview.html)
-        content/browser/tabview-content.js            (content.js)
+        content/browser/tabview.css
+*       content/browser/tabview.js
+        content/browser/tabview.html
+        content/browser/tabview-content.js (content.js)
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -1,15 +1,15 @@
 # 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/.
 
 browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
-  skin/classic/browser/sanitizeDialog.css                   (sanitizeDialog.css)
+  skin/classic/browser/sanitizeDialog.css
   skin/classic/browser/aboutNetError.css                    (../shared/aboutNetError.css)
   skin/classic/browser/aboutNetError_info.svg               (../shared/aboutNetError_info.svg)
   skin/classic/browser/aboutNetError_alert.svg              (../shared/aboutNetError_alert.svg)
 * skin/classic/browser/aboutSessionRestore.css              (../shared/aboutSessionRestore.css)
   skin/classic/browser/aboutSessionRestore-window-icon.png
   skin/classic/browser/aboutWelcomeBack.css                 (../shared/aboutWelcomeBack.css)
   skin/classic/browser/aboutCertError.css
   skin/classic/browser/aboutCertError_sectionCollapsed.png
@@ -26,17 +26,17 @@ browser.jar:
   skin/classic/browser/addons/addon-install-blocked.svg     (../shared/addons/addon-install-blocked.svg)
   skin/classic/browser/addons/addon-install-confirm.svg     (../shared/addons/addon-install-confirm.svg)
   skin/classic/browser/addons/addon-install-downloading.svg (../shared/addons/addon-install-downloading.svg)
   skin/classic/browser/addons/addon-install-error.svg       (../shared/addons/addon-install-error.svg)
   skin/classic/browser/addons/addon-install-installed.svg   (../shared/addons/addon-install-installed.svg)
   skin/classic/browser/addons/addon-install-restart.svg     (../shared/addons/addon-install-restart.svg)
   skin/classic/browser/addons/addon-install-warning.svg     (../shared/addons/addon-install-warning.svg)
   skin/classic/browser/addons/addon-install-anchor.svg      (../shared/addons/addon-install-anchor.svg)
-* skin/classic/browser/browser.css                          (browser.css)
+* skin/classic/browser/browser.css
 * skin/classic/browser/devedition.css
 * skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/click-to-play-warning-stripes.png
   skin/classic/browser/content-contextmenu.svg
   skin/classic/browser/drm-icon.svg                         (../shared/drm-icon.svg)
   skin/classic/browser/fullscreen/insecure.svg              (../shared/fullscreen/insecure.svg)
   skin/classic/browser/fullscreen/secure.svg                (../shared/fullscreen/secure.svg)
   skin/classic/browser/Geolocation-16.png
--- a/build/docs/jar-manifests.rst
+++ b/build/docs/jar-manifests.rst
@@ -26,16 +26,23 @@ more complex ``jar.mn`` is at ``toolkit/
 Shipping Chrome Files
 =====================
 
 To ship chrome files in a JAR, an indented line indicates a file to be packaged::
 
    <jarfile>.jar:
      path/in/jar/file_name.xul     (source/tree/location/file_name.xul)
 
+If the JAR manifest and packaged file live in the same directory, the path and
+parenthesis can be omitted. In other words, the following two lines are
+equivalent::
+
+   path/in/jar/same_place.xhtml     (same_place.xhtml)
+   path/in/jar/same_place.xhtml
+
 The source tree location may also be an *absolute* path (taken from the
 top of the source tree::
 
    path/in/jar/file_name.xul     (/path/in/sourcetree/file_name.xul)
 
 An asterisk marker (``*``) at the beginning of the line indicates that the
 file should be processed by the :ref:`preprocessor` before being packaged::
 
--- a/toolkit/components/extensions/jar.mn
+++ b/toolkit/components/extensions/jar.mn
@@ -1,17 +1,17 @@
 # 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/.
 
 toolkit.jar:
 % content extensions %content/extensions/
-    content/extensions/ext-alarms.js (ext-alarms.js)
-    content/extensions/ext-backgroundPage.js (ext-backgroundPage.js)
-    content/extensions/ext-notifications.js (ext-notifications.js)
-    content/extensions/ext-i18n.js (ext-i18n.js)
-    content/extensions/ext-idle.js (ext-idle.js)
-    content/extensions/ext-webRequest.js (ext-webRequest.js)
-    content/extensions/ext-webNavigation.js (ext-webNavigation.js)
-    content/extensions/ext-runtime.js (ext-runtime.js)
-    content/extensions/ext-extension.js (ext-extension.js)
-    content/extensions/ext-storage.js (ext-storage.js)
-    content/extensions/ext-test.js (ext-test.js)
+    content/extensions/ext-alarms.js
+    content/extensions/ext-backgroundPage.js
+    content/extensions/ext-notifications.js
+    content/extensions/ext-i18n.js
+    content/extensions/ext-idle.js
+    content/extensions/ext-webRequest.js
+    content/extensions/ext-webNavigation.js
+    content/extensions/ext-runtime.js
+    content/extensions/ext-extension.js
+    content/extensions/ext-storage.js
+    content/extensions/ext-test.js
--- a/toolkit/components/satchel/jar.mn
+++ b/toolkit/components/satchel/jar.mn
@@ -1,7 +1,7 @@
 # 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/.
 
 toolkit.jar:
 %   content satchel %content/satchel/
-    content/satchel/formSubmitListener.js            (formSubmitListener.js)
+    content/satchel/formSubmitListener.js
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -1,71 +1,71 @@
 toolkit.jar:
 %  content global %content/global/ contentaccessible=yes
 %  content global-platform %content/global-platform/ platform
 %  content global-region %content/global-region/
 # provide the nsTransferable in nsDragAndDrop.js to extensions that have to
 # work with Geckos from before 1.9, when there was a separate file
 %  override chrome://global/content/nsTransferable.js chrome://global/content/nsDragAndDrop.js
-*  content/global/license.html                (license.html)
-   content/global/XPCNativeWrapper.js         (XPCNativeWrapper.js)
-   content/global/minimal-xul.css             (minimal-xul.css)
-*  content/global/xul.css                     (xul.css)
-   content/global/textbox.css                 (textbox.css)
-   content/global/menulist.css                (menulist.css)
-   content/global/autocomplete.css            (autocomplete.css)
-   content/global/about.js                    (about.js)
-   content/global/about.xhtml                 (about.xhtml)
-   content/global/aboutAbout.js               (aboutAbout.js)
-   content/global/aboutAbout.xhtml            (aboutAbout.xhtml)
+*  content/global/license.html
+   content/global/XPCNativeWrapper.js
+   content/global/minimal-xul.css
+*  content/global/xul.css
+   content/global/textbox.css
+   content/global/menulist.css
+   content/global/autocomplete.css
+   content/global/about.js
+   content/global/about.xhtml
+   content/global/aboutAbout.js
+   content/global/aboutAbout.xhtml
 #ifdef MOZILLA_OFFICIAL
    content/global/aboutRights.xhtml
 #else
    content/global/aboutRights.xhtml           (aboutRights-unbranded.xhtml)
 #endif
    content/global/aboutNetworking.js
    content/global/aboutNetworking.xhtml
    content/global/aboutServiceWorkers.js
    content/global/aboutServiceWorkers.xhtml
    content/global/aboutwebrtc/aboutWebrtc.css   (aboutwebrtc/aboutWebrtc.css)
    content/global/aboutwebrtc/aboutWebrtc.js    (aboutwebrtc/aboutWebrtc.js)
    content/global/aboutwebrtc/aboutWebrtc.xhtml (aboutwebrtc/aboutWebrtc.xhtml)
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
    content/global/aboutTelemetry.js
    content/global/aboutTelemetry.xhtml
-   content/global/aboutTelemetry.css          (aboutTelemetry.css)
+   content/global/aboutTelemetry.css
    content/global/directionDetector.html
    content/global/plugins.html
    content/global/plugins.css
-   content/global/browser-child.js            (browser-child.js)
-   content/global/browser-content.js          (browser-content.js)
-*+  content/global/buildconfig.html            (buildconfig.html)
-*  content/global/contentAreaUtils.js         (contentAreaUtils.js)
-   content/global/customizeToolbar.css        (customizeToolbar.css)
-*  content/global/customizeToolbar.js         (customizeToolbar.js)
-   content/global/customizeToolbar.xul        (customizeToolbar.xul)
-   content/global/devicestorage.properties    (devicestorage.properties)
-   content/global/editMenuOverlay.js          (editMenuOverlay.js)
-*+ content/global/editMenuOverlay.xul         (editMenuOverlay.xul)
-   content/global/finddialog.js               (finddialog.js)
-*+ content/global/finddialog.xul              (finddialog.xul)
-   content/global/findUtils.js                (findUtils.js)
-   content/global/filepicker.properties       (filepicker.properties)
-*+ content/global/globalOverlay.js            (globalOverlay.js)
-+  content/global/mozilla.xhtml               (mozilla.xhtml)
-   content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
-   content/global/process-content.js          (process-content.js)
-   content/global/resetProfile.css            (resetProfile.css)
-   content/global/resetProfile.js             (resetProfile.js)
-   content/global/resetProfile.xul            (resetProfile.xul)
-   content/global/resetProfileProgress.xul    (resetProfileProgress.xul)
-   content/global/select-child.js             (select-child.js)
-   content/global/treeUtils.js                (treeUtils.js)
-   content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
+   content/global/browser-child.js
+   content/global/browser-content.js
+*+  content/global/buildconfig.html
+*  content/global/contentAreaUtils.js
+   content/global/customizeToolbar.css
+*  content/global/customizeToolbar.js
+   content/global/customizeToolbar.xul
+   content/global/devicestorage.properties
+   content/global/editMenuOverlay.js
+*+ content/global/editMenuOverlay.xul
+   content/global/finddialog.js
+*+ content/global/finddialog.xul
+   content/global/findUtils.js
+   content/global/filepicker.properties
+*+ content/global/globalOverlay.js
++  content/global/mozilla.xhtml
+   content/global/nsDragAndDrop.js
+   content/global/process-content.js
+   content/global/resetProfile.css
+   content/global/resetProfile.js
+   content/global/resetProfile.xul
+   content/global/resetProfileProgress.xul
+   content/global/select-child.js
+   content/global/treeUtils.js
+   content/global/viewZoomOverlay.js
 *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
    content/global/bindings/browser.xml         (widgets/browser.xml)
    content/global/bindings/button.xml          (widgets/button.xml)
    content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
    content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
    content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
 *+ content/global/bindings/dialog.xml          (widgets/dialog.xml)
    content/global/bindings/editor.xml          (widgets/editor.xml)
@@ -97,11 +97,11 @@ toolkit.jar:
 *+ content/global/bindings/textbox.xml         (widgets/textbox.xml)
    content/global/bindings/toolbar.xml         (widgets/toolbar.xml)
    content/global/bindings/toolbarbutton.xml   (widgets/toolbarbutton.xml)
 *+ content/global/bindings/tree.xml            (widgets/tree.xml)
 *+ content/global/bindings/videocontrols.xml   (widgets/videocontrols.xml)
    content/global/bindings/videocontrols.css   (widgets/videocontrols.css)
 *+ content/global/bindings/wizard.xml          (widgets/wizard.xml)
 #ifdef XP_MACOSX
-   content/global/macWindowMenu.js             (macWindowMenu.js)
+   content/global/macWindowMenu.js
 #endif
    content/global/svg/svgBindings.xml          (/layout/svg/resources/content/svgBindings.xml)
--- a/toolkit/mozapps/preferences/jar.mn
+++ b/toolkit/mozapps/preferences/jar.mn
@@ -1,11 +1,11 @@
 # 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/.
 
 toolkit.jar:
 % content mozapps %content/mozapps/
-  content/mozapps/preferences/fontbuilder.js                    (fontbuilder.js)
-  content/mozapps/preferences/changemp.js                       (changemp.js)
-  content/mozapps/preferences/changemp.xul                      (changemp.xul)
-  content/mozapps/preferences/removemp.js                       (removemp.js)
-  content/mozapps/preferences/removemp.xul                      (removemp.xul)
+  content/mozapps/preferences/fontbuilder.js
+  content/mozapps/preferences/changemp.js
+  content/mozapps/preferences/changemp.xul
+  content/mozapps/preferences/removemp.js
+  content/mozapps/preferences/removemp.xul