715749 - Bug 481815 broke builds with --disable-updater

Status: RESOLVED FIXED

(Toolkit :: Application Update, defect)

Description

[Ryan VanderMeulen [:RyanVM]]

serviceinstall.cpp
workmonitor.cpp
certificatecheck.cpp
maintenanceservice.cpp
servicebase.cpp
registrycertificates.cpp
workmonitor.cpp
serviceinstall.cpp
certificatecheck.cpp
maintenanceservice.cpp
c:\mozbuild\mozilla-central\toolkit\mozapps\update\common\updatedefines.h(42) : fatal error C1083: Cannot open include file: 'readstrings.h': No such file or directory
In the directory  /c/mozbuild/mozilla-central/objdir-fx-vc10/toolkit/components/maintenanceservice



My .mozconfig settings:
ac_add_options --disable-accessibility
ac_add_options --disable-crashreporter
ac_add_options --disable-installer
ac_add_options --disable-parental-controls
ac_add_options --disable-safe-browsing
ac_add_options --disable-updater

Comment 1

[Brian R. Bondy [:bbondy]]

I think it is the --disable-updater.
As a workaround you can comment out the following line in \browser\confvars.sh

> MOZ_MAINTENANCE_SERVICE=1

Comment 2

[Brian R. Bondy [:bbondy]]

Attachment: Patch v1.

This patch fixes the build errors when MOZ_UPDATER is not defined.  

It still builds the maintenance service in this case since the maintenance service should still be able to handle other updater.exe requests from other updater.exes, and since the maintenance service will be used for other things than updating soon.

Comment 3

[Robert Strong (they/them - no direct email)]

Comment on attachment 586518 [details] [diff] [review]
Patch v1.

>diff --git a/toolkit/mozapps/update/Makefile.in b/toolkit/mozapps/update/Makefile.in
>--- a/toolkit/mozapps/update/Makefile.in
>+++ b/toolkit/mozapps/update/Makefile.in
>@@ -60,16 +60,29 @@ XPIDLSRCS += nsIUpdateService.idl
> 
> EXTRA_PP_COMPONENTS += \
>   nsUpdateService.js \
>   nsUpdateServiceStub.js \
>   nsUpdateService.manifest \
>   $(NULL)
> endif
> 
>+# If only the maintenance service is installed and not
>+# the updater, then the maintenance service may still be
>+# used for other things.  We need to build update/common
>+# which the maintenance service uses.
>+ifdef MOZ_MAINTENANCE_SERVICE
>+ifndef MOZ_UPDATER
>+DIRS = ../readstrings
>+ifneq ($(OS_TARGET),Android)
>+DIRS += common
>+endif
>+endif
>+endif
You should be able to add an else block before the previous endif and remove ifndef MOZ_UPDATER.

r=me with that fixed.

Comment 4

[Brian R. Bondy [:bbondy]]

Attachment: Path v2.

Now use else instead of an ifndef.
Carried forward r+.

Comment 5

[Brian R. Bondy [:bbondy]]

Pushed to mozilla-inbound:
http://hg.mozilla.org/integration/mozilla-inbound/rev/1b76dd555ee7

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/1b76dd555ee7