Bug 495232 Drop support for the Palm Sync Extension. suite/ part. r=mcsmurf
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 04 Jun 2009 08:57:31 +0100
changeset 2768 dd584408d621
parent 2767 3c14e195490c
child 2769 f76edc8db870
push id2241
push userbugzilla@standard8.plus.com
push dateThu, 04 Jun 2009 07:58:17 +0000
treeherdercomm-central@dd584408d621 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcsmurf
bugs495232
Bug 495232 Drop support for the Palm Sync Extension. suite/ part. r=mcsmurf
suite/installer/Makefile.in
suite/installer/removed-files.in
suite/installer/windows/nsis/custom.nsi
suite/installer/windows/nsis/installer.nsi
suite/installer/windows/packages
suite/locales/en-US/installer/windows/custom.properties
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -72,17 +72,16 @@ MOZ_NONLOCALIZED_PKG_LIST = \
 MOZ_LOCALIZED_PKG_LIST = \
 	$(AB_CD) \
 	$(NULL)
 
 MOZ_OPTIONAL_PKG_LIST = \
 	chatzilla \
 	debugqa \
 	inspector \
-	palmsync \
 	venkman \
 	$(NULL)
 
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages
 
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -111,16 +111,25 @@ components/nsPostUpdateWin.js
 #endif
 #else
 xpicleanup
 #endif
 #ifndef MOZILLA_1_9_1_BRANCH
 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@
 components/@DLL_PREFIX@auth@DLL_SUFFIX@
 components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
 components/@DLL_PREFIX@caps@DLL_SUFFIX@
 components/@DLL_PREFIX@chardet@DLL_SUFFIX@
 components/@DLL_PREFIX@chrome@DLL_SUFFIX@
--- a/suite/installer/windows/nsis/custom.nsi
+++ b/suite/installer/windows/nsis/custom.nsi
@@ -35,17 +35,16 @@
 #
 # ***** END LICENSE BLOCK *****
 
 !macro checkSuiteComponents
   ; If no extensions are available skip the components page
   ${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}
 !macroend
 
 !macro createSuiteComponentsIni
   WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Type   "label"
   WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Text   "$(OPTIONAL_COMPONENTS_LABEL)"
@@ -119,35 +118,16 @@
     IntOp $R1 $R1 + 1
     IntOp $R2 $R2 + $R4
     IntOp $R3 $R3 + $R4
   ${Else}
     ; Hide debugQA in the components page if it isn't available.
     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)"
     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"
@@ -203,28 +183,16 @@
     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\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)"
     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 $R2 $R2 + $R4
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -244,24 +244,16 @@ Section "-InstallStartCleanup"
     ; If DebugQA is installed and this install includes DebugQA remove it
     ; from the installation directory. This will remove it if the user
     ; deselected DebugQA on the components page.
     ${If} ${FileExists} "$INSTDIR\extensions\debugQA@mozilla.org"
     ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org"
       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.
     ${If} ${FileExists} "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
     ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
       RmDir /r "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
     ${EndIf}
     ${If} ${FileExists} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
@@ -542,32 +534,16 @@ Section /o "Debug and QA Tools" DEBUG_ID
     ${LogHeader} "Installing Debug and QA Tools"
     ${CopyFilesFromDir} "$EXEDIR\optional\extensions\debugQA@mozilla.org" \
                         "$INSTDIR\extensions\debugQA@mozilla.org" \
                         "$(ERROR_CREATE_DIRECTORY_PREFIX)" \
                         "$(ERROR_CREATE_DIRECTORY_SUFFIX)"
   ${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 
     DetailPrint $(STATUS_INSTALL_OPTIONAL)
     SetDetailsPrint none
 
     ${RemoveDir} "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
     ${RemoveDir} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
@@ -786,26 +762,16 @@ Function leaveComponents
     ; State will be 1 for checked and 0 for unchecked so we can use that to set
     ; the section flags for installation.
     SectionSetFlags ${DEBUG_IDX} $R0
     IntOp $R1 $R1 + 1
   ${Else}
     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
     ; the section flags for installation.
     SectionSetFlags ${VENKMAN_IDX} $R0
     IntOp $R1 $R1 + 1
   ${Else}
     SectionSetFlags ${VENKMAN_IDX} 0 ; Disable install for venkman
--- a/suite/installer/windows/packages
+++ b/suite/installer/windows/packages
@@ -531,17 +531,8 @@ bin\extensions\inspector@mozilla.org\def
 [reporter]
 bin\chrome\reporter.jar
 bin\chrome\reporter.manifest
 
 [debugqa]
 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
--- a/suite/locales/en-US/installer/windows/custom.properties
+++ b/suite/locales/en-US/installer/windows/custom.properties
@@ -54,18 +54,16 @@
 REG_APP_DESC=$BrandShortName delivers safe, easy web browsing. A familiar user interface, enhanced security features including protection from online identity theft, and integrated search let you get the most out of the web.
 OPTIONAL_COMPONENTS_TITLE=Choose Optional Components
 OPTIONAL_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
 OPTIONAL_COMPONENTS_LABEL=Optional Components:
 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
 CHATZILLA_TEXT=A clean, easy to use and highly extensible IRC client.
 CONTEXT_OPTIONS=$BrandShortName &Options
 CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
 SAFE_MODE=Safe Mode
 # MAILNEWS_TEXT appears in Windows (All) Programs menu as "SeaMonkey $(MAILNEWS_TEXT)"