bug 332400 - Correct misuse of ifdefs in the source tree - fix xpfe browser and communicator chrome, r+sr=Neil

This commit is contained in:
kairo%kairo.at 2006-04-18 12:30:36 +00:00
Родитель e602427938
Коммит e5fcc63295
2 изменённых файлов: 1 добавлений и 82 удалений

Просмотреть файл

@ -1,80 +0,0 @@
#ifndef MOZ_XUL_APP
comm.jar:
* content/navigator/contents.rdf (resources/content/contents.rdf)
* content/navigator-region/contents.rdf (resources/content/contents-region.rdf)
content/navigator/browser.js (resources/content/browser.js)
content/navigator/pageInfo.js (resources/content/pageInfo.js)
content/navigator/pageInfo.xul (resources/content/pageInfo.xul)
content/navigator/navigator.xul (resources/content/navigator.xul)
content/navigator/sessionHistoryUI.js (resources/content/sessionHistoryUI.js)
content/navigator/navigatorOverlay.xul (resources/content/navigatorOverlay.xul)
content/navigator/navExtraOverlay.xul (resources/content/navExtraOverlay.xul)
content/navigator/navigator.js (resources/content/navigator.js)
content/navigator/navigatorDD.js (resources/content/navigatorDD.js)
content/navigator/nsBrowserStatusHandler.js (resources/content/nsBrowserStatusHandler.js)
content/navigator/nsBrowserContentListener.js (resources/content/nsBrowserContentListener.js)
content/navigator/urlbarBindings.xml (resources/content/urlbarBindings.xml)
content/navigator/navigator.css (resources/content/navigator.css)
content/navigator/metadata.xul (resources/content/metadata.xul)
content/navigator/metadata.js (resources/content/metadata.js)
content/navigator/languageDictionary.js (resources/content/languageDictionary.js)
content/navigator/linkToolbarHandler.js (resources/content/linkToolbarHandler.js)
content/navigator/linkToolbarItem.js (resources/content/linkToolbarItem.js)
content/navigator/linkToolbarOverlay.js (resources/content/linkToolbarOverlay.js)
content/navigator/linkToolbarOverlay.xul (resources/content/linkToolbarOverlay.xul)
content/navigator/turboDialog.xul (resources/content/turboDialog.xul)
content/navigator/viewsource.js (resources/content/viewsource.js)
content/navigator/viewSource.xul (resources/content/viewSource.xul)
content/navigator/viewSourceOverlay.xul (resources/content/viewSourceOverlay.xul)
content/navigator/viewPartialSource.js (resources/content/viewPartialSource.js)
content/navigator/viewPartialSource.xul (resources/content/viewPartialSource.xul)
content/navigator/mailNavigatorOverlay.xul (resources/content/mailNavigatorOverlay.xul)
content/navigator/searchconfig.properties (resources/content/searchconfig.properties)
#ifdef XP_MACOSX
* content/navigator-platform/contents.rdf (resources/content/mac/contents-platform.rdf)
content/navigator/platformNavigationBindings.xul (resources/content/mac/platformNavigationBindings.xul)
content/navigator/platformMailOverlay.xul (resources/content/mac/platformMailOverlay.xul)
#else
#ifdef XP_WIN32
* content/navigator-platform/contents.rdf (resources/content/win/contents-platform.rdf)
content/navigator/platformNavigationBindings.xul (resources/content/win/platformNavigationBindings.xul)
content/navigator/platformMailOverlay.xul (resources/content/win/platformMailOverlay.xul)
#else
#ifdef XP_OS2
* content/navigator-platform/contents.rdf (resources/content/win/contents-platform.rdf)
content/navigator/platformNavigationBindings.xul (resources/content/win/platformNavigationBindings.xul)
content/navigator/platformMailOverlay.xul (resources/content/win/platformMailOverlay.xul)
#else
* content/navigator-platform/contents.rdf (resources/content/unix/contents-platform.rdf)
content/navigator/platformNavigationBindings.xul (resources/content/unix/platformNavigationBindings.xul)
content/navigator/platformMailOverlay.xul (resources/content/unix/platformMailOverlay.xul)
#endif
#endif
#endif
en-US.jar:
* locale/en-US/navigator/contents.rdf (resources/locale/en-US/contents.rdf)
locale/en-US/navigator/viewSource.dtd (resources/locale/en-US/viewSource.dtd)
locale/en-US/navigator/viewSource.properties (resources/locale/en-US/viewSource.properties)
locale/en-US/navigator/pageInfo.dtd (resources/locale/en-US/pageInfo.dtd)
locale/en-US/navigator/pageInfo.properties (resources/locale/en-US/pageInfo.properties)
locale/en-US/navigator/navigator.dtd (resources/locale/en-US/navigator.dtd)
locale/en-US/navigator/navigator.properties (resources/locale/en-US/navigator.properties)
locale/en-US/navigator/metadata.dtd (resources/locale/en-US/metadata.dtd)
locale/en-US/navigator/metadata.properties (resources/locale/en-US/metadata.properties)
locale/en-US/navigator/linkToolbar.dtd (resources/locale/en-US/linkToolbar.dtd)
locale/en-US/navigator/turboDialog.dtd (resources/locale/en-US/turboDialog.dtd)
locale/en-US/navigator/turboMenu.properties (resources/locale/en-US/turboMenu.properties)
locale/en-US/navigator/mailNavigatorOverlay.dtd (resources/locale/en-US/mailNavigatorOverlay.dtd)
* locale/en-US/navigator-region/contents.rdf (resources/locale/en-US/contents-region.rdf)
locale/en-US/navigator-region/region.properties (resources/locale/en-US/region.properties)
* locale/en-US/navigator-platform/mac/contents.rdf (resources/locale/en-US/mac/contents-platform.rdf)
locale/en-US/navigator-platform/mac/platformNavigationBindings.dtd (resources/locale/en-US/mac/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/mac/navigator.properties (resources/locale/en-US/mac/navigator.properties)
* locale/en-US/navigator-platform/unix/contents.rdf (resources/locale/en-US/unix/contents-platform.rdf)
locale/en-US/navigator-platform/unix/platformNavigationBindings.dtd (resources/locale/en-US/unix/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/unix/navigator.properties (resources/locale/en-US/unix/navigator.properties)
* locale/en-US/navigator-platform/win/contents.rdf (resources/locale/en-US/win/contents-platform.rdf)
locale/en-US/navigator-platform/win/platformNavigationBindings.dtd (resources/locale/en-US/win/platformNavigationBindings.dtd)
locale/en-US/navigator-platform/win/navigator.properties (resources/locale/en-US/win/navigator.properties)
#endif

Просмотреть файл

@ -1,6 +1,5 @@
comm.jar:
#ifdef MOZ_XUL_APP
# This means thunderbird
% content communicator-platform %content/communicator-platform/ platform
% content communicator-region %content/communicator-region/
% content communicator %content/communicator/
@ -53,7 +52,7 @@ 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)
#ifndef MOZ_XUL_APP
#ifdef MOZ_SUITE
* content/branding/contents.rdf (resources/content/contents-branding.rdf)
en-US.jar: