Bug 495232 Drop support for the Palm Sync Extension. suite/ part. r=mcsmurf
This commit is contained in:
Mark Banner
Родитель
674834c3e8
Коммит
d963439ff8
|
|
@ -77,7 +77,6 @@ MOZ_OPTIONAL_PKG_LIST = \
|
|||
chatzilla \
|
||||
debugqa \
|
||||
inspector \
|
||||
palmsync \
|
||||
venkman \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -116,6 +116,15 @@ xpicleanup
|
|||
res/broken-image.gif
|
||||
res/loading-image.gif
|
||||
#endif
|
||||
#ifdef XP_WIN
|
||||
extensions/p@m/install.rdf
|
||||
extensions/p@m/mozABConduit.dll
|
||||
extensions/p@m/PalmSyncInstall.exe
|
||||
extensions/p@m/PalmSyncProxy.dll
|
||||
extensions/p@m/components/palmsync.dll
|
||||
extensions/p@m/components/palmsync.xpt
|
||||
extensions/p@m/defaults/preferences/palmsync.js
|
||||
#endif
|
||||
#ifdef MOZ_STATIC_BUILD
|
||||
components/@DLL_PREFIX@accessibility@DLL_SUFFIX@
|
||||
components/@DLL_PREFIX@appcomps@DLL_SUFFIX@
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
${Unless} ${FileExists} "$EXEDIR\optional\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
|
||||
${AndUnless} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
|
||||
${AndUnless} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org"
|
||||
${AndUnless} ${FileExists} "$EXEDIR\optional\extensions\p@m"
|
||||
${AndUnless} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
|
||||
Abort
|
||||
${EndUnless}
|
||||
|
|
@ -124,25 +123,6 @@
|
|||
SectionSetText ${DEBUG_IDX} ""
|
||||
${EndIf}
|
||||
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\p@m"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type "checkbox"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text "$(PALMSYNC_TITLE)"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left "15"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right "-1"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top "$R2"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State "1"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags "GROUP"
|
||||
${GetSize} "$EXEDIR\optional\extensions\p@m" "/S=0K" $0 $8 $9
|
||||
SectionSetSize ${PALM_IDX} $0
|
||||
IntOp $R1 $R1 + 1
|
||||
IntOp $R2 $R2 + $R4
|
||||
IntOp $R3 $R3 + $R4
|
||||
${Else}
|
||||
; Hide Palm Sync in the components page if it isn't available.
|
||||
SectionSetText ${PALM_IDX} ""
|
||||
${EndIf}
|
||||
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type "checkbox"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text "$(VENKMAN_TITLE)"
|
||||
|
|
@ -208,18 +188,6 @@
|
|||
IntOp $R3 $R3 + $R4
|
||||
${EndIf}
|
||||
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\p@m"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type "label"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text "$(PALMSYNC_TEXT)"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left "30"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right "-1"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top "$R2"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
|
||||
IntOp $R1 $R1 + 1
|
||||
IntOp $R2 $R2 + $R4
|
||||
IntOp $R3 $R3 + $R4
|
||||
${EndIf}
|
||||
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type "label"
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text "$(VENKMAN_TEXT)"
|
||||
|
|
|
|||
|
|
@ -249,14 +249,6 @@ Section "-InstallStartCleanup"
|
|||
RmDir /r "$INSTDIR\extensions\debugQA@mozilla.org"
|
||||
${EndIf}
|
||||
|
||||
; If PalmSync is installed and this install includes PalmSync remove it
|
||||
; from the installation directory. This will remove it if the user
|
||||
; deselected PalmSync on the components page.
|
||||
${If} ${FileExists} "$INSTDIR\extensions\p@m"
|
||||
${AndIf} ${FileExists} "$EXEDIR\optional\extensions\p@m"
|
||||
RmDir /r "$INSTDIR\extensions\p@m"
|
||||
${EndIf}
|
||||
|
||||
; If Venkman is installed and this install includes Venkman remove it
|
||||
; from the installation directory. This will remove it if the user
|
||||
; deselected Venkman on the components page.
|
||||
|
|
@ -547,22 +539,6 @@ Section /o "Debug and QA Tools" DEBUG_IDX
|
|||
${EndIf}
|
||||
SectionEnd
|
||||
|
||||
Section /o "Palm Address Book Synchronization Tool" PALM_IDX
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\p@m"
|
||||
SetDetailsPrint both
|
||||
DetailPrint $(STATUS_INSTALL_OPTIONAL)
|
||||
SetDetailsPrint none
|
||||
|
||||
${RemoveDir} "$INSTDIR\extensions\p@m"
|
||||
ClearErrors
|
||||
${LogHeader} "Installing Palm Address Book Synchronization Tool"
|
||||
${CopyFilesFromDir} "$EXEDIR\optional\extensions\p@m" \
|
||||
"$INSTDIR\extensions\p@m" \
|
||||
"$(ERROR_CREATE_DIRECTORY_PREFIX)" \
|
||||
"$(ERROR_CREATE_DIRECTORY_SUFFIX)"
|
||||
${EndIf}
|
||||
SectionEnd
|
||||
|
||||
Section /o "JavaScript Debugger" VENKMAN_IDX
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
|
||||
SetDetailsPrint both
|
||||
|
|
@ -791,16 +767,6 @@ Function leaveComponents
|
|||
SectionSetFlags ${DEBUG_IDX} 0 ; Disable install for debugQA
|
||||
${EndIf}
|
||||
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\p@m"
|
||||
${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 ${PALM_IDX} $R0
|
||||
IntOp $R1 $R1 + 1
|
||||
${Else}
|
||||
SectionSetFlags ${PALM_IDX} 0 ; Disable install for palmsync
|
||||
${EndIf}
|
||||
|
||||
${If} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
|
||||
${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
|
||||
|
|
|
|||
|
|
@ -536,12 +536,3 @@ bin\chrome\reporter.manifest
|
|||
bin\extensions\debugQA@mozilla.org\install.rdf
|
||||
bin\extensions\debugQA@mozilla.org\chrome.manifest
|
||||
bin\extensions\debugQA@mozilla.org\chrome\debugqa.jar
|
||||
|
||||
[palmsync]
|
||||
bin\extensions\p@m\install.rdf
|
||||
bin\extensions\p@m\mozABConduit.dll
|
||||
bin\extensions\p@m\PalmSyncInstall.exe
|
||||
bin\extensions\p@m\PalmSyncProxy.dll
|
||||
bin\extensions\p@m\components\palmsync.dll
|
||||
bin\extensions\p@m\components\palmsync.xpt
|
||||
bin\extensions\p@m\defaults\preferences\palmsync.js
|
||||
|
|
|
|||
|
|
@ -59,8 +59,6 @@ DOMI_TITLE=DOM Inspector
|
|||
DOMI_TEXT=Inspects the structure and properties of a window and its contents.
|
||||
DEBUGQA_TITLE=Debug and QA UI
|
||||
DEBUGQA_TEXT=Provides additional debug and QA UI for $BrandShortName development.
|
||||
PALMSYNC_TITLE=Palm Synchronization Extension
|
||||
PALMSYNC_TEXT=Extension for enabling the address book to synchronize with a palm device.
|
||||
VENKMAN_TITLE=JavaScript Debugger
|
||||
VENKMAN_TEXT=JavaScript debugger and profiler
|
||||
CHATZILLA_TITLE=ChatZilla
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче