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

Fix bug 533070 - Sunbird nightly builds fail with |No rule to make target .../calendar/sunbird/branding/nightly/Makefile.in| (regression). r=Standard8 

--HG--
rename : calendar/installer/windows/Header.bmp => calendar/sunbird/branding/nightly/Header.bmp
rename : calendar/installer/windows/Watermrk.bmp => calendar/sunbird/branding/nightly/Watermrk.bmp
rename : calendar/sunbird/app/macbuild/background.png => calendar/sunbird/branding/nightly/background.png
rename : calendar/installer/windows/nsis/branding.nsi => calendar/sunbird/branding/nightly/branding.nsi
rename : calendar/sunbird/base/branding/about.png => calendar/sunbird/branding/nightly/content/about.png
rename : calendar/sunbird/base/branding/aboutCredits.png => calendar/sunbird/branding/nightly/content/aboutCredits.png
rename : calendar/sunbird/base/branding/aboutFooter.png => calendar/sunbird/branding/nightly/content/aboutFooter.png
rename : calendar/sunbird/base/branding/icon48.png => calendar/sunbird/branding/nightly/content/icon48.png
rename : calendar/sunbird/base/branding/icon64.png => calendar/sunbird/branding/nightly/content/icon64.png
rename : calendar/sunbird/app/default.xpm => calendar/sunbird/branding/nightly/default.xpm
rename : calendar/sunbird/app/macbuild/disk.icns => calendar/sunbird/branding/nightly/disk.icns
rename : calendar/sunbird/app/macbuild/dsstore => calendar/sunbird/branding/nightly/dsstore
rename : calendar/installer/windows/license.txt => calendar/sunbird/branding/nightly/license.txt
rename : calendar/locales/en-US/chrome/branding/brand.dtd => calendar/sunbird/branding/nightly/locales/en-US/brand.dtd
rename : calendar/locales/en-US/chrome/branding/brand.properties => calendar/sunbird/branding/nightly/locales/en-US/brand.properties
rename : calendar/sunbird/app/mozicon128.png => calendar/sunbird/branding/nightly/mozicon128.png
rename : calendar/sunbird/app/mozicon16.xpm => calendar/sunbird/branding/nightly/mozicon16.xpm
rename : calendar/sunbird/app/mozicon50.xpm => calendar/sunbird/branding/nightly/mozicon50.xpm
rename : calendar/sunbird/app/macbuild/sb_ICS.icns => calendar/sunbird/branding/nightly/sb_ICS.icns
rename : calendar/sunbird/app/sunbird-os2.ico => calendar/sunbird/branding/nightly/sunbird-os2.ico
rename : calendar/sunbird/app/macbuild/sunbird.icns => calendar/sunbird/branding/nightly/sunbird.icns
rename : calendar/sunbird/app/sunbird.ico => calendar/sunbird/branding/nightly/sunbird.ico
rename : calendar/installer/windows/wizHeader.bmp => calendar/sunbird/branding/nightly/wizHeader.bmp
rename : calendar/installer/windows/wizHeaderRTL.bmp => calendar/sunbird/branding/nightly/wizHeaderRTL.bmp
rename : calendar/installer/windows/wizWatermark.bmp => calendar/sunbird/branding/nightly/wizWatermark.bmp
This commit is contained in:
Philipp Kewisch 2009-12-22 19:19:36 +01:00
Родитель 24524a1ea9
Коммит bc5c95b683
42 изменённых файлов: 187 добавлений и 221 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
calendar/installer/windows/Makefile.in
Просмотреть файл

@ -152,15 +152,3 @@ $(CONFIG_DIR)/setup.exe::
include $(topsrcdir)/config/rules.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk
export::
ifndef MOZ_BRANDING_DIRECTORY
$(NSINSTALL) -D $(DIST)/branding
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
cp $(srcdir)/nsis/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
endif

11
calendar/locales/Makefile.in
Просмотреть файл

@ -54,12 +54,7 @@ include $(topsrcdir)/config/config.mk
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 := $(shell cd $(DIST) && pwd)
ifdef MOZ_BRANDING_DIRECTORY
SUBMAKEFILES += \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
$(NULL)
endif
SUBMAKEFILES += $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile
# This makefile uses variable overrides from the libs-% target to
# build non-default locales to non-default dist/ locations. Be aware!
@ -87,10 +82,6 @@ DEFINES += \
-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
$(NULL)
ifndef MOZ_BRANDING_DIRECTORY
DEFINES += -DMOZ_USE_GENERIC_BRANDING
endif
ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS)))
DEFINES += -DEXTENSION_PREF
endif

24
calendar/makefiles.sh
Просмотреть файл

@ -21,7 +21,8 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# - Simon Paquet <bugzilla@babylonsounds.com>
# Simon Paquet <bugzilla@babylonsounds.com>
# Philipp Kewisch <mozilla@kewis.ch>
#
# 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
@ -39,20 +40,13 @@
if [ "$COMM_BUILD" ]; then
add_makefiles "
calendar/sunbird/Makefile
calendar/sunbird/app/Makefile
calendar/sunbird/base/Makefile
calendar/sunbird/locales/Makefile
"
if test -n "$MOZ_BRANDING_DIRECTORY"; then
add_makefiles "
add_makefiles "
calendar/sunbird/Makefile
calendar/sunbird/app/Makefile
calendar/sunbird/base/Makefile
calendar/sunbird/locales/Makefile
$MOZ_BRANDING_DIRECTORY/Makefile
$MOZ_BRANDING_DIRECTORY/content/Makefile
$MOZ_BRANDING_DIRECTORY/locales/Makefile
"
fi
"
. ${srcdir}/calendar/shared_makefiles.sh
. ${srcdir}/calendar/shared_makefiles.sh
fi

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

@ -50,10 +50,6 @@ ifeq ($(OS_ARCH),WINNT)
ifdef MOZ_INSTALLER
DIRS += ../installer/windows
ifdef MOZ_BRANDING_DIRECTORY
DEFINES += -DOFFICIAL_BRANDING=1
endif
# For Windows build the uninstaller during the application build since the
# uninstaller is included with the application for mar file generation.
libs::
@ -63,4 +59,3 @@ endif
endif
include $(topsrcdir)/config/rules.mk

46
calendar/sunbird/app/Makefile.in
Просмотреть файл

@ -280,54 +280,12 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, sunbird.js)
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ICON_FILES = \
$(DIST)/branding/mozicon128.png \
$(DIST)/branding/mozicon50.xpm \
$(DIST)/branding/mozicon16.xpm \
$(NULL)
libs:: $(ICON_FILES)
$(INSTALL) $^ $(DIST)/bin/icons
install::
$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
$(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
install::
$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default
endif
export::
ifndef MOZ_BRANDING_DIRECTORY
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/macbuild/sunbird.icns $(DIST)/branding/sunbird.icns
cp $(srcdir)/macbuild/sb_ICS.icns $(DIST)/branding/sb_ICS.icns
cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png
cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png
cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm
cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm
endif
ifeq ($(OS_ARCH),OS2)
cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico
endif
$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
endif
libs::

6
calendar/sunbird/base/Makefile.in
Просмотреть файл

@ -63,10 +63,4 @@ ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
ifndef MOZ_BRANDING_DIRECTORY
DEFINES += -DMOZ_USE_GENERIC_BRANDING
endif

8
calendar/sunbird/base/jar.mn
Просмотреть файл

@ -18,11 +18,3 @@ sunbird.jar:
skin/sunbird/calendar.css (themes/@THEME@/calendar.css)
skin/sunbird/toolbar.css (themes/@THEME@/toolbar.css)
skin/sunbird/offline-online.png (themes/@THEME@/offline-online.png)
#ifdef MOZ_USE_GENERIC_BRANDING
% content branding %content/branding/
content/branding/about.png (branding/about.png)
content/branding/aboutCredits.png (branding/aboutCredits.png)
content/branding/aboutFooter.png (branding/aboutFooter.png)
content/branding/icon64.png (branding/icon64.png)
content/branding/icon48.png (branding/icon48.png)
#endif

0
calendar/installer/windows/Header.bmp → calendar/sunbird/branding/nightly/Header.bmp
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 7.5 KiB

После

Ширина:  |  Высота:  |  Размер: 7.5 KiB

81
calendar/sunbird/branding/nightly/Makefile.in Normal file
Просмотреть файл

@ -0,0 +1,81 @@
# ***** 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 Calendar code.
#
# The Initial Developer of the Original Code is
# Philipp Kewisch <mozilla@kewis.ch>
# Portions created by the Initial Developer are Copyright (C) 2009
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Brian Ryner <bryner@brianryner.com>
# Matthew Willis <lilmatt@mozilla.com>
# Robert Strong <robert.bugzilla@gmail.com>
#
# 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@
relativesrcdir = calendar/sunbird/branding/sunbird/locales
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD)
include $(topsrcdir)/config/rules.mk
export::
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico
cp $(srcdir)/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
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns
cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/mozicon128.png $(DIST)/branding/default128.png
cp $(srcdir)/mozicon50.xpm $(DIST)/branding/default50.xpm
cp $(srcdir)/mozicon16.xpm $(DIST)/branding/default16.xpm
cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm
endif
ifeq ($(OS_ARCH),OS2)
cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico
endif

0
calendar/installer/windows/Watermrk.bmp → calendar/sunbird/branding/nightly/Watermrk.bmp
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 1.4 MiB

После

Ширина:  |  Высота:  |  Размер: 1.4 MiB

0
calendar/sunbird/app/macbuild/background.png → calendar/sunbird/branding/nightly/background.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 128 B

После

Ширина:  |  Высота:  |  Размер: 128 B

0
calendar/installer/windows/nsis/branding.nsi → calendar/sunbird/branding/nightly/branding.nsi
Просмотреть файл

0
calendar/sunbird/base/branding/about.png → calendar/sunbird/branding/nightly/content/about.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 13 KiB

После

Ширина:  |  Высота:  |  Размер: 13 KiB

0
calendar/sunbird/base/branding/aboutCredits.png → calendar/sunbird/branding/nightly/content/aboutCredits.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 20 KiB

После

Ширина:  |  Высота:  |  Размер: 20 KiB

0
calendar/sunbird/base/branding/aboutFooter.png → calendar/sunbird/branding/nightly/content/aboutFooter.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 196 B

После

Ширина:  |  Высота:  |  Размер: 196 B

0
calendar/sunbird/base/branding/icon48.png → calendar/sunbird/branding/nightly/content/icon48.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 5.0 KiB

После

Ширина:  |  Высота:  |  Размер: 5.0 KiB

0
calendar/sunbird/base/branding/icon64.png → calendar/sunbird/branding/nightly/content/icon64.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 7.6 KiB

После

Ширина:  |  Высота:  |  Размер: 7.6 KiB

0
calendar/sunbird/app/default.xpm → calendar/sunbird/branding/nightly/default.xpm
Просмотреть файл

0
calendar/sunbird/app/macbuild/disk.icns → calendar/sunbird/branding/nightly/disk.icns
Просмотреть файл

0
calendar/sunbird/app/macbuild/dsstore → calendar/sunbird/branding/nightly/dsstore
Просмотреть файл

15
calendar/sunbird/branding/nightly/jar.mn Normal file
Просмотреть файл

@ -0,0 +1,15 @@
#filter substitution
sunbird.jar:
% content branding %content/branding/
content/branding/about.png (content/about.png)
content/branding/aboutCredits.png (content/aboutCredits.png)
content/branding/aboutFooter.png (content/aboutFooter.png)
content/branding/icon64.png (content/icon64.png)
content/branding/icon48.png (content/icon48.png)
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
# Calendar branding only exists in en-US
locale/branding/brand.dtd (locales/en-US/brand.dtd)
* locale/branding/brand.properties (locales/en-US/brand.properties)

0
calendar/installer/windows/license.txt → calendar/sunbird/branding/nightly/license.txt
Просмотреть файл

0
calendar/locales/en-US/chrome/branding/brand.dtd → calendar/sunbird/branding/nightly/locales/en-US/brand.dtd
Просмотреть файл

0
calendar/locales/en-US/chrome/branding/brand.properties → calendar/sunbird/branding/nightly/locales/en-US/brand.properties
Просмотреть файл

0
calendar/sunbird/app/mozicon128.png → calendar/sunbird/branding/nightly/mozicon128.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 21 KiB

После

Ширина:  |  Высота:  |  Размер: 21 KiB

0
calendar/sunbird/app/mozicon16.xpm → calendar/sunbird/branding/nightly/mozicon16.xpm
Просмотреть файл

0
calendar/sunbird/app/mozicon50.xpm → calendar/sunbird/branding/nightly/mozicon50.xpm
Просмотреть файл

0
calendar/sunbird/app/macbuild/sb_ICS.icns → calendar/sunbird/branding/nightly/sb_ICS.icns
Просмотреть файл

0
calendar/sunbird/app/sunbird-os2.ico → calendar/sunbird/branding/nightly/sunbird-os2.ico
Просмотреть файл

0
calendar/sunbird/app/macbuild/sunbird.icns → calendar/sunbird/branding/nightly/sunbird.icns
Просмотреть файл

0
calendar/sunbird/app/sunbird.ico → calendar/sunbird/branding/nightly/sunbird.ico
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 364 KiB

После

Ширина:  |  Высота:  |  Размер: 364 KiB

0
calendar/installer/windows/wizHeader.bmp → calendar/sunbird/branding/nightly/wizHeader.bmp
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 25 KiB

После

Ширина:  |  Высота:  |  Размер: 25 KiB

0
calendar/installer/windows/wizHeaderRTL.bmp → calendar/sunbird/branding/nightly/wizHeaderRTL.bmp
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 25 KiB

После

Ширина:  |  Высота:  |  Размер: 25 KiB

0
calendar/installer/windows/wizWatermark.bmp → calendar/sunbird/branding/nightly/wizWatermark.bmp
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 151 KiB

После

Ширина:  |  Высота:  |  Размер: 151 KiB

4
calendar/sunbird/locales/Makefile.in
Просмотреть файл

@ -55,10 +55,6 @@ DEFINES += \
-DAPP_VERSION="$(APP_VERSION)" \
$(NULL)
ifndef MOZ_BRANDING_DIRECTORY
DEFINES += -DMOZ_USE_GENERIC_BRANDING
endif
include $(topsrcdir)/config/rules.mk
libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES))

7
calendar/sunbird/locales/jar.mn
Просмотреть файл

@ -1,12 +1,5 @@
#filter substitution
#ifdef MOZ_USE_GENERIC_BRANDING
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
+ locale/branding/brand.dtd (%chrome/branding/brand.dtd)
+ locale/branding/brand.properties (%chrome/branding/brand.properties)
#endif
sunbird-@AB_CD@.jar:
% locale sunbird @AB_CD@ %locale/@AB_CD@/sunbird/
locale/@AB_CD@/sunbird/aboutDialog.dtd (%chrome/sunbird/aboutDialog.dtd)

103
other-licenses/branding/sunbird/Makefile.in
Просмотреть файл

@ -1,57 +1,84 @@
# Branding Makefile
# - jars chrome artwork
# - copies artwork to appropriate places in objdir for bundling into app
# resources
# ***** 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 Calendar code.
#
# The Initial Developer of the Original Code is
# Matthew Willis <lilmatt@mozilla.com>
# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Robert Strong <robert.bugzilla@gmail.com>
# Philipp Kewisch <mozilla@kewis.ch>
#
# 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@
relativesrcdir = other-licenses/branding/sunbird/locales
include $(DEPTH)/config/autoconf.mk
DIRS = \
content \
locales \
$(NULL)
DEFINES += -DAB_CD=$(AB_CD)
include $(topsrcdir)/config/rules.mk
CALENDAR_APP_FILES = \
default.xpm \
mozicon128.png \
mozicon16.xpm \
mozicon50.xpm \
sunbird.ico \
$(NULL)
export::
$(NSINSTALL) -D $(DIST)/branding
cp $(addprefix $(srcdir)/, $(CALENDAR_APP_FILES)) $(DIST)/branding/
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
$(NSINSTALL) -D $(DIST)/install
cp $(srcdir)/header.png $(DIST)/install/header.png
cp $(srcdir)/watermark.png $(DIST)/install/watermark.png
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico
cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico
cp $(srcdir)/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
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns
cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns
cp $(srcdir)/document.icns $(DIST)/branding/document.icns
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
cp $(srcdir)/license.r $(DIST)/branding/license.r
cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns
cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns
cp $(srcdir)/document.icns $(DIST)/branding/document.icns
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
cp $(srcdir)/license.r $(DIST)/branding/license.r
endif
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/mozicon128.png $(DIST)/branding/default128.png
cp $(srcdir)/mozicon50.xpm $(DIST)/branding/default50.xpm
cp $(srcdir)/mozicon16.xpm $(DIST)/branding/default16.xpm
cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm
$(NSINSTALL) -D $(DIST)/install
cp $(srcdir)/header.png $(DIST)/install/header.png
cp $(srcdir)/watermark.png $(DIST)/install/watermark.png
endif
ifeq ($(OS_ARCH),OS2)
cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico
cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico
endif

11
other-licenses/branding/sunbird/content/Makefile.in
Просмотреть файл

@ -1,11 +0,0 @@
# Branding Makefile
# - jars chrome artwork
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk

7
other-licenses/branding/sunbird/content/jar.mn
Просмотреть файл

@ -1,7 +0,0 @@
calendar.jar:
% content branding %content/branding/ xpcnativewrappers=yes
content/branding/about.png (about.png)
content/branding/aboutCredits.png (aboutCredits.png)
content/branding/aboutFooter.png (aboutFooter.png)
content/branding/icon64.png (icon64.png)
content/branding/icon48.png (icon48.png)

14
other-licenses/branding/sunbird/jar.mn Normal file
Просмотреть файл

@ -0,0 +1,14 @@
#filter substitution
calendar.jar:
% content branding %content/branding/ xpcnativewrappers=yes
content/branding/about.png (content/about.png)
content/branding/aboutCredits.png (content/aboutCredits.png)
content/branding/aboutFooter.png (content/aboutFooter.png)
content/branding/icon64.png (content/icon64.png)
content/branding/icon48.png (content/icon48.png)
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
locale/branding/brand.dtd (locales/en-US/brand.dtd)
locale/branding/brand.properties (locales/en-US/brand.properties)

48
other-licenses/branding/sunbird/locales/Makefile.in
Просмотреть файл

@ -1,48 +0,0 @@
# ***** 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 the Mozilla Browser code.
#
# The Initial Developer of the Original Code is
# Benjamin Smedberg <benjamin@smedbergs.us>
# Portions created by the Initial Developer are Copyright (C) 2004
# 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@
relativesrcdir = other-licenses/branding/sunbird/locales
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
include $(topsrcdir)/config/rules.mk

6
other-licenses/branding/sunbird/locales/jar.mn
Просмотреть файл

@ -1,6 +0,0 @@
#filter substitution
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
locale/branding/brand.dtd (%brand.dtd)
locale/branding/brand.properties (%brand.properties)