Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 336874 - Make suiterunner use the same toolkit.jar as XULRunner, step 1: move files to non-xul-app sections that are overridden by toolkit (also fix suiterunner bustage), r=Neil sr=bsmedberg

Browse Source
This commit is contained in:
kairo%kairo.at 2006-05-12 10:34:13 +00:00
parent 20804512be
commit 0525eb1934
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/components/Makefile.in
View File

@ -56,15 +56,14 @@ DIRS += \
alerts \
filepicker \
console \
viewconfig \
$(NULL)
ifndef MOZ_SUITE
# XXX Suite doesn't want these just yet
DIRS += \
feeds \
typeaheadfind \
viewconfig \
$(NULL)
endif # MOZ_SUITE
ifdef MOZ_FEEDS
DIRS += feeds
@ -77,7 +76,6 @@ endif
ifdef MOZ_VIEW_SOURCE
DIRS += viewsource
endif
endif # MOZ_SUITE
ifdef MOZ_THUNDERBIRD
DIRS += autocomplete/public

2
xpfe/components/jar.mn
View File

@ -191,10 +191,10 @@ en-US.jar:
locale/en-US/communicator/sidebar/local-panels.dtd (sidebar/resources/locale/en-US/local-panels.dtd)
locale/en-US/communicator/sidebar/sidebarOverlay.dtd (sidebar/resources/locale/en-US/sidebarOverlay.dtd)
locale/en-US/communicator/sidebar/sidebar.properties (sidebar/resources/locale/en-US/sidebar.properties)
locale/en-US/global/downloadProgress.properties (xfer/resources/locale/en-US/downloadProgress.properties)
locale/en-US/global-platform/win/nsWindowsHooks.properties (winhooks/locale/en-US/nsWindowsHooks.properties)
#ifndef MOZ_XUL_APP
locale/en-US/communicator/update-notifications.properties (updates/resources/locale/en-US/update-notifications.properties)
locale/en-US/global/downloadProgress.properties (xfer/resources/locale/en-US/downloadProgress.properties)
locale/en-US/global/filepicker.dtd (filepicker/res/locale/en-US/filepicker.dtd)
locale/en-US/global/filepicker.properties (filepicker/res/locale/en-US/filepicker.properties)
locale/en-US/global/console.dtd (console/resources/locale/en-US/console.dtd)

24
xpfe/global/jar.mn
View File

@ -3,8 +3,6 @@ toolkit.jar:
* content/global/contents.rdf (resources/content/contents.rdf)
* content/global-platform/contents.rdf (resources/content/contents-platform.rdf)
* content/global-region/contents.rdf (resources/content/contents-region.rdf)
#endif
content/global/hiddenWindow.xul (resources/content/hiddenWindow.xul)
content/global/globalOverlay.xul (resources/content/globalOverlay.xul)
content/global/globalOverlay.js (resources/content/globalOverlay.js)
content/global/dialogOverlay.xul (resources/content/dialogOverlay.xul)
@ -12,13 +10,6 @@ toolkit.jar:
content/global/commonDialog.xul (resources/content/commonDialog.xul)
content/global/commonDialog.js (resources/content/commonDialog.js)
content/global/strres.js (resources/content/strres.js)
#ifdef MOZ_SUITE
content/global/logo.gif (/suite/branding/content/logo.gif)
#else
content/global/logo.gif (resources/content/logo.gif)
#endif
content/global/aboutAbout.html (resources/content/aboutAbout.html)
content/global/about.xul (resources/content/about.xul)
content/global/config.xul (resources/content/config.xul)
content/global/config.css (resources/content/config.css)
content/global/config.js (resources/content/config.js)
@ -43,9 +34,6 @@ toolkit.jar:
content/global/printProgress.js (resources/content/printProgress.js)
content/global/printPreviewProgress.xul (resources/content/printPreviewProgress.xul)
content/global/printPreviewProgress.js (resources/content/printPreviewProgress.js)
content/global/plugins.html (resources/content/plugins.html)
content/global/fullScreen.js (resources/content/fullScreen.js)
content/global/build.dtd (build.dtd)
* content/global/about.xhtml (resources/content/about.xhtml)
content/global/license.html (resources/content/license.html)
content/global/bindings/browser.xml (resources/content/bindings/browser.xml)
@ -83,6 +71,18 @@ toolkit.jar:
#ifdef MOZ_SVG
content/global/svg/svgBindings.xml (/layout/svg/base/src/resources/content/svgBindings.xml)
#endif
#endif
content/global/hiddenWindow.xul (resources/content/hiddenWindow.xul)
#ifdef MOZ_SUITE
content/global/logo.gif (/suite/branding/content/logo.gif)
#else
content/global/logo.gif (resources/content/logo.gif)
#endif
content/global/aboutAbout.html (resources/content/aboutAbout.html)
content/global/about.xul (resources/content/about.xul)
content/global/plugins.html (resources/content/plugins.html)
content/global/fullScreen.js (resources/content/fullScreen.js)
content/global/build.dtd (build.dtd)
#ifndef MOZ_XUL_APP
en-US.jar: