diff options
| author | Pale Moon <git-repo@palemoon.org> | 2016-10-11 18:50:31 +0200 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2016-10-12 00:19:04 +0200 |
| commit | 009fdf9eb83e29aceec430ccc6c1132e32b23185 (patch) | |
| tree | 116d87fb5fa5fec1cc65d239ada055699bd586c5 /browser | |
| parent | 59961b1cc11abfc851a402df8634d3c100f85c69 (diff) | |
| download | palemoon-gre-009fdf9eb83e29aceec430ccc6c1132e32b23185.tar.gz | |
Remove the maintenance service (take 2).
This resolves #492.
Diffstat (limited to 'browser')
| -rw-r--r-- | browser/installer/package-manifest.in | 7 | ||||
| -rw-r--r-- | browser/installer/windows/nsis/installer.nsi | 19 |
2 files changed, 0 insertions, 26 deletions
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c9aae3841..35f7a1816 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -806,13 +806,6 @@ bin/libfreebl_32int64_3.so #endif #endif -; [MaintenanceService] -; -#ifdef MOZ_MAINTENANCE_SERVICE -@BINPATH@/maintenanceservice.exe -@BINPATH@/maintenanceservice_installer.exe -#endif - @RESPATH@/components/DataStore.manifest @RESPATH@/components/DataStoreImpl.js @RESPATH@/components/dom_datastore.xpt diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index 8afccb91b..b5bd62605 100644 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -1018,25 +1018,6 @@ Function .onInit WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" State "1" ${EndUnless} - ; Setup the components.ini file for the Components Page - WriteINIStr "$PLUGINSDIR\components.ini" "Settings" NumFields "2" - - WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Text "$(OPTIONAL_COMPONENTS_DESC)" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Bottom "25" - - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Type "checkbox" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Text "$(MAINTENANCE_SERVICE_CHECKBOX_DESC)" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Left "0" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Top "27" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Bottom "37" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" State "1" - WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Flags "GROUP" - ; There must always be a core directory. ${GetSize} "$EXEDIR\core\" "/S=0K" $R5 $R7 $R8 SectionSetSize ${APP_IDX} $R5 |