Bug 481815 broke builds with --disable-updater

RESOLVED FIXED in mozilla12

Status

()

Toolkit
Application Update
RESOLVED FIXED
6 years ago
6 years ago

People

(Reporter: RyanVM, Assigned: bbondy)

Tracking

Trunk
mozilla12
x86_64
Windows 7
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Reporter)

Description

6 years ago
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
(Assignee)

Comment 1

6 years ago
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
(Assignee)

Updated

6 years ago
Summary: Bug 481815 broke builds with the installer disabled → Bug 481815 broke builds with --disable-updater
(Assignee)

Updated

6 years ago
Assignee: nobody → netzen
(Assignee)

Comment 2

6 years ago
Created attachment 586518 [details] [diff] [review]
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.
Attachment #586518 - Flags: review?(robert.bugzilla)
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.
Attachment #586518 - Flags: review?(robert.bugzilla) → review+
(Assignee)

Comment 4

6 years ago
Created attachment 586682 [details] [diff] [review]
Path v2.

Now use else instead of an ifndef.
Carried forward r+.
Attachment #586518 - Attachment is obsolete: true
Attachment #586682 - Flags: review+
(Assignee)

Comment 5

6 years ago
Pushed to mozilla-inbound:
http://hg.mozilla.org/integration/mozilla-inbound/rev/1b76dd555ee7
Target Milestone: --- → mozilla12

Comment 6

6 years ago
https://hg.mozilla.org/mozilla-central/rev/1b76dd555ee7
Status: NEW → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.