Bug 561032 - Move Firefox branding into browser/branding/official. r=gavin,r=pike
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 13 Apr 2011 09:58:13 +0200
changeset 68291 afc62991f24c05790276764185f83883a47647e8
parent 68290 11e43d2407d97ccd0c1d2ca00c1e7fbb13023722
child 68292 ad5009233ae9cc61b65edf43b052e39c55cbe66d
push id76
push userbzbarsky@mozilla.com
push dateTue, 05 Jul 2011 17:00:57 +0000
treeherdermozilla-beta@d3a2732c35f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, pike
bugs561032
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 561032 - Move Firefox branding into browser/branding/official. r=gavin,r=pike
browser/branding/official/LICENSE
browser/branding/official/Makefile.in
browser/branding/official/background.png
browser/branding/official/branding.nsi
browser/branding/official/configure.sh
browser/branding/official/content/Makefile.in
browser/branding/official/content/about-logo.png
browser/branding/official/content/about-wordmark.png
browser/branding/official/content/about.png
browser/branding/official/content/icon48.png
browser/branding/official/content/icon64.png
browser/branding/official/content/jar.mn
browser/branding/official/default16.png
browser/branding/official/default22.png
browser/branding/official/default24.png
browser/branding/official/default256.png
browser/branding/official/default32.png
browser/branding/official/default48.png
browser/branding/official/disk.icns
browser/branding/official/document-os2.ico
browser/branding/official/document.icns
browser/branding/official/document.ico
browser/branding/official/document.png
browser/branding/official/dsstore
browser/branding/official/firefox-os2.ico
browser/branding/official/firefox.icns
browser/branding/official/firefox.ico
browser/branding/official/locales/Makefile.in
browser/branding/official/locales/browserconfig.properties
browser/branding/official/locales/en-US/brand.dtd
browser/branding/official/locales/en-US/brand.properties
browser/branding/official/locales/jar.mn
browser/branding/official/mozicon128.png
browser/branding/official/pref/firefox-branding.js
browser/branding/official/splash.bmp
browser/branding/official/wizHeader.bmp
browser/branding/official/wizHeaderRTL.bmp
browser/branding/official/wizWatermark.bmp
browser/confvars.sh
browser/locales/filter.py
browser/locales/l10n.ini
other-licenses/branding/firefox/LICENSE
other-licenses/branding/firefox/Makefile.in
other-licenses/branding/firefox/background.png
other-licenses/branding/firefox/branding.nsi
other-licenses/branding/firefox/configure.sh
other-licenses/branding/firefox/content/Makefile.in
other-licenses/branding/firefox/content/about-logo.png
other-licenses/branding/firefox/content/about-wordmark.png
other-licenses/branding/firefox/content/about.png
other-licenses/branding/firefox/content/icon48.png
other-licenses/branding/firefox/content/icon64.png
other-licenses/branding/firefox/content/jar.mn
other-licenses/branding/firefox/default16.png
other-licenses/branding/firefox/default22.png
other-licenses/branding/firefox/default24.png
other-licenses/branding/firefox/default256.png
other-licenses/branding/firefox/default32.png
other-licenses/branding/firefox/default48.png
other-licenses/branding/firefox/disk.icns
other-licenses/branding/firefox/document-os2.ico
other-licenses/branding/firefox/document.icns
other-licenses/branding/firefox/document.ico
other-licenses/branding/firefox/document.png
other-licenses/branding/firefox/dsstore
other-licenses/branding/firefox/firefox-os2.ico
other-licenses/branding/firefox/firefox.icns
other-licenses/branding/firefox/firefox.ico
other-licenses/branding/firefox/locales/Makefile.in
other-licenses/branding/firefox/locales/browserconfig.properties
other-licenses/branding/firefox/locales/en-US/brand.dtd
other-licenses/branding/firefox/locales/en-US/brand.properties
other-licenses/branding/firefox/locales/jar.mn
other-licenses/branding/firefox/mozicon128.png
other-licenses/branding/firefox/pref/firefox-branding.js
other-licenses/branding/firefox/splash.bmp
other-licenses/branding/firefox/wizHeader.bmp
other-licenses/branding/firefox/wizHeaderRTL.bmp
other-licenses/branding/firefox/wizWatermark.bmp
rename from other-licenses/branding/firefox/LICENSE
rename to browser/branding/official/LICENSE
rename from other-licenses/branding/firefox/Makefile.in
rename to browser/branding/official/Makefile.in
rename from other-licenses/branding/firefox/background.png
rename to browser/branding/official/background.png
rename from other-licenses/branding/firefox/branding.nsi
rename to browser/branding/official/branding.nsi
rename from other-licenses/branding/firefox/configure.sh
rename to browser/branding/official/configure.sh
rename from other-licenses/branding/firefox/content/Makefile.in
rename to browser/branding/official/content/Makefile.in
rename from other-licenses/branding/firefox/content/about-logo.png
rename to browser/branding/official/content/about-logo.png
rename from other-licenses/branding/firefox/content/about-wordmark.png
rename to browser/branding/official/content/about-wordmark.png
rename from other-licenses/branding/firefox/content/about.png
rename to browser/branding/official/content/about.png
rename from other-licenses/branding/firefox/content/icon48.png
rename to browser/branding/official/content/icon48.png
rename from other-licenses/branding/firefox/content/icon64.png
rename to browser/branding/official/content/icon64.png
rename from other-licenses/branding/firefox/content/jar.mn
rename to browser/branding/official/content/jar.mn
rename from other-licenses/branding/firefox/default16.png
rename to browser/branding/official/default16.png
rename from other-licenses/branding/firefox/default22.png
rename to browser/branding/official/default22.png
rename from other-licenses/branding/firefox/default24.png
rename to browser/branding/official/default24.png
rename from other-licenses/branding/firefox/default256.png
rename to browser/branding/official/default256.png
rename from other-licenses/branding/firefox/default32.png
rename to browser/branding/official/default32.png
rename from other-licenses/branding/firefox/default48.png
rename to browser/branding/official/default48.png
rename from other-licenses/branding/firefox/disk.icns
rename to browser/branding/official/disk.icns
rename from other-licenses/branding/firefox/document-os2.ico
rename to browser/branding/official/document-os2.ico
rename from other-licenses/branding/firefox/document.icns
rename to browser/branding/official/document.icns
rename from other-licenses/branding/firefox/document.ico
rename to browser/branding/official/document.ico
rename from other-licenses/branding/firefox/document.png
rename to browser/branding/official/document.png
rename from other-licenses/branding/firefox/dsstore
rename to browser/branding/official/dsstore
rename from other-licenses/branding/firefox/firefox-os2.ico
rename to browser/branding/official/firefox-os2.ico
rename from other-licenses/branding/firefox/firefox.icns
rename to browser/branding/official/firefox.icns
rename from other-licenses/branding/firefox/firefox.ico
rename to browser/branding/official/firefox.ico
rename from other-licenses/branding/firefox/locales/Makefile.in
rename to browser/branding/official/locales/Makefile.in
--- a/other-licenses/branding/firefox/locales/Makefile.in
+++ b/browser/branding/official/locales/Makefile.in
@@ -33,15 +33,15 @@
 # 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/firefox/locales
+relativesrcdir = browser/branding/official/locales
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
rename from other-licenses/branding/firefox/locales/browserconfig.properties
rename to browser/branding/official/locales/browserconfig.properties
rename from other-licenses/branding/firefox/locales/en-US/brand.dtd
rename to browser/branding/official/locales/en-US/brand.dtd
rename from other-licenses/branding/firefox/locales/en-US/brand.properties
rename to browser/branding/official/locales/en-US/brand.properties
rename from other-licenses/branding/firefox/locales/jar.mn
rename to browser/branding/official/locales/jar.mn
rename from other-licenses/branding/firefox/mozicon128.png
rename to browser/branding/official/mozicon128.png
rename from other-licenses/branding/firefox/pref/firefox-branding.js
rename to browser/branding/official/pref/firefox-branding.js
rename from other-licenses/branding/firefox/splash.bmp
rename to browser/branding/official/splash.bmp
rename from other-licenses/branding/firefox/wizHeader.bmp
rename to browser/branding/official/wizHeader.bmp
rename from other-licenses/branding/firefox/wizHeaderRTL.bmp
rename to browser/branding/official/wizHeaderRTL.bmp
rename from other-licenses/branding/firefox/wizWatermark.bmp
rename to browser/branding/official/wizWatermark.bmp
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -46,9 +46,9 @@ MOZ_STATIC_BUILD_UNSUPPORTED=1
 # always enabled for form history
 MOZ_MORKREADER=1
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_SYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 MOZ_BRANDING_DIRECTORY=browser/branding/nightly
-MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/firefox
+MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -1,14 +1,15 @@
 def test(mod, path, entity = None):
   import re
   # ignore anyhting but Firefox
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "browser", "extensions/reporter", "extensions/spellcheck",
                  "other-licenses/branding/firefox",
+                 "browser/branding/official",
                  "services/sync"):
     return False
   if mod != "browser" and mod != "extensions/spellcheck":
     # we only have exceptions for browser and extensions/spellcheck
     return True
   if not entity:
     if mod == "extensions/spellcheck":
       return False
--- a/browser/locales/l10n.ini
+++ b/browser/locales/l10n.ini
@@ -1,16 +1,17 @@
 [general]
 depth = ../..
 all = browser/locales/all-locales
 
 [compare]
 dirs = browser
      extensions/reporter
      other-licenses/branding/firefox
+     browser/branding/official
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
 
 [extras]