Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #379396 --> enable breakpad support in thunderbird.

Browse Source 
r=ted
sr=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@229749 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2007-07-11 21:40:42 +00:00
parent 075b7713cb
commit d6af23f4fa
7 changed files with 62 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/mail/app/application.ini
View File

@@ -52,4 +52,7 @@ EnableProfileMigrator=1
EnableExtensionManager=1
[Crash Reporter]
#if MOZILLA_OFFICIAL
Enabled=1
#endif
ServerURL=https://crash-reports.mozilla.com/submit

4
mozilla/mail/installer/Makefile.in
View File

@@ -106,10 +106,6 @@ MOZ_NONLOCALIZED_PKG_LIST = \
MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
MOZ_OPTIONAL_PKG_LIST = \
talkback \
$(NULL)
DEFINES += -DAB_CD=$(AB_CD)
ifdef MOZ_PKG_MANIFEST_P

55
mozilla/mail/installer/removed-files.in
View File

@@ -226,3 +226,58 @@ components/myspell/en-US.dic
components/myspell/en-US.aff
regxpcom.exe
components/xmlextras.xpt
extensions/talkback@mozilla.org/
extensions/talkback@mozilla.org/install.rdf
extensions/talkback@mozilla.org/chrome.manifest
extensions/talkback@mozilla.org/components/qfaservices.xpt
extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@
#ifdef XP_WIN
extensions/talkback@mozilla.org/components/BrandRes.dll
extensions/talkback@mozilla.org/components/fullsoft.dll
extensions/talkback@mozilla.org/components/master.ini
extensions/talkback@mozilla.org/components/talkback-l10n.ini
extensions/talkback@mozilla.org/components/talkback.cnt
extensions/talkback@mozilla.org/components/talkback.exe
extensions/talkback@mozilla.org/components/talkback.hlp
extensions/talkback@mozilla.org/InstallDisabled
#else
#ifdef XP_MACOSX
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
#else
extensions/talkback@mozilla.org/components/talkback/talkback
extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
extensions/talkback@mozilla.org/components/master.ini
extensions/talkback@mozilla.org/components/talkback.so
#endif
#endif

2
mozilla/mail/installer/windows/nsis/branding.nsi
View File

@@ -46,5 +46,3 @@
!define URLUpdateInfo "http://www.mozilla.org/products/thunderbird/"
!define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Thunderbird/${AppVersion}/${AB_CD}/exit.html"
# Percentage of new "Standard" installs to enable talkback for
!define RandomPercent "100"

86
mozilla/mail/installer/windows/nsis/installer.nsi
View File

@@ -257,19 +257,7 @@ Section "-Application" Section1
; file to the talkback source files so it will be disabled by the extension
; manager. This is done at the start of the installation since we check for
; the existence of a directory to determine if this is an upgrade.
${If} $InstallType == 1
${AndIf} ${FileExists} "$INSTDIR\greprefs"
${AndIf} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org"
${Unless} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org"
${Unless} ${FileExists} "$INSTDIR\extensions"
CreateDirectory "$INSTDIR\extensions"
${EndUnless}
CreateDirectory "$INSTDIR\extensions\talkback@mozilla.org"
FileOpen $2 "$EXEDIR\optional\extensions\talkback@mozilla.org\InstallDisabled" w
FileWrite $2 "$\r$\n"
FileClose $2
${EndUnless}
${Else}
${If} $InstallType != 1
; Custom installs.
; If DOMi is installed and this install includes DOMi remove it from
; the installation directory. This will remove it if the user deselected
@@ -278,13 +266,6 @@ Section "-Application" Section1
${AndIf} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
RmDir /r "$INSTDIR\extensions\inspector@mozilla.org"
${EndIf}
; If TalkBack is installed and this install includes TalkBack remove it from
; the installation directory. This will remove it if the user deselected
; TalkBack on the components page.
${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org"
${AndIf} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org"
RmDir /r "$INSTDIR\extensions\talkback@mozilla.org"
${EndIf}
${EndIf}
Call CleanupOldLogs
@@ -383,7 +364,6 @@ Section "-Application" Section1
Call DoCopyFiles
${If} $InstallType != 4
Call installTalkback
${If} ${FileExists} "$INSTDIR\extensions\inspector@mozilla.org"
Call installInspector
${EndIf}
@@ -503,10 +483,6 @@ Section /o "Developer Tools" Section2
Call installInspector
SectionEnd
Section /o "Quality Feedback Agent" Section3
Call installTalkback
SectionEnd
################################################################################
# Helper Functions
@@ -524,43 +500,6 @@ Function installInspector
${EndIf}
FunctionEnd
Function installTalkback
StrCpy $R0 "$EXEDIR\optional\extensions\talkback@mozilla.org"
${If} ${FileExists} "$R0"
SetDetailsPrint textonly
DetailPrint $(STATUS_INSTALL_OPTIONAL)
SetDetailsPrint none
StrCpy $R1 "$INSTDIR\extensions\talkback@mozilla.org"
${If} ${FileExists} "$R1"
; If there is an existing InstallDisabled file copy it to the source dir.
; This will add it during install to the uninstall.log and retains the
; original disabled state from the installation.
${If} ${FileExists} "$R1\InstallDisabled"
CopyFiles /SILENT "$R1\InstallDisabled" "$R0"
${EndIf}
; Remove the existing install of talkback
RmDir /r "$R1"
${ElseIf} $InstallType == 1
; For standard installations only enable talkback for the x percent as
; defined by the application. We use QueryPerformanceCounter for the seed
; since it returns a 64bit integer which should improve the accuracy.
System::Call "kernel32::QueryPerformanceCounter(*l.r1)"
System::Int64Op $1 % 100
Pop $0
; The percentage provided by the application refers to the percentage to
; include so all numbers equal or greater than should be disabled.
${If} $0 >= ${RandomPercent}
FileOpen $2 "$R0\InstallDisabled" w
FileWrite $2 "$\r$\n"
FileClose $2
${EndIf}
${EndIf}
ClearErrors
${LogHeader} "Installing Quality Feedback Agent"
Call DoCopyFiles
${EndIf}
FunctionEnd
; Copies a file to a temporary backup directory and then checks if it is in use
; by attempting to delete the file. If the file is in use an error is displayed
; and the user is given the options to either retry or cancel. If cancel is
@@ -852,8 +791,6 @@ FunctionEnd
Function leaveComponents
; If DOMi exists then it will be Field 2.
; If DOMi doesn't exist and talkback exists then TalkBack will be Field 2 but
; if DOMi doesn't exist we won't display this page anyways.
StrCpy $R1 2
${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
@@ -865,14 +802,7 @@ Function leaveComponents
SectionSetFlags 1 0 ; Disable install for DOMi
${EndIf}
${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org"
${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
; State will be 1 for checked and 0 for unchecked so we can use that to set
; the section flags for installation.
SectionSetFlags 2 $R0
${Else}
SectionSetFlags 2 0 ; Disable install for TalkBack
${EndIf}
SectionSetFlags 2 0 ; Disable install of TalkBack
FunctionEnd
Function preDirectory
@@ -1112,14 +1042,6 @@ Function .onInit
SectionSetText 1 ""
${EndIf}
; Set the section size for Talkback only if it exists.
${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org"
${GetSize} "$EXEDIR\optional\extensions\talkback@mozilla.org" "/S=0K" $0 $8 $9
SectionSetSize 2 $0
; Install Talkback by default.
SectionSetFlags 2 1
${Else}
; Hide Talkback in the components page if it isn't available.
SectionSetText 2 ""
${EndIf}
; Hide Talkback in the components page
SectionSetText 2 ""
FunctionEnd

14
mozilla/mail/installer/windows/packages-static
View File

@@ -46,20 +46,6 @@ bin\chrome\newsblog.jar
bin\chrome\newsblog.manifest
bin\components\newsblog.js
; Optional Talkback
[talkback]
bin\extensions\talkback@mozilla.org\install.rdf
bin\extensions\talkback@mozilla.org\chrome.manifest
bin\extensions\talkback@mozilla.org\components\qfaservices.dll
bin\extensions\talkback@mozilla.org\components\qfaservices.xpt
bin\extensions\talkback@mozilla.org\components\BrandRes.dll
bin\extensions\talkback@mozilla.org\components\fullsoft.dll
bin\extensions\talkback@mozilla.org\components\master.ini
bin\extensions\talkback@mozilla.org\components\talkback-l10n.ini
bin\extensions\talkback@mozilla.org\components\talkback.cnt
bin\extensions\talkback@mozilla.org\components\talkback.exe
bin\extensions\talkback@mozilla.org\components\talkback.hlp
[mail]
bin\xpicleanup.exe

2
mozilla/other-licenses/branding/thunderbird/branding.nsi
View File

@@ -46,5 +46,3 @@
!define URLUpdateInfo "http://www.mozilla.org/products/thunderbird/"
!define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Thunderbird/${AppVersion}/${AB_CD}/exit.html"
# Percentage of new "Standard" installs to enable talkback for
!define RandomPercent "100"