Bug 524201 - Move browserconfig.properties to a jar. r=gavin/pike/kev

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);

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);
     }
 

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

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)

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

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)

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

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

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

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)

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');
 
 }