Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1204154 - Clean up jar manifests that needlessly specify the source file. r=dao

Browse Source
This commit is contained in:
Justin Dolske 2015-09-15 18:33:57 -07:00
parent a2e697ef3c
commit ae99e672d1
17 changed files with 119 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
browser/branding/aurora/content/jar.mn
View File

@ -4,16 +4,16 @@
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

2
browser/branding/aurora/locales/jar.mn
View File

@ -9,4 +9,4 @@
# 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

20
browser/branding/nightly/content/jar.mn
View File

@ -4,16 +4,16 @@
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

2
browser/branding/nightly/locales/jar.mn
View File

@ -9,4 +9,4 @@
# 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

18
browser/branding/official/content/jar.mn
View File

@ -4,15 +4,15 @@
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

2
browser/branding/official/locales/jar.mn
View File

@ -8,4 +8,4 @@
% 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

20
browser/branding/unofficial/content/jar.mn
View File

@ -4,16 +4,16 @@
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

2
browser/branding/unofficial/locales/jar.mn
View File

@ -9,4 +9,4 @@
# 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

12
browser/components/extensions/jar.mn
View File

@ -3,9 +3,9 @@
# 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

4
browser/components/pocket/jar.mn
View File

@ -3,8 +3,8 @@
# 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)

8
browser/components/tabview/jar.mn
View File

@ -3,7 +3,7 @@
# 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)

4
browser/themes/osx/jar.mn
View File

@ -4,7 +4,7 @@
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)
@ -31,7 +31,7 @@ browser.jar:
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

7
build/docs/jar-manifests.rst
View File

@ -31,6 +31,13 @@ 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::

22
toolkit/components/extensions/jar.mn
View File

@ -4,14 +4,14 @@
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

2
toolkit/components/satchel/jar.mn
View File

@ -4,4 +4,4 @@
toolkit.jar:
% content satchel %content/satchel/
content/satchel/formSubmitListener.js (formSubmitListener.js)
content/satchel/formSubmitListener.js

76
toolkit/content/jar.mn
View File

@ -5,17 +5,17 @@ toolkit.jar:
# 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
@ -32,35 +32,35 @@ toolkit.jar:
* 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)
@ -102,6 +102,6 @@ toolkit.jar:
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)

10
toolkit/mozapps/preferences/jar.mn
View File

@ -4,8 +4,8 @@
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