mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 342897 Copy required suite files from xpfe/bootstrap (and elsewhere) to suite/app (Update build process for new binary file locations) r/sr=Neil

This commit is contained in:
bugzilla%standard8.demon.co.uk 2006-06-29 11:09:21 +00:00
Родитель 56ebfc885c
Коммит 255f4938ef
3 изменённых файлов: 77 добавлений и 71 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

66
suite/app/Makefile.in
Просмотреть файл

@ -191,72 +191,6 @@ endif
$(PROGRAM): $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT)))
ICON_SUFFIX=.ico
else
ICON_SUFFIX=.xpm
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ICON_DIR=gtk
else
ICON_DIR=$(MOZ_WIDGET_TOOLKIT)
endif
DESKTOP_ICONS = \
abcardWindow \
addressbookWindow \
bmPropsWindow \
bookmark-window \
calendar-window \
chatzilla-window \
downloadManager \
editorWindow \
findBookmarkWindow \
findHistoryWindow \
history-window \
jsconsoleWindow \
main-window \
messengerWindow \
msgcomposeWindow \
venkman-window \
winInspectorMain \
$(NULL)
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
# Windows icons
DESKTOP_ICONS += \
gif-file \
html-file \
misc-file \
image-file \
jpeg-file \
script-file \
xml-file \
xul-file \
$(NULL)
endif
ifeq ($(ICON_DIR),gtk)
DESKTOP_ICONS_SMALL=$(patsubst %,%16,$(DESKTOP_ICONS))
endif
DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL))
# XXX this icons should be moved to within the /suite directory at
# some sensible stage.
libs:: $(addprefix $(topsrcdir)/xpfe/bootstrap/icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
# XXX Uncomment this line and delete the one under it when icons move
install:: $(addprefix $(topsrcdir)/xpfe/bootstrap/icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
GARBAGE += $(addprefix $(DIST)/bin/chrome/icons/default/,$(DESKTOP_ICON_FILES))
endif
# XXX mozilla.in should move or be copied to this directory at some stage
ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \

77
suite/branding/Makefile.in
Просмотреть файл

@ -20,6 +20,7 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Mark Banner <bugzilla@standard8.demon.co.uk>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -42,11 +43,77 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
libs::
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
$(INSTALL) $(srcdir)/icons/gtk/default.xpm $(DIST)/bin/chrome/icons/default
$(INSTALL) $(srcdir)/icons/gtk/default16.xpm $(DIST)/bin/chrome/icons/default
$(INSTALL) $(srcdir)/icons/gtk/seamonkey.png $(DIST)/bin/chrome/icons/default
# Note: mac icons are handled in /suite/app during the final application
# packaging
ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT)))
ICON_SUFFIX=.ico
else
ICON_SUFFIX=.xpm
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ICON_DIR=gtk
else
ICON_DIR=$(MOZ_WIDGET_TOOLKIT)
endif
DESKTOP_ICONS = \
abcardWindow \
addressbookWindow \
bmPropsWindow \
bookmark-window \
calendar-window \
chatzilla-window \
downloadManager \
editorWindow \
findBookmarkWindow \
findHistoryWindow \
history-window \
jsconsoleWindow \
main-window \
messengerWindow \
msgcomposeWindow \
venkman-window \
winInspectorMain \
$(NULL)
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
# Windows icons
DESKTOP_ICONS += \
gif-file \
html-file \
misc-file \
image-file \
jpeg-file \
script-file \
xml-file \
xul-file \
$(NULL)
endif
ifeq ($(ICON_DIR),gtk)
libs:: icons/gtk/seamonkey.png
$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
install:: icons/gtk/seamonkey.png
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
GARBAGE += $(DIST)/bin/chrome/icons/default/seamonkey.png
DESKTOP_ICONS += default
DESKTOP_ICONS_SMALL=$(patsubst %,%16,$(DESKTOP_ICONS))
endif
DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL))
libs:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
install:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
GARBAGE += $(addprefix $(DIST)/bin/chrome/icons/default/,$(DESKTOP_ICON_FILES))
endif
include $(topsrcdir)/config/rules.mk

5
xpfe/bootstrap/Makefile.in
Просмотреть файл

@ -277,6 +277,9 @@ CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
endif
ifndef MOZ_SUITE
# Suite icons are all contained within /suite/branding
ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT)))
ICON_SUFFIX=.ico
@ -344,6 +347,8 @@ install:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
endif
endif # MOZ_SUITE
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CMMSRCS += nsNativeAppSupportForCocoa.mm
LIBS += -framework Cocoa $(TK_LIBS)