Bug 451909 - kill MOZ_XUL_APP now that all apps set it; 'jar.mn' part; r=ted.mielczarek
authorArpad Borsos <arpad.borsos@googlemail.com>
Mon, 15 Sep 2008 15:19:32 +0200
changeset 19251 9b921a3fdb5e2c84c529a5525aad39775eba9778
parent 19250 94be66642c6214a9c0d0fbdb3d9ee6f23f54337d
child 19252 b45a0cf790c1d5e23179c907fa53ffdf78497d4b
push idunknown
push userunknown
push dateunknown
reviewersted.mielczarek
bugs451909
milestone1.9.1b1pre
Bug 451909 - kill MOZ_XUL_APP now that all apps set it; 'jar.mn' part; r=ted.mielczarek
content/xslt/tests/buster/jar.mn
embedding/components/ui/jar.mn
extensions/python/dom/test/pyxultest/jar.mn
extensions/reporter/jar.mn
extensions/reporter/locales/jar.mn
layout/style/xbl-marquee/jar.mn
netwerk/locales/jar.mn
security/manager/locales/jar.mn
security/manager/pki/resources/jar.mn
--- a/content/xslt/tests/buster/jar.mn
+++ b/content/xslt/tests/buster/jar.mn
@@ -1,15 +1,11 @@
 xslt-qa.jar:
-#ifdef MOZ_XUL_APP
 % content xslt-qa %content/xslt-qa/
 % overlay chrome://communicator/content/tasksOverlay.xul chrome://xslt-qa/content/xslt-qa-overlay.xul
-#else
-* content/xslt-qa/contents.rdf                 (contents.rdf)
-#endif
   content/xslt-qa/xslt-qa-overlay.xul
   content/xslt-qa/xslt-qa-overlay.js
   content/xslt-qa/buster/buster.xul
   content/xslt-qa/buster/buster.css
   content/xslt-qa/buster/buster-statics.js
   content/xslt-qa/buster/buster-handlers.js
   content/xslt-qa/buster/buster-files.js
   content/xslt-qa/buster/buster-test.js
--- a/embedding/components/ui/jar.mn
+++ b/embedding/components/ui/jar.mn
@@ -1,11 +1,3 @@
-#ifndef MOZ_XUL_APP
-en-US.jar:
-    locale/en-US/global/nsHelperAppDlg.dtd (/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd)
-    locale/en-US/global/nsHelperAppDlg.properties (/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.properties)
-    locale/en-US/global/nsProgressDialog.dtd (/toolkit/locales/en-US/chrome/global/nsProgressDialog.dtd)
-    locale/en-US/global/nsProgressDialog.properties (/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties)
-#endif
-
 toolkit.jar:
     content/global/nsHelperAppDlg.xul (helperAppDlg/nsHelperAppDlg.xul)
     content/global/nsProgressDialog.xul  (progressDlg/nsProgressDialog.xul)
--- a/extensions/python/dom/test/pyxultest/jar.mn
+++ b/extensions/python/dom/test/pyxultest/jar.mn
@@ -4,23 +4,17 @@
 # only used by the Mozilla build process (although I'm not sure exactly now!)
 
 # As most apps will be outside the mozilla tree and presumably have their 
 # own build process, they probably don't need this file.
 #
 # Clarifications and simplifications welcome!
 
 pyxultest.jar:
-#ifdef MOZ_XUL_APP
-## A xulrunner app
 %   content pyxultest %content/pyxultest/
-#else
-## Old style manifest.
-    content/pyxultest/contents.rdf            (chrome/contents.rdf)
-#endif
     content/pyxultest/pyxultest.xul           (chrome/content/pyxultest.xul)
     content/pyxultest/pyxultest.py            (chrome/content/pyxultest.py)
     content/pyxultest/pyxultest.css           (chrome/content/pyxultest.css)
     content/pyxultest/dialog.xul              (chrome/content/dialog.xul)
     content/pyxultest/python_overlay.xul      (chrome/content/python_overlay.xul)
     content/pyxultest/js_overlay.xul          (chrome/content/js_overlay.xul)
     content/pyxultest/pytester.xul            (chrome/content/pytester.xul)
     content/pyxultest/pytester.py             (chrome/content/pytester.py)
--- a/extensions/reporter/jar.mn
+++ b/extensions/reporter/jar.mn
@@ -1,19 +1,14 @@
 reporter.jar:
-#ifdef MOZ_XUL_APP
 % content reporter %content/reporter/ xpcnativewrappers=yes
 % overlay chrome://browser/content/browser.xul         chrome://reporter/content/reporterOverlay.xul
 % overlay chrome://navigator/content/navigator.xul     chrome://reporter/content/reporterOverlay.xul
 % overlay chrome://global/content/customizeToolbar.xul chrome://reporter/content/reporterOverlay.xul
 % skin reporter classic/1.0 %skin/classic/reporter/
-#else
-* content/reporter/contents.rdf                          (resources/content/reporter/contents.rdf)
-  skin/classic/reporter/contents.rdf                     (resources/skin/classic/reporter/contents.rdf)
-#endif
  content/reporter/reportWizard.xul                       (resources/content/reporter/reportWizard.xul)
  content/reporter/reportWizard.js                        (resources/content/reporter/reportWizard.js)
  content/reporter/reporterOverlay.xul                    (resources/content/reporter/reporterOverlay.xul)
  content/reporter/reporterOverlay.js                     (resources/content/reporter/reporterOverlay.js)
  content/reporter/error.xhtml                            (resources/content/reporter/error.xhtml)
  content/reporter/report.xhtml                           (resources/content/reporter/report.xhtml)
  skin/classic/reporter/icon.png                          (resources/skin/classic/reporter/icon.png)
  skin/classic/reporter/reportResults.css                 (resources/skin/classic/reporter/reportResults.css)
--- a/extensions/reporter/locales/jar.mn
+++ b/extensions/reporter/locales/jar.mn
@@ -1,16 +1,11 @@
 #filter substitution
 
-#ifdef MOZ_XUL_APP
 @AB_CD@.jar:
-#else
-reporter.jar:
-* locale/@AB_CD@/reporter/contents.rdf                      (generic/chrome/contents.rdf)
-#endif
 % locale reporter @AB_CD@ %locale/@AB_CD@/reporter/
   locale/@AB_CD@/reporter/reportWizard.dtd                  (%chrome/reportWizard.dtd)
   locale/@AB_CD@/reporter/about.dtd                         (%chrome/about.dtd)
   locale/@AB_CD@/reporter/reporterOverlay.dtd               (%chrome/reporterOverlay.dtd)
   locale/@AB_CD@/reporter/reportResults.dtd                 (%chrome/reportResults.dtd)
   locale/@AB_CD@/reporter/reporter.dtd                      (%chrome/reporter.dtd)
   locale/@AB_CD@/reporter/reportWizard.properties           (%chrome/reportWizard.properties)
   locale/@AB_CD@/reporter/reporterOverlay.properties        (%chrome/reporterOverlay.properties)
--- a/layout/style/xbl-marquee/jar.mn
+++ b/layout/style/xbl-marquee/jar.mn
@@ -1,8 +1,4 @@
 comm.jar:
-#ifdef MOZ_XUL_APP
 %   content xbl-marquee %content/xbl-marquee/ xpcnativewrappers=yes
-#else
-    content/xbl-marquee/contents.rdf
-#endif
     content/xbl-marquee/xbl-marquee.xml
     content/xbl-marquee/xbl-marquee.css
--- a/netwerk/locales/jar.mn
+++ b/netwerk/locales/jar.mn
@@ -1,9 +1,5 @@
 #filter substitution
 
 @AB_CD@.jar:
-#ifdef MOZ_XUL_APP
 % locale necko @AB_CD@ %locale/@AB_CD@/necko/
-#else
-* locale/@AB_CD@/necko/contents.rdf      (generic/contents.rdf)
-#endif
   locale/@AB_CD@/necko/necko.properties  (%necko.properties)
--- a/security/manager/locales/jar.mn
+++ b/security/manager/locales/jar.mn
@@ -1,18 +1,13 @@
 #filter substitution
 
 @AB_CD@.jar:
-#ifdef MOZ_XUL_APP
 % locale pipnss @AB_CD@ %locale/@AB_CD@/pipnss/
 % locale pippki @AB_CD@ %locale/@AB_CD@/pippki/
-#else
-* locale/@AB_CD@/pipnss/contents.rdf          (generic/chrome/pipnss/contents.rdf)
-* locale/@AB_CD@/pippki/contents.rdf          (generic/chrome/pippki/contents.rdf)
-#endif
   locale/@AB_CD@/pipnss/pipnss.properties     (%chrome/pipnss/pipnss.properties)
   locale/@AB_CD@/pipnss/nsserrors.properties  (%chrome/pipnss/nsserrors.properties)
   locale/@AB_CD@/pipnss/security.properties   (%chrome/pipnss/security.properties)
   locale/@AB_CD@/pippki/pippki.dtd            (%chrome/pippki/pippki.dtd)
   locale/@AB_CD@/pippki/pippki.properties     (%chrome/pippki/pippki.properties)
   locale/@AB_CD@/pippki/certManager.dtd       (%chrome/pippki/certManager.dtd)
   locale/@AB_CD@/pippki/deviceManager.dtd     (%chrome/pippki/deviceManager.dtd)
   locale/@AB_CD@/pippki/validation.dtd        (%chrome/pippki/validation.dtd)
--- a/security/manager/pki/resources/jar.mn
+++ b/security/manager/pki/resources/jar.mn
@@ -1,14 +1,10 @@
 pippki.jar:
-#ifdef MOZ_XUL_APP
 % content pippki %content/pippki/ xpcnativewrappers=yes
-#else
-*   content/pippki/contents.rdf              (content/contents.rdf)
-#endif
     content/pippki/changepassword.xul        (content/changepassword.xul)
     content/pippki/getpassword.xul           (content/getpassword.xul)
     content/pippki/password.js               (content/password.js)
     content/pippki/resetpassword.xul         (content/resetpassword.xul)
     content/pippki/resetpassword.js          (content/resetpassword.js)
     content/pippki/certerror.js              (content/certerror.js)
 *   content/pippki/certerror.xul             (content/certerror.xul)
     content/pippki/downloadcert.js           (content/downloadcert.js)