wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 823218 - merge metro branding to mc. r=glandium

Browse Source
This commit is contained in:
Jim Mathies 2013-02-12 14:51:23 -06:00
parent bb7fa8aed2
commit 26f1e39bfd
20 changed files with 100 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
browser/branding/aurora/Makefile.in
View File

@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
DIRS = \
content \
@ -16,9 +17,9 @@ DIRS = \
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
include $(topsrcdir)/config/rules.mk
WINDOWS_BRANDING_FILES = \
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \
firefox.ico \
document.ico \
branding.nsi \
@ -36,39 +37,35 @@ WINDOWS_BRANDING_FILES = \
newtab.ico \
pbmode.ico \
$(NULL)
endif
OSX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
BRANDING_FILES := \
background.png \
firefox.icns \
disk.icns \
document.icns \
dsstore \
$(NULL)
endif
LINUX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
BRANDING_FILES := \
default16.png \
default32.png \
default48.png \
mozicon128.png \
$(NULL)
endif
OS2_BRANDING_FILES = \
ifeq ($(OS_ARCH),OS2)
BRANDING_FILES := \
firefox-os2.ico \
document-os2.ico \
$(NULL)
endif
export::
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
cp $(addprefix $(srcdir)/, $(WINDOWS_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
cp $(addprefix $(srcdir)/, $(OSX_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
$(NSINSTALL) -D $(DIST)/install
endif
ifeq ($(OS_ARCH),OS2)
cp $(addprefix $(srcdir)/, $(OS2_BRANDING_FILES)) $(DIST)/branding/
endif
BRANDING_DEST := $(DIST)/branding
INSTALL_TARGETS += BRANDING
include $(topsrcdir)/config/rules.mk

7
browser/branding/aurora/content/Makefile.in
View File

@ -12,4 +12,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

BIN
browser/branding/aurora/content/VisualElements_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
browser/branding/aurora/content/VisualElements_smalllogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
browser/branding/aurora/content/VisualElements_splashscreen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 KiB

39
browser/branding/nightly/Makefile.in
View File

@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
DIRS = \
content \
@ -16,9 +17,9 @@ DIRS = \
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
include $(topsrcdir)/config/rules.mk
WINDOWS_BRANDING_FILES = \
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \
firefox.ico \
document.ico \
branding.nsi \
@ -36,39 +37,35 @@ WINDOWS_BRANDING_FILES = \
newtab.ico \
pbmode.ico \
$(NULL)
endif
OSX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
BRANDING_FILES := \
background.png \
firefox.icns \
disk.icns \
document.icns \
dsstore \
$(NULL)
endif
LINUX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
BRANDING_FILES := \
default16.png \
default32.png \
default48.png \
mozicon128.png \
$(NULL)
endif
OS2_BRANDING_FILES = \
ifeq ($(OS_ARCH),OS2)
BRANDING_FILES := \
firefox-os2.ico \
document-os2.ico \
$(NULL)
endif
export::
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
cp $(addprefix $(srcdir)/, $(WINDOWS_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
cp $(addprefix $(srcdir)/, $(OSX_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
$(NSINSTALL) -D $(DIST)/install
endif
ifeq ($(OS_ARCH),OS2)
cp $(addprefix $(srcdir)/, $(OS2_BRANDING_FILES)) $(DIST)/branding/
endif
BRANDING_DEST := $(DIST)/branding
INSTALL_TARGETS += BRANDING
include $(topsrcdir)/config/rules.mk

7
browser/branding/nightly/content/Makefile.in
View File

@ -12,4 +12,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

BIN
browser/branding/nightly/content/VisualElements_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
browser/branding/nightly/content/VisualElements_smalllogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
browser/branding/nightly/content/VisualElements_splashscreen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 KiB

39
browser/branding/official/Makefile.in
View File

@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
DIRS = \
content \
@ -16,9 +17,9 @@ DIRS = \
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
include $(topsrcdir)/config/rules.mk
WINDOWS_BRANDING_FILES = \
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \
firefox.ico \
document.ico \
branding.nsi \
@ -36,39 +37,35 @@ WINDOWS_BRANDING_FILES = \
newtab.ico \
pbmode.ico \
$(NULL)
endif
OSX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
BRANDING_FILES := \
background.png \
firefox.icns \
disk.icns \
document.icns \
dsstore \
$(NULL)
endif
LINUX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
BRANDING_FILES := \
default16.png \
default32.png \
default48.png \
mozicon128.png \
$(NULL)
endif
OS2_BRANDING_FILES = \
ifeq ($(OS_ARCH),OS2)
BRANDING_FILES := \
firefox-os2.ico \
document-os2.ico \
$(NULL)
endif
export::
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
cp $(addprefix $(srcdir)/, $(WINDOWS_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
cp $(addprefix $(srcdir)/, $(OSX_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
$(NSINSTALL) -D $(DIST)/install
endif
ifeq ($(OS_ARCH),OS2)
cp $(addprefix $(srcdir)/, $(OS2_BRANDING_FILES)) $(DIST)/branding/
endif
BRANDING_DEST := $(DIST)/branding
INSTALL_TARGETS += BRANDING
include $(topsrcdir)/config/rules.mk

7
browser/branding/official/content/Makefile.in
View File

@ -12,4 +12,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

BIN
browser/branding/official/content/VisualElements_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
browser/branding/official/content/VisualElements_smalllogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
browser/branding/official/content/VisualElements_splashscreen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 KiB

39
browser/branding/unofficial/Makefile.in
View File

@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
DIRS = \
content \
@ -16,9 +17,9 @@ DIRS = \
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
include $(topsrcdir)/config/rules.mk
WINDOWS_BRANDING_FILES = \
# On Windows only do this step for browser, skip for metro.
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
BRANDING_FILES := \
firefox.ico \
document.ico \
branding.nsi \
@ -36,39 +37,35 @@ WINDOWS_BRANDING_FILES = \
newtab.ico \
pbmode.ico \
$(NULL)
endif
OSX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
BRANDING_FILES := \
background.png \
firefox.icns \
disk.icns \
document.icns \
dsstore \
$(NULL)
endif
LINUX_BRANDING_FILES = \
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
BRANDING_FILES := \
default16.png \
default32.png \
default48.png \
mozicon128.png \
$(NULL)
endif
OS2_BRANDING_FILES = \
ifeq ($(OS_ARCH),OS2)
BRANDING_FILES := \
firefox-os2.ico \
document-os2.ico \
$(NULL)
endif
export::
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
cp $(addprefix $(srcdir)/, $(WINDOWS_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
cp $(addprefix $(srcdir)/, $(OSX_BRANDING_FILES)) $(DIST)/branding/
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
$(NSINSTALL) -D $(DIST)/install
endif
ifeq ($(OS_ARCH),OS2)
cp $(addprefix $(srcdir)/, $(OS2_BRANDING_FILES)) $(DIST)/branding/
endif
BRANDING_DEST := $(DIST)/branding
INSTALL_TARGETS += BRANDING
include $(topsrcdir)/config/rules.mk

7
browser/branding/unofficial/content/Makefile.in
View File

@ -12,4 +12,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

BIN
browser/branding/unofficial/content/VisualElements_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
browser/branding/unofficial/content/VisualElements_smalllogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
browser/branding/unofficial/content/VisualElements_splashscreen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 KiB