Bug 451909 - kill MOZ_XUL_APP now that all apps set it; 'jar.mn' part; r=ted.mielczarek

content/xslt/tests/buster/jar.mn

@@ -1,10 +1,6 @@
 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

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)

extensions/python/dom/test/pyxultest/jar.mn

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

extensions/reporter/jar.mn

@@ -1,14 +1,9 @@
 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)

extensions/reporter/locales/jar.mn

@@ -1,11 +1,6 @@
 #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)

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

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)

security/manager/locales/jar.mn

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

security/manager/pki/resources/jar.mn

@@ -1,9 +1,5 @@
 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)