diff --git a/allmakefiles.sh b/allmakefiles.sh index e4bc7f8e911..a9a912b3c39 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -936,6 +936,7 @@ browser/themes/winstripe/Makefile MAKEFILES_suite=" suite/Makefile +suite/branding/Makefile suite/components/Makefile suite/components/xulappinfo/Makefile " diff --git a/suite/Makefile.in b/suite/Makefile.in index df8e7c89a4e..865ed0485f5 100644 --- a/suite/Makefile.in +++ b/suite/Makefile.in @@ -43,7 +43,25 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk DIRS = \ + branding \ components \ $(NULL) +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +README_FILE = $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/mac/README.txt +else +ifeq ($(OS_ARCH),OS2) +README_FILE = $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/os2/README.txt +else +ifeq ($(OS_ARCH),WINNT) +README_FILE = $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/windows/README.txt +else +README_FILE = $(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/unix/README +endif +endif +endif + include $(topsrcdir)/config/rules.mk + +libs:: + $(INSTALL) $(README_FILE) $(DIST)/bin diff --git a/suite/branding/Makefile.in b/suite/branding/Makefile.in new file mode 100644 index 00000000000..331f0d0cf89 --- /dev/null +++ b/suite/branding/Makefile.in @@ -0,0 +1,51 @@ +# +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# the mozilla.org SeaMonkey project. +# Portions created by the Initial Developer are Copyright (C) 2005 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# 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 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# 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 = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +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 +endif + +include $(topsrcdir)/config/rules.mk diff --git a/suite/branding/icons/gtk/default.xpm b/suite/branding/icons/gtk/default.xpm new file mode 100644 index 00000000000..aa7204034a0 --- /dev/null +++ b/suite/branding/icons/gtk/default.xpm @@ -0,0 +1,45 @@ +/* XPM */ +static char *icon32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 7 1", +" c black", +". c #555500", +"X c #636D61", +"o c red", +"O c #FF8080", +"+ c gray100", +"@ c None", +/* pixels */ +"@ @@ @@@ @@@@@@@@@@@@@@@@@@", +" @ @ @@@@@@@@@@@@@@@@@@", +" @@ @ @@@@oo@@@@@@@@@@@@", +" @@@@ @ @ @@@oooo@@@@@@@@@@@", +"@ @@@ @@@ @@oooooo@@@@@@@@@@", +"@@ @@ @@@ @ooooooo@@@@@@@@@@", +"@@@ @ @@@ ooooooooo@@@@@@@@@", +" @@ @ @@@ ooooooooo@@@@@@@@@", +" @ @@@ oooooooooo@@@@@@@@", +"@ @@ @@o oooooooooo@@@@@@@@", +"@@@@@@@@@@ooooooooooooooo@@@@@@@", +"@@@@@@@@@oooooooooooooooo@@@@@@@", +"@@@@@@@@oooooooooooooooooo@@@@@@", +"@@@@@@@ooooooooooooooooooo@@@@@@", +"@@@@@@ooooooooooooooooooooo@@@@@", +"@@@@@oooooooooooooooooooooo@@@@@", +"@@@@oooooooooooooo++oooooo++@@@@", +"@@@ooooooooooooooo++oooooo++o@@@", +"@@oooooooooooooooooO++++++Oooo@@", +"@oooooooooooooooooo++++++++oooo@", +"ooooooooooooooooooo+ ++ +ooooo", +"ooooooooooooooooooO++++++++Ooooo", +"@@@@@@@@@@@@@@ @@++++ ++++@@@@", +"@@@@@@@@@@@@@@ @++++++++++++@@@", +"@@@@@@@@@@@@@@ @+++ ++++ +++@@@", +"@@@@@@@@@@@@@@ @++++ ++++@@@", +"...............................@", +"@@............................@@", +"@@@@.........................@@@", +"@@@@@@......................@@@@", +"@@@@@@@@...................@@@@@", +"@@@@@@@@@@................@@@@@@" +}; diff --git a/suite/branding/icons/gtk/default16.xpm b/suite/branding/icons/gtk/default16.xpm new file mode 100644 index 00000000000..d87b61267b1 --- /dev/null +++ b/suite/branding/icons/gtk/default16.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char *icon16[] = { +/* columns rows colors chars-per-pixel */ +"16 16 7 1", +" c black", +". c #555500", +"X c #636D61", +"o c red", +"O c #FF8080", +"+ c gray100", +"@ c None", +/* pixels */ +"@ @ @ @@@@@@@@@", +" @@@ @@o@@@@@@", +"@ @@ @ @ooo@@@@@", +"@@ @ @ oooo@@@@@", +" @@ @ ooooo@@@@", +"@@@@@ooooooo@@@@", +"@@@@ooooooooo@@@", +"@@@oooooooooo@@@", +"@@ooooooo+ooo+@@", +"@ooooooooO+++Oo@", +"oooooooooO + Ooo", +"@@@@@@@ @+++++@@", +"@@@@@@@ @+ +@@", +"@..............@", +"@@@...........@@", +"@@@@@........@@@" +};