Skip to content

Commit

Permalink
Bug 1240660 - Remove "+" prefixes in jar manifests. r=gps
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
glandium committed Jan 19, 2016
1 parent 378827c commit 95c231a
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion toolkit/components/aboutcache/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# 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)
6 changes: 3 additions & 3 deletions toolkit/components/aboutmemory/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# 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)
4 changes: 2 additions & 2 deletions toolkit/components/aboutperformance/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# 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)
4 changes: 2 additions & 2 deletions toolkit/components/prompts/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

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)
2 changes: 1 addition & 1 deletion toolkit/components/thumbnails/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# 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)
2 changes: 1 addition & 1 deletion toolkit/components/url-classifier/tests/jar.mn
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
toolkit.jar:
+ content/global/url-classifier/unittests.xul (unittests.xul)
content/global/url-classifier/unittests.xul (unittests.xul)
30 changes: 15 additions & 15 deletions toolkit/content/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ toolkit.jar:
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
Expand All @@ -52,14 +52,14 @@ toolkit.jar:
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
Expand All @@ -70,26 +70,26 @@ toolkit.jar:
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)
Expand All @@ -101,15 +101,15 @@ toolkit.jar:
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
Expand Down
10 changes: 5 additions & 5 deletions toolkit/obsolete/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# 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)
22 changes: 11 additions & 11 deletions toolkit/themes/faststripe/global/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
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)
58 changes: 29 additions & 29 deletions toolkit/themes/mobile/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
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)
Expand All @@ -42,7 +42,7 @@ toolkit.jar:
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)
Expand Down

0 comments on commit 95c231a

Please sign in to comment.