From 32e9aa4b105587e5819d95e3177470f80c2d8b24 Mon Sep 17 00:00:00 2001 From: Saint Wesonga Date: Mon, 24 May 2010 11:38:31 +0200 Subject: [PATCH] Bug 524201 - Move browserconfig.properties to a jar. r=gavin/pike/kev --- browser/app/profile/firefox.js | 2 +- browser/base/content/browser.js | 2 +- browser/branding/nightly/locales/Makefile.in | 8 -------- browser/branding/nightly/locales/jar.mn | 1 + browser/branding/unofficial/locales/Makefile.in | 8 -------- browser/branding/unofficial/locales/jar.mn | 1 + browser/installer/package-manifest.in | 1 - browser/installer/removed-files.in | 1 + other-licenses/branding/firefox/locales/Makefile.in | 8 -------- other-licenses/branding/firefox/locales/jar.mn | 1 + .../sisyphus/tests/mozilla.org/download-page/userhook.js | 2 +- 11 files changed, 7 insertions(+), 28 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index b75e166ada8..8900f30835c 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -181,7 +181,7 @@ pref("browser.shell.checkDefaultBrowser", true); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore pref("browser.startup.page", 1); -pref("browser.startup.homepage", "resource:/browserconfig.properties"); +pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); pref("browser.enable_automatic_image_resizing", true); pref("browser.chrome.site_icons", true); diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index a796bdce676..cefd55cde3a 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -4775,7 +4775,7 @@ var gHomeButton = { // use this if we can't find the pref if (!url) { var SBS = Cc["@mozilla.org/intl/stringbundle;1"].getService(Ci.nsIStringBundleService); - var configBundle = SBS.createBundle("resource:/browserconfig.properties"); + var configBundle = SBS.createBundle("chrome://branding/locale/browserconfig.properties"); url = configBundle.GetStringFromName(this.prefDomain); } diff --git a/browser/branding/nightly/locales/Makefile.in b/browser/branding/nightly/locales/Makefile.in index 128825e7509..5c1e74a6808 100644 --- a/browser/branding/nightly/locales/Makefile.in +++ b/browser/branding/nightly/locales/Makefile.in @@ -45,11 +45,3 @@ include $(DEPTH)/config/autoconf.mk DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) include $(topsrcdir)/config/rules.mk - -libs:: - @$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(FINAL_TARGET)/browserconfig.properties - -install:: - @$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties diff --git a/browser/branding/nightly/locales/jar.mn b/browser/branding/nightly/locales/jar.mn index de3d979b775..a5e4afc924a 100644 --- a/browser/branding/nightly/locales/jar.mn +++ b/browser/branding/nightly/locales/jar.mn @@ -5,3 +5,4 @@ # Nightly branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) * locale/branding/brand.properties (en-US/brand.properties) +* locale/branding/browserconfig.properties (browserconfig.properties) diff --git a/browser/branding/unofficial/locales/Makefile.in b/browser/branding/unofficial/locales/Makefile.in index a31208e198a..6e5720ab66d 100644 --- a/browser/branding/unofficial/locales/Makefile.in +++ b/browser/branding/unofficial/locales/Makefile.in @@ -45,11 +45,3 @@ include $(DEPTH)/config/autoconf.mk DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) include $(topsrcdir)/config/rules.mk - -libs:: - @$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(FINAL_TARGET)/browserconfig.properties - -install:: - @$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties diff --git a/browser/branding/unofficial/locales/jar.mn b/browser/branding/unofficial/locales/jar.mn index 077b5508220..409a51e26a2 100644 --- a/browser/branding/unofficial/locales/jar.mn +++ b/browser/branding/unofficial/locales/jar.mn @@ -5,3 +5,4 @@ # Unofficial branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) * locale/branding/brand.properties (en-US/brand.properties) +* locale/branding/browserconfig.properties (browserconfig.properties) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 26662c03a7f..b8cf663e67d 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -22,7 +22,6 @@ @BINPATH@/chrome/@AB_CD@.jar @BINPATH@/chrome/@AB_CD@.manifest @BINPATH@/@PREF_DIR@/firefox-l10n.js -@BINPATH@/browserconfig.properties @BINPATH@/searchplugins/* @BINPATH@/defaults/profile/bookmarks.html @BINPATH@/defaults/profile/localstore.rdf diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 0ceee3504e9..6fe4a054e20 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -10,6 +10,7 @@ @DLL_PREFIX@xpistub@DLL_SUFFIX@ @DLL_PREFIX@zlib@DLL_SUFFIX@ LICENSE +browserconfig.properties chrome.manifest chrome/US.jar chrome/app-chrome.manifest diff --git a/other-licenses/branding/firefox/locales/Makefile.in b/other-licenses/branding/firefox/locales/Makefile.in index c46996f7f6d..3bf3197eab0 100644 --- a/other-licenses/branding/firefox/locales/Makefile.in +++ b/other-licenses/branding/firefox/locales/Makefile.in @@ -45,11 +45,3 @@ include $(DEPTH)/config/autoconf.mk DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) include $(topsrcdir)/config/rules.mk - -libs:: - @$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(FINAL_TARGET)/browserconfig.properties - -install:: - @$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ - $(srcdir)/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties diff --git a/other-licenses/branding/firefox/locales/jar.mn b/other-licenses/branding/firefox/locales/jar.mn index 0ba09759c1a..3122f2bb8e5 100644 --- a/other-licenses/branding/firefox/locales/jar.mn +++ b/other-licenses/branding/firefox/locales/jar.mn @@ -4,3 +4,4 @@ % locale branding @AB_CD@ %locale/branding/ locale/branding/brand.dtd (%brand.dtd) * locale/branding/brand.properties (%brand.properties) +* locale/branding/browserconfig.properties (browserconfig.properties) diff --git a/testing/sisyphus/tests/mozilla.org/download-page/userhook.js b/testing/sisyphus/tests/mozilla.org/download-page/userhook.js index 847f1cb743e..56b47d76f46 100644 --- a/testing/sisyphus/tests/mozilla.org/download-page/userhook.js +++ b/testing/sisyphus/tests/mozilla.org/download-page/userhook.js @@ -8,7 +8,7 @@ function userOnStart() loadBundle('chrome://browser-region/locale/region.properties'); loadBundle('chrome://branding/content/searchconfig.properties'); - loadBundle('resource:/browserconfig.properties'); + loadBundle('chrome://branding/locale/browserconfig.properties'); }