Bug 339734 - Change RandomPercent for Talkback from 75 to 10 before Firefox 2 release. r=sspitzer

browser/installer/windows/Makefile.in

@@ -60,6 +60,7 @@ INSTALLER_FILES = \
 	$(NULL)
 
 BRANDING_FILES = \
+	branding.nsi \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
@@ -105,6 +106,7 @@ 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)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
 	cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
 	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp

browser/installer/windows/nsis/branding.nsi

@@ -0,0 +1,47 @@
+# ***** 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 Installer code.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  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 *****
+
+# NSIS defines for nightly builds.
+# The release build branding.nsi is located in other-license/branding/firefox/
+!define BrandShortName        "Minefield"
+!define BrandFullName         "Minefield"
+!define CompanyName           "Mozilla"
+!define URLInfoAbout          "http://www.mozilla.org/"
+!define URLUpdateInfo         "http://www.mozilla.org/products/firefox/"
+!define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}%20(${AB_CD})/exit.html"
+
+# Percentage of new "Standard" installs to enable talkback for
+!define RandomPercent         "75"

browser/installer/windows/nsis/defines.nsi.in

@@ -6,14 +6,5 @@
 !define FileInstallerMSI      "@PKG_BASENAME@.installer.msi"
 !define FileInstallerNETRoot  "@PKG_BASENAME@.net-installer"
 
-!define BrandShortName        "Minefield"
-!define BrandFullName         "Minefield"
 !define FileMainEXE           "firefox.exe"
-!define CompanyName           "Mozilla"
-!define URLInfoAbout          "http://www.mozilla.org/"
-!define URLUpdateInfo         "http://www.mozilla.org/products/firefox/"
 !define WindowClass           "FirefoxMessageWindow"
-!define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}%20(${AB_CD})/exit.html"
-# Percentage of new "Standard" installs to enable talkback for
-# Change me for release builds!
-!define RandomPercent         "75"

browser/installer/windows/nsis/installer.nsi

@@ -85,6 +85,7 @@ Var AddDesktopSC
 Var fhInstallLog
 Var fhUninstallLog
 
+!include branding.nsi
 !include defines.nsi
 !include SetProgramAccess.nsi
 !include common.nsh

other-licenses/branding/firefox/Makefile.in

@@ -47,6 +47,7 @@ ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/firefox.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)/wizHeader.bmp    $(DIST)/branding/wizHeader.bmp
 	cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
 	cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp

other-licenses/branding/firefox/branding.nsi

@@ -0,0 +1,47 @@
+# ***** 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 Installer code.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  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 *****
+
+# NSIS defines for release builds.
+# The nightly build branding.nsi is located in browser/installer/windows/nsis/
+!define BrandShortName        "Firefox"
+!define BrandFullName         "Mozilla Firefox"
+!define CompanyName           "Mozilla"
+!define URLInfoAbout          "http://www.mozilla.org/"
+!define URLUpdateInfo         "http://www.mozilla.org/products/firefox/"
+!define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}%20(${AB_CD})/exit.html"
+
+# Percentage of new "Standard" installs to enable talkback for
+!define RandomPercent         "10"