This is just a followup from bug 339185 to make sure that the RandomPercent is changed back to "10" from "75". It would be bad to leave this at "75" for release. :)

Benjamin, if it is safe to rely on MOZILLA_OFFICIAL for official releases this seems like a better way to go.

Comment on attachment 223890 [details] [diff] [review] check MOZILLA_OFFICIAL during preprocessing The tboxen always build with MOZILLA_OFFICIAL.

How about MOZ_BRANDING_DIRECTORY?

Shouldn't nightly be ~100%, beta ~75% and release ~10%? Bug 333656 changed the trunk percentage.

Comment on attachment 224030 [details] [diff] [review] check MOZ_BRANDING_DIRECTORY for Firefox We should really just include a file from the branding directory which contains these variables: #include @MOZ_BRANDING_DIRECTORY@/defines.nsi.in Would you like me to make that patch?

That sounds good and I'd appreciate a patch. Thanks!

Comment on attachment 226913 [details] [diff] [review] patch for 1.8.1 branch >+# 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" Couple of things here. For release builds, the above URLs are incorrect. www.mozilla.com needs to be used for all release stuff. I'm not sure what exactly URLInfoAbout and URLUpdateInfo are referring to, so I can't say specific URLs. The main Firefox page is http://www.mozilla.com/firefox/ now. >+# NSIS defines for nightly builds. >+# The release build branding.nsi is located in other-license/branding/firefox/ >+!define BrandShortName "Bon Echo" >+!define BrandFullName "Bon Echo" >+!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" URLUpdateInfo should probably be http://www.mozilla.org/projects/bonecho/ here. In both cases, should CompanyName be changed to "Mozilla Corporation" (or at least for release builds)?

Comment on attachment 226912 [details] [diff] [review] patch for trunk >+# 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" Same issues here as in 1.8 patch. >+# 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" URLUpdateInfo should probably be http://www.mozilla.org/projects/minefield/ here. See 1.8 comment for other stuff.

Thanks reed. There is discussion of the url format in bug 340629. I'll be discussing the format for several of these values and which values should be in the branding.nsi file next week.

URLs still wrong in both patches. See comment #9 and comment #10.

The urls are the same as the ones used by the 1.5 xpinstall based installer which is why I used them with the NSIS installer. They will be changed after I get a verbal ok to do so which will be well before the release of 2.0

Filed bug 343203 for the separate url issue.

this will be pointed at Firefox2 RC1 when that milestone exists

(In reply to comment #17) > this will be pointed at Firefox2 RC1 when that milestone exists The urls that should be displayed in the Add or Remove Programs - More Information window should be decided upon / modified in bug 343203

Comment on attachment 227513 [details] [diff] [review] trunk patch r=sspitzer

Comment on attachment 227514 [details] [diff] [review] branch patch r=sspitzer

Comment on attachment 227514 [details] [diff] [review] branch patch a=drivers as soon as the patch has landed on trunk and cycled through one Windows w/installer build with no bustage, and assuming :rs finds no obvious flaws in a smoketest.

Comment on attachment 227514 [details] [diff] [review] branch patch Ahem. Once again, a=drivers, provided steps in previous comment are followed.

Checked in to trunk. We are going to still need to change the talkback random percent for release since we are using this patch to simplify the process for beta releases so I am leaving this open.

Changed the talkback percentage to 75% to match what we have for nightly builds for beta 1.

I am resolving this as fixed. This will just be one of many steps needed for the official release and doesn't require an individual bug for this one step.

Changing summary to reflect what this bug actually provided.