--- a/suite/Makefile.in
+++ b/suite/Makefile.in
@@ -45,17 +45,16 @@ include $(DEPTH)/config/autoconf.mk
# check if this is an alpha or nightly
# replace "pre" with "a" in the version and then look if "a" matches
ifneq (,$(findstring a,$(MOZ_APP_VERSION:pre=a)))
PARALLEL_DIRS = debugQA
endif
PARALLEL_DIRS += \
- branding \
browser \
common \
feeds/public \
feeds/src \
locales \
modules \
themes/classic \
themes/modern \
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -43,17 +43,17 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
AB_CD = $(MOZ_UI_LOCALE)
GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
DEFINES += \
- -DSEAMONKEY_ICO=\"../branding/icons/windows/seamonkey.ico\" \
+ -DSEAMONKEY_ICO=\"$(DIST)/branding/seamonkey.ico\" \
-DAB_CD=$(AB_CD) \
-DAPP_VERSION="$(MOZ_APP_VERSION)" \
-DGRE_MILESTONE=$(GRE_MILESTONE) \
-DGRE_BUILDID=$(GRE_BUILDID) \
$(NULL)
MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)
ifdef MOZ_SOURCE_STAMP
@@ -200,16 +200,17 @@ endif
endif
ifeq ($(OS_ARCH),OS2)
RESFILE = splashos2.res
RCFLAGS += -i $(MOZILLA_SRCDIR)/toolkit/xre
ifdef BUILD_STATIC_LIBS
RCFLAGS += -DMOZ_STATIC_BUILD -i $(DIST)/include
endif
+RCFLAGS += -DSEAMONKEY_ICO=\"$(DIST)/branding/seamonkey.ico\"
endif
LIBS += $(JEMALLOC_LIBS)
include $(topsrcdir)/config/rules.mk
ifdef MOZILLA_OFFICIAL
DEFINES += -DMOZILLA_OFFICIAL
@@ -292,25 +293,16 @@ else
$(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
endif
libs:: blocklist.xml
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-# copy .dmg contents into obj dir branding
-export::
-ifndef MOZ_BRANDING_DIRECTORY
- $(NSINSTALL) -D $(DIST)/branding
- cp $(topsrcdir)/suite/branding/package/mac/dsstore $(DIST)/branding/dsstore
- cp $(topsrcdir)/suite/branding/package/mac/background.png $(DIST)/branding/background.png
- cp $(topsrcdir)/suite/branding/package/mac/disk.icns $(DIST)/branding/disk.icns
-endif
-
AB := $(firstword $(subst -, ,$(AB_CD)))
ifdef MOZ_DEBUG
APP_NAME = $(MOZ_APP_DISPLAYNAME)Debug
else
APP_NAME = $(MOZ_APP_DISPLAYNAME)
endif
@@ -319,17 +311,17 @@ libs:: $(PROGRAM)
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
- cp -RL $(srcdir)/../branding/icons/mac/*.icns $(DIST)/$(APP_NAME).app/Contents/Resources/
+ cp -RL $(DIST)/branding/icons/*.icns $(DIST)/$(APP_NAME).app/Contents/Resources/
printf APPLMOZZ > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
# remove CVS dirs from packaged app
find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
endif
--- a/suite/app/splashos2.rc
+++ b/suite/app/splashos2.rc
@@ -34,17 +34,17 @@
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include <os2.h>
#include "nsNativeAppSupportOS2.h"
-ICON 1 "..\\branding\\icons\\os2\\seamonkey.ico"
+ICON 1 SEAMONKEY_ICO
STRINGTABLE DISCARDABLE
BEGIN
ID_DDE_APPLICATION_NAME, "Mozilla"
END
#ifdef MOZ_STATIC_BUILD
#include "wdgtos2rc.h"
rename from suite/branding/Makefile.in
rename to suite/branding/nightly/Makefile.in
--- a/suite/branding/Makefile.in
+++ b/suite/branding/nightly/Makefile.in
@@ -31,17 +31,17 @@
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
-DEPTH = ../..
+DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# Note: mac icons are handled in /suite/app during the final application
# packaging
@@ -111,8 +111,36 @@ libs:: $(addprefix icons/$(ICON_DIR)/,$(
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
+
+export::
+ $(NSINSTALL) -D $(DIST)/branding
+ifeq ($(OS_ARCH),WINNT)
+ cp $(srcdir)/icons/windows/seamonkey.ico $(DIST)/branding/seamonkey.ico
+ cp $(srcdir)/package/windows/branding.nsi $(DIST)/branding/branding.nsi
+ cp $(srcdir)/package/windows/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
+ cp $(srcdir)/package/windows/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
+ cp $(srcdir)/package/windows/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
+endif
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ $(NSINSTALL) -D $(DIST)/branding
+ $(NSINSTALL) -D $(DIST)/branding/icons
+ cp $(srcdir)/icons/mac/command.icns $(DIST)/branding/icons/command.icns
+ cp $(srcdir)/icons/mac/component.icns $(DIST)/branding/icons/component.icns
+ cp $(srcdir)/icons/mac/html.icns $(DIST)/branding/icons/html.icns
+ cp $(srcdir)/icons/mac/mozilla.icns $(DIST)/branding/icons/mozilla.icns
+ cp $(srcdir)/icons/mac/plugin.icns $(DIST)/branding/icons/plugin.icns
+ cp $(srcdir)/icons/mac/pref.icns $(DIST)/branding/icons/pref.icns
+ cp $(srcdir)/icons/mac/seamonkey.icns $(DIST)/branding/icons/seamonkey.icns
+ cp $(srcdir)/icons/mac/text.icns $(DIST)/branding/icons/text.icns
+ cp $(srcdir)/package/mac/dsstore $(DIST)/branding/dsstore
+ cp $(srcdir)/package/mac/background.png $(DIST)/branding/background.png
+ cp $(srcdir)/package/mac/disk.icns $(DIST)/branding/disk.icns
+endif
+ifeq ($(OS_ARCH),OS2)
+ cp $(srcdir)/icons/os2/seamonkey.ico $(DIST)/branding/seamonkey.ico
+endif
rename from suite/branding/content/about.png
rename to suite/branding/nightly/content/about.png
rename from suite/branding/content/aboutRights.xhtml
rename to suite/branding/nightly/content/aboutRights.xhtml
rename from suite/branding/content/icon48.png
rename to suite/branding/nightly/content/icon48.png
rename from suite/branding/content/icon64.png
rename to suite/branding/nightly/content/icon64.png
rename from suite/branding/content/logo.gif
rename to suite/branding/nightly/content/logo.gif
rename from suite/branding/icons/gtk/JSConsoleWindow.png
rename to suite/branding/nightly/icons/gtk/JSConsoleWindow.png
rename from suite/branding/icons/gtk/JSConsoleWindow16.png
rename to suite/branding/nightly/icons/gtk/JSConsoleWindow16.png
rename from suite/branding/icons/gtk/JSConsoleWindow48.png
rename to suite/branding/nightly/icons/gtk/JSConsoleWindow48.png
rename from suite/branding/icons/gtk/abcardWindow.png
rename to suite/branding/nightly/icons/gtk/abcardWindow.png
rename from suite/branding/icons/gtk/abcardWindow16.png
rename to suite/branding/nightly/icons/gtk/abcardWindow16.png
rename from suite/branding/icons/gtk/abcardWindow48.png
rename to suite/branding/nightly/icons/gtk/abcardWindow48.png
rename from suite/branding/icons/gtk/ablistWindow.png
rename to suite/branding/nightly/icons/gtk/ablistWindow.png
rename from suite/branding/icons/gtk/ablistWindow16.png
rename to suite/branding/nightly/icons/gtk/ablistWindow16.png
rename from suite/branding/icons/gtk/ablistWindow48.png
rename to suite/branding/nightly/icons/gtk/ablistWindow48.png
rename from suite/branding/icons/gtk/addressbookWindow.png
rename to suite/branding/nightly/icons/gtk/addressbookWindow.png
rename from suite/branding/icons/gtk/addressbookWindow16.png
rename to suite/branding/nightly/icons/gtk/addressbookWindow16.png
rename from suite/branding/icons/gtk/addressbookWindow48.png
rename to suite/branding/nightly/icons/gtk/addressbookWindow48.png
rename from suite/branding/icons/gtk/bmPropsWindow.png
rename to suite/branding/nightly/icons/gtk/bmPropsWindow.png
rename from suite/branding/icons/gtk/bmPropsWindow16.png
rename to suite/branding/nightly/icons/gtk/bmPropsWindow16.png
rename from suite/branding/icons/gtk/bmPropsWindow48.png
rename to suite/branding/nightly/icons/gtk/bmPropsWindow48.png
rename from suite/branding/icons/gtk/bookmark-window.png
rename to suite/branding/nightly/icons/gtk/bookmark-window.png
rename from suite/branding/icons/gtk/bookmark-window16.png
rename to suite/branding/nightly/icons/gtk/bookmark-window16.png
rename from suite/branding/icons/gtk/bookmark-window48.png
rename to suite/branding/nightly/icons/gtk/bookmark-window48.png
rename from suite/branding/icons/gtk/chatzilla-window.xpm
rename to suite/branding/nightly/icons/gtk/chatzilla-window.xpm
rename from suite/branding/icons/gtk/default.png
rename to suite/branding/nightly/icons/gtk/default.png
rename from suite/branding/icons/gtk/default16.png
rename to suite/branding/nightly/icons/gtk/default16.png
rename from suite/branding/icons/gtk/default48.png
rename to suite/branding/nightly/icons/gtk/default48.png
rename from suite/branding/icons/gtk/downloadManager.png
rename to suite/branding/nightly/icons/gtk/downloadManager.png
rename from suite/branding/icons/gtk/downloadManager16.png
rename to suite/branding/nightly/icons/gtk/downloadManager16.png
rename from suite/branding/icons/gtk/downloadManager48.png
rename to suite/branding/nightly/icons/gtk/downloadManager48.png
rename from suite/branding/icons/gtk/editorWindow.png
rename to suite/branding/nightly/icons/gtk/editorWindow.png
rename from suite/branding/icons/gtk/editorWindow16.png
rename to suite/branding/nightly/icons/gtk/editorWindow16.png
rename from suite/branding/icons/gtk/editorWindow48.png
rename to suite/branding/nightly/icons/gtk/editorWindow48.png
rename from suite/branding/icons/gtk/findBookmarkWindow.png
rename to suite/branding/nightly/icons/gtk/findBookmarkWindow.png
rename from suite/branding/icons/gtk/findBookmarkWindow16.png
rename to suite/branding/nightly/icons/gtk/findBookmarkWindow16.png
rename from suite/branding/icons/gtk/findBookmarkWindow48.png
rename to suite/branding/nightly/icons/gtk/findBookmarkWindow48.png
rename from suite/branding/icons/gtk/findHistoryWindow.png
rename to suite/branding/nightly/icons/gtk/findHistoryWindow.png
rename from suite/branding/icons/gtk/findHistoryWindow16.png
rename to suite/branding/nightly/icons/gtk/findHistoryWindow16.png
rename from suite/branding/icons/gtk/findHistoryWindow48.png
rename to suite/branding/nightly/icons/gtk/findHistoryWindow48.png
rename from suite/branding/icons/gtk/history-window.png
rename to suite/branding/nightly/icons/gtk/history-window.png
rename from suite/branding/icons/gtk/history-window16.png
rename to suite/branding/nightly/icons/gtk/history-window16.png
rename from suite/branding/icons/gtk/history-window48.png
rename to suite/branding/nightly/icons/gtk/history-window48.png
rename from suite/branding/icons/gtk/main-window.png
rename to suite/branding/nightly/icons/gtk/main-window.png
rename from suite/branding/icons/gtk/main-window16.png
rename to suite/branding/nightly/icons/gtk/main-window16.png
rename from suite/branding/icons/gtk/main-window48.png
rename to suite/branding/nightly/icons/gtk/main-window48.png
rename from suite/branding/icons/gtk/messengerWindow.png
rename to suite/branding/nightly/icons/gtk/messengerWindow.png
rename from suite/branding/icons/gtk/messengerWindow16.png
rename to suite/branding/nightly/icons/gtk/messengerWindow16.png
rename from suite/branding/icons/gtk/messengerWindow48.png
rename to suite/branding/nightly/icons/gtk/messengerWindow48.png
rename from suite/branding/icons/gtk/msgcomposeWindow.png
rename to suite/branding/nightly/icons/gtk/msgcomposeWindow.png
rename from suite/branding/icons/gtk/msgcomposeWindow16.png
rename to suite/branding/nightly/icons/gtk/msgcomposeWindow16.png
rename from suite/branding/icons/gtk/msgcomposeWindow48.png
rename to suite/branding/nightly/icons/gtk/msgcomposeWindow48.png
rename from suite/branding/icons/gtk/seamonkey.png
rename to suite/branding/nightly/icons/gtk/seamonkey.png
rename from suite/branding/icons/gtk/venkman-window.png
rename to suite/branding/nightly/icons/gtk/venkman-window.png
rename from suite/branding/icons/gtk/venkman-window16.png
rename to suite/branding/nightly/icons/gtk/venkman-window16.png
rename from suite/branding/icons/gtk/venkman-window48.png
rename to suite/branding/nightly/icons/gtk/venkman-window48.png
rename from suite/branding/icons/mac/command.icns
rename to suite/branding/nightly/icons/mac/command.icns
rename from suite/branding/icons/mac/component.icns
rename to suite/branding/nightly/icons/mac/component.icns
rename from suite/branding/icons/mac/html.icns
rename to suite/branding/nightly/icons/mac/html.icns
rename from suite/branding/icons/mac/mozilla.icns
rename to suite/branding/nightly/icons/mac/mozilla.icns
rename from suite/branding/icons/mac/plugin.icns
rename to suite/branding/nightly/icons/mac/plugin.icns
rename from suite/branding/icons/mac/pref.icns
rename to suite/branding/nightly/icons/mac/pref.icns
rename from suite/branding/icons/mac/seamonkey.icns
rename to suite/branding/nightly/icons/mac/seamonkey.icns
rename from suite/branding/icons/mac/text.icns
rename to suite/branding/nightly/icons/mac/text.icns
rename from suite/branding/icons/os2/JSConsoleWindow.ico
rename to suite/branding/nightly/icons/os2/JSConsoleWindow.ico
rename from suite/branding/icons/os2/abcardWindow.ico
rename to suite/branding/nightly/icons/os2/abcardWindow.ico
rename from suite/branding/icons/os2/ablistWindow.ico
rename to suite/branding/nightly/icons/os2/ablistWindow.ico
rename from suite/branding/icons/os2/addressbookWindow.ico
rename to suite/branding/nightly/icons/os2/addressbookWindow.ico
rename from suite/branding/icons/os2/bmPropsWindow.ico
rename to suite/branding/nightly/icons/os2/bmPropsWindow.ico
rename from suite/branding/icons/os2/bookmark-window.ico
rename to suite/branding/nightly/icons/os2/bookmark-window.ico
rename from suite/branding/icons/os2/chatzilla-window.ico
rename to suite/branding/nightly/icons/os2/chatzilla-window.ico
rename from suite/branding/icons/os2/downloadManager.ico
rename to suite/branding/nightly/icons/os2/downloadManager.ico
rename from suite/branding/icons/os2/editorWindow.ico
rename to suite/branding/nightly/icons/os2/editorWindow.ico
rename from suite/branding/icons/os2/findBookmarkWindow.ico
rename to suite/branding/nightly/icons/os2/findBookmarkWindow.ico
rename from suite/branding/icons/os2/findHistoryWindow.ico
rename to suite/branding/nightly/icons/os2/findHistoryWindow.ico
rename from suite/branding/icons/os2/history-window.ico
rename to suite/branding/nightly/icons/os2/history-window.ico
rename from suite/branding/icons/os2/main-window.ico
rename to suite/branding/nightly/icons/os2/main-window.ico
rename from suite/branding/icons/os2/messengerWindow.ico
rename to suite/branding/nightly/icons/os2/messengerWindow.ico
rename from suite/branding/icons/os2/msgcomposeWindow.ico
rename to suite/branding/nightly/icons/os2/msgcomposeWindow.ico
rename from suite/branding/icons/os2/seamonkey.ico
rename to suite/branding/nightly/icons/os2/seamonkey.ico
rename from suite/branding/icons/os2/venkman-window.ico
rename to suite/branding/nightly/icons/os2/venkman-window.ico
rename from suite/branding/icons/svg/JSConsoleWindow.svg
rename to suite/branding/nightly/icons/svg/JSConsoleWindow.svg
rename from suite/branding/icons/svg/README
rename to suite/branding/nightly/icons/svg/README
--- a/suite/branding/icons/svg/README
+++ b/suite/branding/nightly/icons/svg/README
@@ -1,9 +1,9 @@
-mozilla/suite/branding/icons/svg:
+mozilla/suite/branding/nightly/icons/svg:
This directory contains the base SVG images used for creation of the SeaMonkey
window icons. The SVG images are not directly used in the software, but stored
here for reference and as a base for possible later revisions or new icons
that may be created in the future.
All image files in this directory and images derived from them are licenced
under the MPL/GPL/LGPL tri-license as follows:
rename from suite/branding/icons/svg/abcardWindow.svg
rename to suite/branding/nightly/icons/svg/abcardWindow.svg
rename from suite/branding/icons/svg/ablistWindow.svg
rename to suite/branding/nightly/icons/svg/ablistWindow.svg
rename from suite/branding/icons/svg/addressbookWindow.svg
rename to suite/branding/nightly/icons/svg/addressbookWindow.svg
rename from suite/branding/icons/svg/bmPropsWindow.svg
rename to suite/branding/nightly/icons/svg/bmPropsWindow.svg
rename from suite/branding/icons/svg/bookmark-window.svg
rename to suite/branding/nightly/icons/svg/bookmark-window.svg
rename from suite/branding/icons/svg/downloadManager.svg
rename to suite/branding/nightly/icons/svg/downloadManager.svg
rename from suite/branding/icons/svg/editorWindow.svg
rename to suite/branding/nightly/icons/svg/editorWindow.svg
rename from suite/branding/icons/svg/findBookmarkWindow.svg
rename to suite/branding/nightly/icons/svg/findBookmarkWindow.svg
rename from suite/branding/icons/svg/findHistoryWindow.svg
rename to suite/branding/nightly/icons/svg/findHistoryWindow.svg
rename from suite/branding/icons/svg/history-window.svg
rename to suite/branding/nightly/icons/svg/history-window.svg
rename from suite/branding/icons/svg/messengerWindow.svg
rename to suite/branding/nightly/icons/svg/messengerWindow.svg
rename from suite/branding/icons/svg/msgcomposeWindow.svg
rename to suite/branding/nightly/icons/svg/msgcomposeWindow.svg
rename from suite/branding/icons/svg/venkman-window.svg
rename to suite/branding/nightly/icons/svg/venkman-window.svg
rename from suite/branding/icons/windows/JSConsoleWindow.ico
rename to suite/branding/nightly/icons/windows/JSConsoleWindow.ico
rename from suite/branding/icons/windows/abcardWindow.ico
rename to suite/branding/nightly/icons/windows/abcardWindow.ico
rename from suite/branding/icons/windows/ablistWindow.ico
rename to suite/branding/nightly/icons/windows/ablistWindow.ico
rename from suite/branding/icons/windows/addressbookWindow.ico
rename to suite/branding/nightly/icons/windows/addressbookWindow.ico
rename from suite/branding/icons/windows/bmPropsWindow.ico
rename to suite/branding/nightly/icons/windows/bmPropsWindow.ico
rename from suite/branding/icons/windows/bookmark-window.ico
rename to suite/branding/nightly/icons/windows/bookmark-window.ico
rename from suite/branding/icons/windows/chatzilla-window.ico
rename to suite/branding/nightly/icons/windows/chatzilla-window.ico
rename from suite/branding/icons/windows/downloadManager.ico
rename to suite/branding/nightly/icons/windows/downloadManager.ico
rename from suite/branding/icons/windows/editorWindow.ico
rename to suite/branding/nightly/icons/windows/editorWindow.ico
rename from suite/branding/icons/windows/findBookmarkWindow.ico
rename to suite/branding/nightly/icons/windows/findBookmarkWindow.ico
rename from suite/branding/icons/windows/findHistoryWindow.ico
rename to suite/branding/nightly/icons/windows/findHistoryWindow.ico
rename from suite/branding/icons/windows/gif-file.ico
rename to suite/branding/nightly/icons/windows/gif-file.ico
rename from suite/branding/icons/windows/history-window.ico
rename to suite/branding/nightly/icons/windows/history-window.ico
rename from suite/branding/icons/windows/html-file.ico
rename to suite/branding/nightly/icons/windows/html-file.ico
rename from suite/branding/icons/windows/image-file.ico
rename to suite/branding/nightly/icons/windows/image-file.ico
rename from suite/branding/icons/windows/jpeg-file.ico
rename to suite/branding/nightly/icons/windows/jpeg-file.ico
rename from suite/branding/icons/windows/main-window.ico
rename to suite/branding/nightly/icons/windows/main-window.ico
rename from suite/branding/icons/windows/messengerWindow.ico
rename to suite/branding/nightly/icons/windows/messengerWindow.ico
rename from suite/branding/icons/windows/misc-file.ico
rename to suite/branding/nightly/icons/windows/misc-file.ico
rename from suite/branding/icons/windows/msgcomposeWindow.ico
rename to suite/branding/nightly/icons/windows/msgcomposeWindow.ico
rename from suite/branding/icons/windows/readme.txt
rename to suite/branding/nightly/icons/windows/readme.txt
rename from suite/branding/icons/windows/script-file.ico
rename to suite/branding/nightly/icons/windows/script-file.ico
rename from suite/branding/icons/windows/seamonkey.ico
rename to suite/branding/nightly/icons/windows/seamonkey.ico
rename from suite/branding/icons/windows/template-file.ico
rename to suite/branding/nightly/icons/windows/template-file.ico
rename from suite/branding/icons/windows/template-window.ico
rename to suite/branding/nightly/icons/windows/template-window.ico
rename from suite/branding/icons/windows/venkman-window.ico
rename to suite/branding/nightly/icons/windows/venkman-window.ico
rename from suite/branding/icons/windows/xml-file.ico
rename to suite/branding/nightly/icons/windows/xml-file.ico
rename from suite/branding/icons/windows/xul-file.ico
rename to suite/branding/nightly/icons/windows/xul-file.ico
rename from suite/branding/jar.mn
rename to suite/branding/nightly/jar.mn
rename from suite/branding/package/mac/background.png
rename to suite/branding/nightly/package/mac/background.png
rename from suite/branding/package/mac/disk.icns
rename to suite/branding/nightly/package/mac/disk.icns
rename from suite/branding/package/mac/dsstore
rename to suite/branding/nightly/package/mac/dsstore
--- a/suite/build.mk
+++ b/suite/build.mk
@@ -55,19 +55,17 @@ ifdef MOZ_LDAP_XPCOM
tier_app_staticdirs += directory/c-sdk
tier_app_dirs += directory/xpcom
endif
ifdef MOZ_COMPOSER
tier_app_dirs += editor/ui
endif
-ifdef MOZ_BRANDING_DIRECTORY
tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
-endif
ifdef MOZ_MAIL_NEWS
tier_app_dirs += \
mailnews/base \
mailnews/mime/public \
mailnews \
$(NULL)
endif
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -42,16 +42,18 @@ MOZ_MAIL_NEWS=1
if [ "$COMM_BUILD" ]; then
MOZ_LDAP_XPCOM=1
fi
MOZ_STATIC_MAIL_BUILD=1
MOZ_COMPOSER=1
MOZ_SUITE=1
MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
SEAMONKEY_VERSION=$MOZ_APP_VERSION
+MOZ_BRANDING_DIRECTORY=suite/branding/nightly
+MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs reporter"
MOZ_PLACES=1
MOZ_UPDATER=1
MOZ_HELP_VIEWER=1
MOZ_TOOLKIT_SEARCH=
# Disable libxul which is (now) the default on mozilla-central. (Bug 394502)
MOZ_ENABLE_LIBXUL=
--- a/suite/installer/windows/Makefile.in
+++ b/suite/installer/windows/Makefile.in
@@ -143,15 +143,8 @@ endif
cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \
$(CONFIG_DIR)/defines.nsi
$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \
$(MOZILLA_SRCDIR) $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/windows $(AB_CD) \
$(CONFIG_DIR)
include $(topsrcdir)/config/rules.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk
-
-export::
- $(NSINSTALL) -D $(DIST)/branding
- cp $(srcdir)/nsis/branding.nsi $(DIST)/branding/branding.nsi
- cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
- cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
- cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -47,16 +47,20 @@ include $(topsrcdir)/config/config.mk
vpath %.src @srcdir@/en-US/searchplugins
vpath %.png @srcdir@/en-US/searchplugins
vpath %.src $(LOCALE_SRCDIR)/searchplugins
vpath %.png $(LOCALE_SRCDIR)/searchplugins
run_for_effects := $(shell if test ! -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if test ! -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
_ABS_DIST := $(call core_abspath,$(DIST))
+SUBMAKEFILES += \
+ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
+ $(NULL)
+
AB = $(firstword $(subst -, ,$(AB_CD)))
PWD := $(CURDIR)
# These are defaulted to be compatible with the files the wget-en-US target
# pulls. You may override them if you provide your own files. You _must_
# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
# work in that case.
@@ -222,17 +226,17 @@ MOZ_PKG_MAC_EXTRA=--format UDBZ \
endif
PACKAGER_NO_LIBS = 1
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
- $(MAKE) -C ../installer/windows export
+ $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
if test ! -d $(_ABS_DIST)/$(PKG_INST_PATH); then \
$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH); \
fi
$(RM) -rf l10n-stage
$(NSINSTALL) -D l10n-stage
$(CYGWIN_WRAPPER) 7z x -ol10n-stage $(WIN32_INSTALLER_IN)
$(RM) -r l10n-stage/localized
$(RM) l10n-stage/setup.exe
--- a/suite/makefiles.sh
+++ b/suite/makefiles.sh
@@ -34,17 +34,16 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
if [ "$COMM_BUILD" ]; then
add_makefiles "
suite/Makefile
suite/app/Makefile
- suite/branding/Makefile
suite/browser/Makefile
suite/browser/public/Makefile
suite/browser/src/Makefile
suite/build/Makefile
suite/debugQA/Makefile
suite/debugQA/locales/Makefile
suite/common/Makefile
suite/common/public/Makefile
@@ -61,10 +60,11 @@ add_makefiles "
suite/profile/Makefile
suite/profile/migration/public/Makefile
suite/profile/migration/src/Makefile
suite/shell/public/Makefile
suite/shell/src/Makefile
suite/smile/Makefile
suite/themes/modern/Makefile
suite/themes/classic/Makefile
+ $MOZ_BRANDING_DIRECTORY/Makefile
"
fi
