Bug 381099 - Turn on breakpad by default for win+mac builds, r=luser
authorbenjamin@smedbergs.us
Fri, 25 May 2007 15:09:29 -0700
changeset 1873 6a410abefb6653efda63efa485a315e2e8e790b0
parent 1872 8233d463091b38534fd3bb6ea314d21c589a05a0
child 1874 66cfaa189b9b990aac5e8f72ddb97de4fc9bc778
push idunknown
push userunknown
push dateunknown
reviewersluser
bugs381099
milestone1.9a5pre
Bug 381099 - Turn on breakpad by default for win+mac builds, r=luser
browser/app/Makefile.in
browser/app/nsBrowserApp.cpp
browser/branding/unofficial/branding.nsi
browser/installer/removed-files.in
browser/installer/windows/nsis/branding.nsi
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -213,16 +213,20 @@ RCFLAGS += -DDEBUG
 endif
 RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
 
+ifdef MOZILLA_OFFICIAL
+DEFINES += -DMOZILLA_OFFICIAL
+endif
+
 ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
 
 DEFINES += -DIMPL_XREAPI
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 ifdef BUILD_STATIC_LIBS
--- a/browser/app/nsBrowserApp.cpp
+++ b/browser/app/nsBrowserApp.cpp
@@ -48,17 +48,21 @@ static const nsXREAppData kAppData = {
   nsnull,
   "Mozilla",
   "Firefox",
   NS_STRINGIFY(APP_VERSION),
   NS_STRINGIFY(BUILD_ID),
   "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}",
   "Copyright (c) 1998 - 2007 mozilla.org",
   NS_XRE_ENABLE_PROFILE_MIGRATOR |
-  NS_XRE_ENABLE_EXTENSION_MANAGER,
+  NS_XRE_ENABLE_EXTENSION_MANAGER
+#if defined(MOZILLA_OFFICIAL) && (defined(XP_WIN) || defined(XP_MACOSX))
+  | NS_XRE_ENABLE_CRASH_REPORTER
+#endif
+,
   nsnull, // xreDirectory
   nsnull, // minVersion
   nsnull, // maxVersion
   "https://crash-reports.mozilla.com/submit"
 };
 
 int main(int argc, char* argv[])
 {
--- a/browser/branding/unofficial/branding.nsi
+++ b/browser/branding/unofficial/branding.nsi
@@ -42,9 +42,9 @@
 # should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
 !define BrandFullNameInternal "Gran Paradiso"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "http://www.mozilla.org"
 !define URLUpdateInfo         "http://www.mozilla.org/projects/firefox"
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
 
 # Percentage of new "Standard" installs to enable talkback for
-!define RandomPercent         "100"
+!define RandomPercent         "50"
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -443,8 +443,46 @@ searchplugins/yahoo-tw.gif
 searchplugins/yandex.src
 searchplugins/yandex.png
 searchplugins/yandex.gif
 searchplugins/zoznam-sk.src
 searchplugins/zoznam-sk.png
 searchplugins/zoznam-sk.gif
 components/sidebar.xpt
 components/xmlextras.xpt
+#ifdef XP_MACOSX
+extensions/talkback@mozilla.org/install.rdf
+extensions/talkback@mozilla.org/chrome.manifest
+extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@
+extensions/talkback@mozilla.org/components/qfaservices.xpt
+extensions/talkback@mozilla.org/components/talkback/master.ini
+extensions/talkback@mozilla.org/components/talkback/talkback@DLL_SUFFIX@
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Info.plist
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/MacOS/Talkback
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/pbdevelopment.plist
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/PkgInfo
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/delete.tiff
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/disable.tiff
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/enable.tiff
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/classes.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/info.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/objects.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/InfoPlist.strings
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/classes.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/info.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/objects.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/Localizable.strings
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/classes.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/info.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/objects.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/classes.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/info.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/objects.nib
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoKeys.plist
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoSections.plist
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/send.tiff
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_ascending.tiff
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_descending.tiff
+extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/Talkback.icns
+#endif
--- a/browser/installer/windows/nsis/branding.nsi
+++ b/browser/installer/windows/nsis/branding.nsi
@@ -42,9 +42,9 @@
 # should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
 !define BrandFullNameInternal "Minefield"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "http://www.mozilla.org"
 !define URLUpdateInfo         "http://www.mozilla.org/projects/firefox"
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
 
 # Percentage of new "Standard" installs to enable talkback for
-!define RandomPercent         "100"
+!define RandomPercent         "50"