Bug 1240660 - Remove "+" prefixes in jar manifests. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Jan 2016 15:26:39 +0900
changeset 302836 9041cb2cd652bfc5c43ed92c143d4fa9c7608109
parent 302835 3c0a31d2f0e53d54ef6f8e4b5bb44930a815abbf
child 302837 9c30bc35d6e7929a6f4091a77aa644fee3a5b89a
push id8978
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 14:05:32 +0000
treeherdermozilla-aurora@b9a803752a2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1240660
milestone46.0a1
Bug 1240660 - Remove "+" prefixes in jar manifests. r=gps Now that the faster make backend is enabled by default avoiding cross-jar.mn file conflicts, and now that individual files can't overlap with wildcards in the same jar.mn files, which were two main things that the "+" prefix was used for (apart from cargo-culting), the "+" prefixes in the tree are not necessary anymore.
toolkit/components/aboutcache/jar.mn
toolkit/components/aboutmemory/jar.mn
toolkit/components/aboutperformance/jar.mn
toolkit/components/prompts/jar.mn
toolkit/components/thumbnails/jar.mn
toolkit/components/url-classifier/tests/jar.mn
toolkit/content/jar.mn
toolkit/obsolete/jar.mn
toolkit/themes/faststripe/global/jar.mn
toolkit/themes/mobile/jar.mn
--- a/toolkit/components/aboutcache/jar.mn
+++ b/toolkit/components/aboutcache/jar.mn
@@ -1,6 +1,6 @@
 # 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/global/aboutCache.js                         (content/aboutCache.js)
+  content/global/aboutCache.js                         (content/aboutCache.js)
--- a/toolkit/components/aboutmemory/jar.mn
+++ b/toolkit/components/aboutmemory/jar.mn
@@ -1,8 +1,8 @@
 # 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/global/aboutMemory.js                        (content/aboutMemory.js)
-+ content/global/aboutMemory.xhtml                     (content/aboutMemory.xhtml)
-+ content/global/aboutMemory.css                       (content/aboutMemory.css)
+  content/global/aboutMemory.js                        (content/aboutMemory.js)
+  content/global/aboutMemory.xhtml                     (content/aboutMemory.xhtml)
+  content/global/aboutMemory.css                       (content/aboutMemory.css)
--- a/toolkit/components/aboutperformance/jar.mn
+++ b/toolkit/components/aboutperformance/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/global/aboutPerformance.xhtml               (content/aboutPerformance.xhtml)
-+ content/global/aboutPerformance.js                  (content/aboutPerformance.js)
+  content/global/aboutPerformance.xhtml               (content/aboutPerformance.xhtml)
+  content/global/aboutPerformance.js                  (content/aboutPerformance.js)
--- a/toolkit/components/prompts/jar.mn
+++ b/toolkit/components/prompts/jar.mn
@@ -1,12 +1,12 @@
 # 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/global/commonDialog.js             (content/commonDialog.js)
-*+ content/global/commonDialog.xul            (content/commonDialog.xul)
+*  content/global/commonDialog.xul            (content/commonDialog.xul)
    content/global/commonDialog.css            (content/commonDialog.css)
    content/global/selectDialog.js             (content/selectDialog.js)
    content/global/selectDialog.xul            (content/selectDialog.xul)
    content/global/tabprompts.css              (content/tabprompts.css)
-*+ content/global/tabprompts.xml              (content/tabprompts.xml)
+*  content/global/tabprompts.xml              (content/tabprompts.xml)
--- a/toolkit/components/thumbnails/jar.mn
+++ b/toolkit/components/thumbnails/jar.mn
@@ -1,6 +1,6 @@
 # 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/global/backgroundPageThumbsContent.js (content/backgroundPageThumbsContent.js)
+  content/global/backgroundPageThumbsContent.js (content/backgroundPageThumbsContent.js)
--- a/toolkit/components/url-classifier/tests/jar.mn
+++ b/toolkit/components/url-classifier/tests/jar.mn
@@ -1,2 +1,2 @@
 toolkit.jar:
-+ content/global/url-classifier/unittests.xul         (unittests.xul)
+  content/global/url-classifier/unittests.xul         (unittests.xul)
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -37,80 +37,80 @@ toolkit.jar:
    content/global/aboutTelemetry.js
    content/global/aboutTelemetry.xhtml
    content/global/aboutTelemetry.css
    content/global/directionDetector.html
    content/global/plugins.html
    content/global/plugins.css
    content/global/browser-child.js
    content/global/browser-content.js
-*+  content/global/buildconfig.html
+*   content/global/buildconfig.html
 *  content/global/contentAreaUtils.js
 #ifndef MOZ_FENNEC
    content/global/customizeToolbar.css
    content/global/customizeToolbar.js
    content/global/customizeToolbar.xul
 #endif
    content/global/devicestorage.properties
 #ifndef MOZ_FENNEC
    content/global/editMenuOverlay.js
-*+ content/global/editMenuOverlay.xul
+*  content/global/editMenuOverlay.xul
    content/global/finddialog.js
-*+ content/global/finddialog.xul
+*  content/global/finddialog.xul
    content/global/findUtils.js
 #endif
    content/global/filepicker.properties
-+  content/global/globalOverlay.js
-+  content/global/mozilla.xhtml
+   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/TopLevelVideoDocument.js
    content/global/treeUtils.js
    content/global/viewZoomOverlay.js
-+  content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
+   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/dialog.xml          (widgets/dialog.xml)
    content/global/bindings/editor.xml          (widgets/editor.xml)
    content/global/bindings/expander.xml        (widgets/expander.xml)
    content/global/bindings/filefield.xml       (widgets/filefield.xml)
-*+ content/global/bindings/findbar.xml         (widgets/findbar.xml)
+*  content/global/bindings/findbar.xml         (widgets/findbar.xml)
    content/global/bindings/general.xml         (widgets/general.xml)
    content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
-+  content/global/bindings/listbox.xml         (widgets/listbox.xml)
+   content/global/bindings/listbox.xml         (widgets/listbox.xml)
    content/global/bindings/menu.xml            (widgets/menu.xml)
    content/global/bindings/menulist.xml        (widgets/menulist.xml)
    content/global/bindings/notification.xml    (widgets/notification.xml)
    content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
    content/global/bindings/popup.xml           (widgets/popup.xml)
-*+ content/global/bindings/preferences.xml     (widgets/preferences.xml)
+*  content/global/bindings/preferences.xml     (widgets/preferences.xml)
    content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
    content/global/bindings/radio.xml           (widgets/radio.xml)
    content/global/bindings/remote-browser.xml  (widgets/remote-browser.xml)
    content/global/bindings/resizer.xml         (widgets/resizer.xml)
    content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
    content/global/bindings/scale.xml           (widgets/scale.xml)
    content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
    content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
    content/global/bindings/splitter.xml        (widgets/splitter.xml)
    content/global/bindings/spinbuttons.xml     (widgets/spinbuttons.xml)
    content/global/bindings/stringbundle.xml    (widgets/stringbundle.xml)
-*+ content/global/bindings/tabbox.xml          (widgets/tabbox.xml)
+*  content/global/bindings/tabbox.xml          (widgets/tabbox.xml)
    content/global/bindings/text.xml            (widgets/text.xml)
-*+ content/global/bindings/textbox.xml         (widgets/textbox.xml)
+*  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/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)
+*  content/global/bindings/wizard.xml          (widgets/wizard.xml)
 #ifdef XP_MACOSX
    content/global/macWindowMenu.js
 #endif
    content/global/svg/svgBindings.xml          (/layout/svg/resources/content/svgBindings.xml)
--- a/toolkit/obsolete/jar.mn
+++ b/toolkit/obsolete/jar.mn
@@ -1,12 +1,12 @@
 # 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/global/globalOverlay.xul             (content/globalOverlay.xul)
-*+ content/global/dialogOverlay.xul             (content/dialogOverlay.xul)
+   content/global/globalOverlay.xul             (content/globalOverlay.xul)
+*  content/global/dialogOverlay.xul             (content/dialogOverlay.xul)
    content/global/dialogOverlay.js              (content/dialogOverlay.js)
    content/global/inlineSpellCheckUI.js         (content/inlineSpellCheckUI.js)
-+  content/global/nsClipboard.js                (content/nsClipboard.js)
-+  content/global/nsUserSettings.js             (content/nsUserSettings.js)
-+  content/global/strres.js                     (content/strres.js)
+   content/global/nsClipboard.js                (content/nsClipboard.js)
+   content/global/nsUserSettings.js             (content/nsUserSettings.js)
+   content/global/strres.js                     (content/strres.js)
--- a/toolkit/themes/faststripe/global/jar.mn
+++ b/toolkit/themes/faststripe/global/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/.
 
 toolkit.jar:
 % skin global classic/1.0 %skin/classic/global/
 # These are the CSS files that have been changed from windows
-+  skin/classic/global/button.css
-+  skin/classic/global/checkbox.css
-+  skin/classic/global/dropmarker.css
-+  skin/classic/global/groupbox.css
-+  skin/classic/global/menu.css
-+  skin/classic/global/menulist.css
-+  skin/classic/global/popup.css
-+  skin/classic/global/radio.css
-+  skin/classic/global/tabbox.css
-+  skin/classic/global/textbox.css
-+  skin/classic/global/scrollbars.css                       (xulscrollbars.css)
+   skin/classic/global/button.css
+   skin/classic/global/checkbox.css
+   skin/classic/global/dropmarker.css
+   skin/classic/global/groupbox.css
+   skin/classic/global/menu.css
+   skin/classic/global/menulist.css
+   skin/classic/global/popup.css
+   skin/classic/global/radio.css
+   skin/classic/global/tabbox.css
+   skin/classic/global/textbox.css
+   skin/classic/global/scrollbars.css                       (xulscrollbars.css)
--- a/toolkit/themes/mobile/jar.mn
+++ b/toolkit/themes/mobile/jar.mn
@@ -1,53 +1,53 @@
 # 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:
 % skin global classic/1.0 %skin/classic/global/
 # These are the CSS files that must exist
-+  skin/classic/global/autocomplete.css                    (global/empty.css)
-+  skin/classic/global/button.css                          (global/empty.css)
-+  skin/classic/global/checkbox.css                        (global/empty.css)
-+  skin/classic/global/dialog.css                          (global/empty.css)
-+  skin/classic/global/dropmarker.css                      (global/empty.css)
-+  skin/classic/global/global.css                          (global/empty.css)
-+  skin/classic/global/groupbox.css                        (global/empty.css)
-+  skin/classic/global/listbox.css                         (global/empty.css)
-+  skin/classic/global/menu.css                            (global/empty.css)
-+  skin/classic/global/menulist.css                        (global/empty.css)
-+  skin/classic/global/numberbox.css                       (global/empty.css)
-+  skin/classic/global/popup.css                           (global/empty.css)
-+  skin/classic/global/preferences.css                     (global/empty.css)
-+  skin/classic/global/progressmeter.css                   (global/empty.css)
-+  skin/classic/global/radio.css                           (global/empty.css)
-+  skin/classic/global/resizer.css                         (global/empty.css)
-+  skin/classic/global/richlistbox.css                     (global/empty.css)
-+  skin/classic/global/scale.css                           (global/empty.css)
-+  skin/classic/global/scrollbox.css                       (global/empty.css)
-+  skin/classic/global/spinbuttons.css                     (global/empty.css)
-+  skin/classic/global/splitter.css                        (global/empty.css)
-+  skin/classic/global/tabbox.css                          (global/empty.css)
-+  skin/classic/global/textbox.css                         (global/empty.css)
-+  skin/classic/global/toolbar.css                         (global/empty.css)
-+  skin/classic/global/toolbarbutton.css                   (global/empty.css)
-+  skin/classic/global/tree.css                            (global/empty.css)
-+  skin/classic/global/wizard.css                          (global/empty.css)
-+  skin/classic/global/scrollbars.css                      (global/empty.css)
+   skin/classic/global/autocomplete.css                    (global/empty.css)
+   skin/classic/global/button.css                          (global/empty.css)
+   skin/classic/global/checkbox.css                        (global/empty.css)
+   skin/classic/global/dialog.css                          (global/empty.css)
+   skin/classic/global/dropmarker.css                      (global/empty.css)
+   skin/classic/global/global.css                          (global/empty.css)
+   skin/classic/global/groupbox.css                        (global/empty.css)
+   skin/classic/global/listbox.css                         (global/empty.css)
+   skin/classic/global/menu.css                            (global/empty.css)
+   skin/classic/global/menulist.css                        (global/empty.css)
+   skin/classic/global/numberbox.css                       (global/empty.css)
+   skin/classic/global/popup.css                           (global/empty.css)
+   skin/classic/global/preferences.css                     (global/empty.css)
+   skin/classic/global/progressmeter.css                   (global/empty.css)
+   skin/classic/global/radio.css                           (global/empty.css)
+   skin/classic/global/resizer.css                         (global/empty.css)
+   skin/classic/global/richlistbox.css                     (global/empty.css)
+   skin/classic/global/scale.css                           (global/empty.css)
+   skin/classic/global/scrollbox.css                       (global/empty.css)
+   skin/classic/global/spinbuttons.css                     (global/empty.css)
+   skin/classic/global/splitter.css                        (global/empty.css)
+   skin/classic/global/tabbox.css                          (global/empty.css)
+   skin/classic/global/textbox.css                         (global/empty.css)
+   skin/classic/global/toolbar.css                         (global/empty.css)
+   skin/classic/global/toolbarbutton.css                   (global/empty.css)
+   skin/classic/global/tree.css                            (global/empty.css)
+   skin/classic/global/wizard.css                          (global/empty.css)
+   skin/classic/global/scrollbars.css                      (global/empty.css)
 
    skin/classic/global/media/clicktoplay-bgtexture.png     (global/media/clicktoplay-bgtexture.png)
    skin/classic/global/media/error.png                     (global/media/error.png)
    skin/classic/global/media/throbber.png                  (global/media/throbber.png)
    skin/classic/global/media/videoClickToPlayButton.svg    (global/media/videoClickToPlayButton.svg)
 
    skin/classic/global/icons/Error.png                     (global/icons/Error.png)
 
 % skin mozapps classic/1.0 %skin/classic/mozapps/
-+  skin/classic/mozapps/plugins/pluginProblem.css          (mozapps/plugins/pluginProblem.css)
+   skin/classic/mozapps/plugins/pluginProblem.css          (mozapps/plugins/pluginProblem.css)
 
    skin/classic/mozapps/plugins/contentPluginActivate.png  (mozapps/plugins/contentPluginActivate.png)
    skin/classic/mozapps/plugins/contentPluginBlocked.png   (mozapps/plugins/contentPluginBlocked.png)
    skin/classic/mozapps/plugins/contentPluginClose.png     (mozapps/plugins/contentPluginClose.png)
    skin/classic/mozapps/plugins/contentPluginCrashed.png   (mozapps/plugins/contentPluginCrashed.png)
    skin/classic/mozapps/plugins/contentPluginDisabled.png  (mozapps/plugins/contentPluginDisabled.png)
    skin/classic/mozapps/plugins/contentPluginDownload.png  (mozapps/plugins/contentPluginDownload.png)
    skin/classic/mozapps/plugins/contentPluginMissing.png   (mozapps/plugins/contentPluginMissing.png)