From 9e8b68a0a559d82428d125fdacf72a61c272be82 Mon Sep 17 00:00:00 2001 From: "gandalf%firefox.pl" Date: Sat, 2 Apr 2005 13:12:21 +0000 Subject: [PATCH] Bug 286108: Build Thunderbird Locales from CVS. Don't bundle xpfe/browser,xpfe/components to toolkit apps.; r=bsmedberg,sr=mscott --- xpfe/browser/jar.mn | 2 ++ xpfe/components/download-manager/resources/jar.mn | 3 ++- xpfe/components/jar.mn | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xpfe/browser/jar.mn b/xpfe/browser/jar.mn index 4c5e858be7e8..4a16a4e3fb21 100644 --- a/xpfe/browser/jar.mn +++ b/xpfe/browser/jar.mn @@ -1,3 +1,4 @@ +#ifndef MOZ_XUL_APP comm.jar: * content/navigator/contents.rdf (resources/content/contents.rdf) * content/navigator-region/contents.rdf (resources/content/contents-region.rdf) @@ -78,3 +79,4 @@ en-win.jar: * locale/en-US/navigator-platform/contents.rdf (resources/locale/en-US/win/contents-platform.rdf) locale/en-US/navigator-platform/platformNavigationBindings.dtd (resources/locale/en-US/win/platformNavigationBindings.dtd) locale/en-US/navigator-platform/navigator.properties (resources/locale/en-US/win/navigator.properties) +#endif diff --git a/xpfe/components/download-manager/resources/jar.mn b/xpfe/components/download-manager/resources/jar.mn index ad08b94b72e8..9c52016ab158 100644 --- a/xpfe/components/download-manager/resources/jar.mn +++ b/xpfe/components/download-manager/resources/jar.mn @@ -1,3 +1,4 @@ +#ifndef MOZ_XUL_APP comm.jar: content/communicator/downloadmanager/downloadmanager.xul content/communicator/downloadmanager/downloadmanager.js @@ -5,4 +6,4 @@ comm.jar: en-US.jar: locale/en-US/communicator/downloadmanager/downloadmanager.dtd (locale/en-US/downloadmanager.dtd) locale/en-US/communicator/downloadmanager/downloadmanager.properties (locale/en-US/downloadmanager.properties) - +#endif diff --git a/xpfe/components/jar.mn b/xpfe/components/jar.mn index 7c3554ddf314..150fe6fd894f 100644 --- a/xpfe/components/jar.mn +++ b/xpfe/components/jar.mn @@ -1,4 +1,5 @@ #ifndef SUPPRESS_CHROME +#ifndef MOZ_XUL_APP comm.jar: content/communicator/directory/directory.xul (directory/directory.xul) content/communicator/directory/directory.html (directory/directory.html) @@ -205,3 +206,4 @@ toolkit.jar: en-win.jar: locale/en-US/global-platform/nsWindowsHooks.properties (winhooks/locale/en-US/nsWindowsHooks.properties) #endif +#endif