зеркало из https://github.com/mozilla/pjs.git
Bug 374235 - Breakpad should replace Talkback in future versions of Sunbird; r=ted.mielczarek, r=robert.bugzilla
This commit is contained in:
daniel.boelzle%sun.com
Родитель
c9f870ba8c
Коммит
49ef39b08b
|
|
@ -77,9 +77,11 @@ MOZ_NONLOCALIZED_PKG_LIST = \
|
|||
|
||||
MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
|
||||
|
||||
ifdef MOZILLA_1_8_BRANCH
|
||||
MOZ_OPTIONAL_PKG_LIST = \
|
||||
talkback \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
DEFINES += -DAB_CD=$(AB_CD)
|
||||
|
||||
|
|
|
|||
|
|
@ -284,3 +284,66 @@ components/autocomplete.xpt
|
|||
extensions/inspector@mozilla.org/components/inspector.xpt
|
||||
extensions/inspector@mozilla.org/components/@DLL_PREFIX@inspector@DLL_SUFFIX@
|
||||
uninstall/UninstallSunbird.exe
|
||||
#
|
||||
#ifndef MOZILLA_1_8_BRANCH
|
||||
#
|
||||
# Clean out obsolete Talkback files
|
||||
#
|
||||
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
|
||||
#
|
||||
#endif
|
||||
#
|
||||
|
|
|
|||
|
|
@ -45,6 +45,3 @@
|
|||
!define URLInfoAbout "http://www.mozilla.org/"
|
||||
!define URLUpdateInfo "http://www.mozilla.org/projects/calendar/sunbird/"
|
||||
!define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Sunbird/${AppVersion}/${AB_CD}/exit.html"
|
||||
|
||||
# Percentage of new "Standard" installs to enable talkback for
|
||||
!define RandomPercent "100"
|
||||
|
|
|
|||
|
|
@ -207,23 +207,7 @@ Section "-Application" Section1
|
|||
ClearErrors
|
||||
${EndIf}
|
||||
|
||||
; For a "Standard" upgrade without talkback installed add the InstallDisabled
|
||||
; 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
|
||||
|
|
@ -232,13 +216,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
|
||||
|
|
@ -337,7 +314,6 @@ Section "-Application" Section1
|
|||
Call DoCopyFiles
|
||||
|
||||
${If} $InstallType != 4
|
||||
Call installTalkback
|
||||
${If} ${FileExists} "$INSTDIR\extensions\inspector@mozilla.org"
|
||||
Call installInspector
|
||||
${EndIf}
|
||||
|
|
@ -477,10 +453,6 @@ Section /o "Developer Tools" Section2
|
|||
Call installInspector
|
||||
SectionEnd
|
||||
|
||||
Section /o "Quality Feedback Agent" Section3
|
||||
Call installTalkback
|
||||
SectionEnd
|
||||
|
||||
################################################################################
|
||||
# Helper Functions
|
||||
|
||||
|
|
@ -498,43 +470,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 "$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
|
||||
|
||||
; Adds a section divider to the human readable log.
|
||||
Function WriteLogSeparator
|
||||
FileWrite $fhInstallLog "$\r$\n-------------------------------------------------------------------------------$\r$\n"
|
||||
|
|
@ -779,28 +714,10 @@ Function preComponents
|
|||
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"
|
||||
; State will be 1 for checked and 0 for unchecked so we can use that to set
|
||||
; the section flags for installation.
|
||||
SectionSetFlags 1 $R0
|
||||
IntOp $R1 $R1 + 1
|
||||
${Else}
|
||||
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}
|
||||
${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field 2" "State"
|
||||
; State will be 1 for checked and 0 for unchecked so we can use that to set
|
||||
; the section flags for installation.
|
||||
SectionSetFlags ${Section2} $R0
|
||||
FunctionEnd
|
||||
|
||||
Function preDirectory
|
||||
|
|
@ -1016,15 +933,4 @@ Function .onInit
|
|||
; Hide DOMi in the components page if it isn't available.
|
||||
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}
|
||||
FunctionEnd
|
||||
|
|
|
|||
|
|
@ -79,6 +79,9 @@ bin\components\content_xmldoc.xpt
|
|||
bin\components\content_xslt.xpt
|
||||
bin\components\content_xtf.xpt
|
||||
bin\components\cookie.xpt
|
||||
#ifndef MOZILLA_1_8_BRANCH
|
||||
bin\components\crashreporter.xpt
|
||||
#endif
|
||||
bin\components\docshell_base.xpt
|
||||
bin\components\dom.xpt
|
||||
bin\components\dom_base.xpt
|
||||
|
|
@ -338,6 +341,13 @@ bin\chrome\pippki.manifest
|
|||
;
|
||||
bin\updater.exe
|
||||
|
||||
#ifndef MOZILLA_1_8_BRANCH
|
||||
; [Crash Reporter]
|
||||
bin\crashreporter.exe
|
||||
bin\crashreporter.ini
|
||||
#endif
|
||||
|
||||
#ifdef MOZILLA_1_8_BRANCH
|
||||
[talkback]
|
||||
bin\extensions\talkback@mozilla.org\install.rdf
|
||||
bin\extensions\talkback@mozilla.org\chrome.manifest
|
||||
|
|
@ -350,3 +360,4 @@ 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
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -210,6 +210,10 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef MOZILLA_OFFICIAL
|
||||
DEFINES += -DMOZILLA_OFFICIAL
|
||||
endif
|
||||
|
||||
DEFINES += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\"
|
||||
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
|
|
|
|||
|
|
@ -53,3 +53,8 @@ MaxVersion=@GRE_MILESTONE@
|
|||
EnableProfileMigrator=1
|
||||
EnableExtensionManager=1
|
||||
|
||||
[Crash Reporter]
|
||||
#if MOZILLA_OFFICIAL
|
||||
Enabled=1
|
||||
#endif
|
||||
ServerURL=https://crash-reports.mozilla.com/submit
|
||||
|
|
|
|||
|
|
@ -45,6 +45,3 @@
|
|||
!define URLInfoAbout "http://www.mozilla.org/"
|
||||
!define URLUpdateInfo "http://www.mozilla.org/projects/calendar/sunbird/"
|
||||
!define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Sunbird/${AppVersion}/${AB_CD}/exit.html"
|
||||
|
||||
# Percentage of new "Standard" installs to enable talkback for
|
||||
!define RandomPercent "100"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче