diff --git a/mozilla/suite/branding/jar.mn b/mozilla/suite/branding/jar.mn index 2f27151fa6b..ed15c9380d0 100644 --- a/mozilla/suite/branding/jar.mn +++ b/mozilla/suite/branding/jar.mn @@ -1,7 +1,7 @@ comm.jar: #ifdef MOZ_XUL_APP -#% content branding %content/branding/ +% content branding %content/branding/ #else -#* content/branding/contents.rdf (contents.rdf) +* content/branding/contents.rdf (contents.rdf) #endif content/branding/icon64.png (content/icon64.png) diff --git a/mozilla/suite/common/jar.mn b/mozilla/suite/common/jar.mn index 0569b08cefa..79f3f4f93c2 100644 --- a/mozilla/suite/common/jar.mn +++ b/mozilla/suite/common/jar.mn @@ -1,14 +1,65 @@ comm.jar: #ifdef MOZ_XUL_APP -#% content communicator %content/communicator/ xpcnativewrappers=yes +% content communicator %content/communicator/ xpcnativewrappers=yes +% overlay chrome://communicator/content/contentAreaContextOverlay.xul chrome://communicator/content/permissions/imageContextOverlay.xul +% overlay chrome://communicator/content/pref/preftree.xul chrome://communicator/content/pref/permissionsPrefsOverlay.xul +% overlay chrome://navigator/content/navigatorOverlay.xul chrome://communicator/content/permissions/permissionsNavigatorOverlay.xul +% overlay chrome://navigator/content/navigatorOverlay.xul chrome://communicator/content/permissions/cookieTasksOverlay.xul % overlay chrome://global/content/console.xul chrome://communicator/content/consoleOverlay.xul % overlay chrome://communicator/content/tasksOverlay.xul chrome://communicator/content/emOverlay.xul % overlay chrome://communicator/content/pref/preftree.xul chrome://pippki/content/PrefOverlay.xul +% content communicator-platform %content/communicator-platform/ platform xpcnativewrappers=yes +% content communicator-region %content/communicator-region/ xpcnativewrappers=yes #else -#* content/communicator/contents.rdf (contents.rdf) +* content/communicator/contents.rdf (contents.rdf) +* content/communicator-platform/contents.rdf (contents-platform.rdf) +* content/communicator-region/contents.rdf (contents-region.rdf) #endif + content/communicator/askViewZoom.xul + content/communicator/askViewZoom.js + content/communicator/browserBindings.xul + content/communicator/builtinURLs.js + content/communicator/communicator.css content/communicator/consoleOverlay.xul + content/communicator/contentAreaUtils.js + content/communicator/contentAreaDD.js + content/communicator/contentAreaClick.js + content/communicator/contentAreaContextOverlay.xul + content/communicator/editorBindings.xul content/communicator/emOverlay.xul + content/communicator/findUtils.js + content/communicator/nsContextMenu.js + content/communicator/openLocation.js + content/communicator/openLocation.xul + content/communicator/printPreviewBindings.xml + content/communicator/printing.js + content/communicator/tasksOverlay.js + content/communicator/tasksOverlay.xul + content/communicator/utilityOverlay.js + content/communicator/utilityOverlay.xul + content/communicator/viewZoomOverlay.xul + content/communicator/viewZoomOverlay.js +#ifdef XP_MACOSX + content/communicator/platformBrowserBindings.xul (mac/platformBrowserBindings.xul) + content/communicator/platformEditorBindings.xul (mac/platformEditorBindings.xul) + content/communicator/platformCommunicatorOverlay.xul (mac/platformCommunicatorOverlay.xul) +#else +#ifdef XP_WIN32 + content/communicator/platformBrowserBindings.xul (win/platformBrowserBindings.xul) + content/communicator/platformEditorBindings.xul (win/platformEditorBindings.xul) + content/communicator/platformCommunicatorOverlay.xul (win/platformCommunicatorOverlay.xul) +#else +#ifdef XP_OS2 + content/communicator/platformBrowserBindings.xul (win/platformBrowserBindings.xul) + content/communicator/platformEditorBindings.xul (win/platformEditorBindings.xul) + content/communicator/platformCommunicatorOverlay.xul (win/platformCommunicatorOverlay.xul) +#else + content/communicator/platformBrowserBindings.xul (unix/platformBrowserBindings.xul) + content/communicator/platformEditorBindings.xul (unix/platformEditorBindings.xul) + content/communicator/platformCommunicatorOverlay.xul (unix/platformCommunicatorOverlay.xul) +#endif +#endif +#endif content/communicator/bindings/toolbar.xml (bindings/toolbar.xml) content/communicator/directory/directory.html (directory/directory.html) content/communicator/directory/directory.js (directory/directory.js) diff --git a/mozilla/suite/locales/jar.mn b/mozilla/suite/locales/jar.mn index 21c5cdb190f..56826b687a4 100644 --- a/mozilla/suite/locales/jar.mn +++ b/mozilla/suite/locales/jar.mn @@ -1,12 +1,33 @@ #filter substitution @AB_CD@.jar: -##ifdef MOZ_XUL_APP -#% locale communicator @AB_CD@ %locale/@AB_CD@/communicator/ -##else -#* locale/@AB_CD@/communicator/contents.rdf (generic/chrome/common/contents.rdf) -##endif +#ifdef MOZ_XUL_APP +% locale branding @AB_CD@ %locale/@AB_CD@/branding/ +% locale communicator @AB_CD@ %locale/@AB_CD@/communicator/ +% locale communicator-platform @AB_CD@ %locale/@AB_CD@/communicator-platform/ +% locale communicator-region @AB_CD@ %locale/@AB_CD@/communicator-region/ +#else +* locale/@AB_CD@/branding/contents.rdf (generic/chrome/branding/contents.rdf) +* locale/@AB_CD@/communicator/contents.rdf (generic/chrome/common/contents.rdf) +* locale/@AB_CD@/communicator-platform/win/contents.rdf (generic/chrome/common-platform/contents.rdf) +* locale/@AB_CD@/communicator-platform/unix/contents.rdf (generic/chrome/common-platform/contents.rdf) +* locale/@AB_CD@/communicator-platform/mac/contents.rdf (generic/chrome/common-platform/contents.rdf) +* locale/@AB_CD@/communicator-region/contents.rdf (generic/chrome/common-region/contents.rdf) +#endif +* locale/@AB_CD@/branding/brand.dtd (%chrome/branding/brand.dtd) +* locale/@AB_CD@/branding/brand.properties (%chrome/branding/brand.properties) + locale/@AB_CD@/communicator/askViewZoom.dtd (%chrome/common/askViewZoom.dtd) locale/@AB_CD@/communicator/consoleOverlay.dtd (%chrome/common/consoleOverlay.dtd) + locale/@AB_CD@/communicator/contentAreaCommands.dtd (%chrome/common/contentAreaCommands.dtd) + locale/@AB_CD@/communicator/contentAreaCommands.properties (%chrome/common/contentAreaCommands.properties) + locale/@AB_CD@/communicator/openLocation.dtd (%chrome/common/openLocation.dtd) + locale/@AB_CD@/communicator/openLocation.properties (%chrome/common/openLocation.properties) + locale/@AB_CD@/communicator/printPreview.dtd (%chrome/common/printPreview.dtd) + locale/@AB_CD@/communicator/tasksOverlay.dtd (%chrome/common/tasksOverlay.dtd) + locale/@AB_CD@/communicator/utilityOverlay.dtd (%chrome/common/utilityOverlay.dtd) + locale/@AB_CD@/communicator/utilityOverlay.properties (%chrome/common/utilityOverlay.properties) + locale/@AB_CD@/communicator/viewZoomOverlay.dtd (%chrome/common/viewZoomOverlay.dtd) + locale/@AB_CD@/communicator/viewZoomOverlay.properties (%chrome/common/viewZoomOverlay.properties) locale/@AB_CD@/communicator/directory/directory.dtd (%chrome/common/directory/directory.dtd) locale/@AB_CD@/communicator/history/history.dtd (%chrome/common/history/history.dtd) locale/@AB_CD@/communicator/history/historyTreeOverlay.dtd (%chrome/common/history/historyTreeOverlay.dtd) @@ -79,3 +100,7 @@ locale/@AB_CD@/communicator/sidebar/preview.dtd (%chrome/common/sidebar/preview.dtd) locale/@AB_CD@/communicator/sidebar/sidebar.properties (%chrome/common/sidebar/sidebar.properties) locale/@AB_CD@/communicator/sidebar/sidebarOverlay.dtd (%chrome/common/sidebar/sidebarOverlay.dtd) + locale/@AB_CD@/communicator-platform/win/platformCommunicatorOverlay.dtd (%chrome/common/win/platformCommunicatorOverlay.dtd) + locale/@AB_CD@/communicator-platform/unix/platformCommunicatorOverlay.dtd (%chrome/common/unix/platformCommunicatorOverlay.dtd) + locale/@AB_CD@/communicator-platform/mac/platformCommunicatorOverlay.dtd (%chrome/common/mac/platformCommunicatorOverlay.dtd) + locale/@AB_CD@/communicator-region/region.properties (%chrome/common/region.properties) diff --git a/mozilla/xpfe/communicator/jar.mn b/mozilla/xpfe/communicator/jar.mn index c276c5780b4..49713c92377 100644 --- a/mozilla/xpfe/communicator/jar.mn +++ b/mozilla/xpfe/communicator/jar.mn @@ -1,22 +1,13 @@ comm.jar: +#ifndef MOZ_SUITE #ifdef MOZ_XUL_APP % content communicator-platform %content/communicator-platform/ platform xpcnativewrappers=yes % content communicator-region %content/communicator-region/ xpcnativewrappers=yes % content communicator %content/communicator/ xpcnativewrappers=yes -#ifdef MOZ_SUITE -% overlay chrome://communicator/content/contentAreaContextOverlay.xul chrome://communicator/content/permissions/imageContextOverlay.xul -% overlay chrome://communicator/content/pref/preftree.xul chrome://communicator/content/pref/permissionsPrefsOverlay.xul -% overlay chrome://navigator/content/navigatorOverlay.xul chrome://communicator/content/permissions/permissionsNavigatorOverlay.xul -% overlay chrome://navigator/content/navigatorOverlay.xul chrome://communicator/content/permissions/cookieTasksOverlay.xul -% content branding %content/branding/ -#endif #else * content/communicator-platform/contents.rdf (resources/content/contents-platform.rdf) * content/communicator-region/contents.rdf (resources/content/contents-region.rdf) * content/communicator/contents.rdf (resources/content/contents.rdf) -#ifdef MOZ_SUITE -* content/branding/contents.rdf (resources/content/contents-branding.rdf) -#endif #endif content/communicator/communicator.css (resources/content/communicator.css) content/communicator/utilityOverlay.xul (resources/content/utilityOverlay.xul) @@ -60,37 +51,4 @@ comm.jar: content/communicator/findUtils.js (resources/content/findUtils.js) content/communicator/printPreviewBindings.xml (resources/content/printPreviewBindings.xml) content/communicator/printing.js (resources/content/printing.js) - -#ifdef MOZ_SUITE -en-US.jar: -#ifdef MOZ_XUL_APP -% locale communicator en-US %locale/en-US/communicator/ -% locale communicator-region en-US %locale/en-US/communicator-region/ -% locale communicator-platform en-US %locale/en-US/communicator-platform/ -% locale branding en-US %locale/en-US/branding/ -#else -* locale/en-US/communicator/contents.rdf (resources/locale/en-US/contents.rdf) -* locale/en-US/communicator-region/contents.rdf (resources/locale/en-US/contents-region.rdf) -* locale/en-US/communicator-platform/win/contents.rdf (resources/locale/en-US/win/contents-platform.rdf) -* locale/en-US/communicator-platform/unix/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf) -* locale/en-US/communicator-platform/mac/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf) -* locale/en-US/branding/contents.rdf (resources/locale/en-US/contents-branding.rdf) -#endif - locale/en-US/communicator/utilityOverlay.dtd (resources/locale/en-US/utilityOverlay.dtd) - locale/en-US/communicator/utilityOverlay.properties (resources/locale/en-US/utilityOverlay.properties) - locale/en-US/communicator/openLocation.dtd (resources/locale/en-US/openLocation.dtd) - locale/en-US/communicator/openLocation.properties (resources/locale/en-US/openLocation.properties) - locale/en-US/communicator/tasksOverlay.dtd (resources/locale/en-US/tasksOverlay.dtd) - locale/en-US/communicator/contentAreaCommands.dtd (resources/locale/en-US/contentAreaCommands.dtd) - locale/en-US/communicator/contentAreaCommands.properties (resources/locale/en-US/contentAreaCommands.properties) - locale/en-US/communicator/askViewZoom.dtd (resources/locale/en-US/askViewZoom.dtd) - locale/en-US/communicator/viewZoomOverlay.dtd (resources/locale/en-US/viewZoomOverlay.dtd) - locale/en-US/communicator/viewZoomOverlay.properties (resources/locale/en-US/viewZoomOverlay.properties) - locale/en-US/communicator/printPreview.dtd (resources/locale/en-US/printPreview.dtd) -* locale/en-US/branding/brand.dtd (resources/locale/en-US/brand.dtd) -* locale/en-US/branding/brand.properties (resources/locale/en-US/brand.properties) - locale/en-US/communicator-region/region.properties (resources/locale/en-US/region.properties) - locale/en-US/communicator-platform/win/platformCommunicatorOverlay.dtd (resources/locale/en-US/win/platformCommunicatorOverlay.dtd) - locale/en-US/communicator-platform/unix/platformCommunicatorOverlay.dtd (resources/locale/en-US/unix/platformCommunicatorOverlay.dtd) - locale/en-US/communicator-platform/mac/platformCommunicatorOverlay.dtd (resources/locale/en-US/mac/platformCommunicatorOverlay.dtd) #endif