Bug 1491419 - move --enable-maintenance-service to moz.configure; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Mon, 01 Oct 2018 14:51:28 -0400
changeset 494741 2a985dd40eba10801b2da141d1e8966b2ec060a5
parent 494740 36b041b6b55a0f1acf23536de0c212fa6be14c92
child 494742 61ab6941b46309f804ae444b42b2f705d44142d4
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1491419
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1491419 - move --enable-maintenance-service to moz.configure; r=nalexander
browser/confvars.sh
build/moz.configure/old.configure
old-configure.in
toolkit/moz.configure
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -9,17 +9,16 @@ MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
 if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Linux"; then
   MOZ_BUNDLED_FONTS=1
 fi
 
 if test "$OS_ARCH" = "WINNT"; then
-  MOZ_MAINTENANCE_SERVICE=1
   if ! test "$HAVE_64BIT_BUILD"; then
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
             "$MOZ_UPDATE_CHANNEL" = "nightly-try" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
             "$MOZ_UPDATE_CHANNEL" = "release"; then
       if ! test "$MOZ_DEBUG"; then
         if ! test "$USE_STUB_INSTALLER"; then
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -188,17 +188,16 @@ def old_configure_options(*options):
     '--enable-hardware-aec-ns',
     '--enable-icf',
     '--enable-install-strip',
     '--enable-ios-target',
     '--enable-libjpeg-turbo',
     '--enable-libproxy',
     '--enable-llvm-hacks',
     '--enable-logrefcnt',
-    '--enable-maintenance-service',
     '--enable-memory-sanitizer',
     '--enable-mobile-optimize',
     '--enable-necko-wifi',
     '--enable-negotiateauth',
     '--enable-nfc',
     '--enable-nspr-build',
     '--enable-official-branding',
     '--enable-parental-controls',
--- a/old-configure.in
+++ b/old-configure.in
@@ -2998,33 +2998,16 @@ if test -n "$MOZ_TREE_FREETYPE" -a "$OS_
    CAIRO_FT_CFLAGS="-I$_topsrcdir/modules/freetype2/include"
    AC_SUBST_LIST(CAIRO_FT_CFLAGS)
 fi
 
 AC_CHECK_PROGS(WGET, wget, "")
 AC_SUBST(WGET)
 
 dnl ========================================================
-dnl Maintenance Service
-dnl ========================================================
-
-MOZ_ARG_ENABLE_BOOL(maintenance-service,
-[  --enable-maintenance-service       Enable building of maintenanceservice],
-    MOZ_MAINTENANCE_SERVICE=1,
-    MOZ_MAINTENANCE_SERVICE= )
-
-if test -n "$MOZ_MAINTENANCE_SERVICE"; then
-  if test "$OS_ARCH" = "WINNT"; then
-    AC_DEFINE(MOZ_MAINTENANCE_SERVICE)
-  else
-    AC_MSG_ERROR([Can only build with --enable-maintenance-service with a Windows target])
-  fi
-fi
-
-dnl ========================================================
 dnl Bundled fonts on desktop platforms
 dnl ========================================================
 
 MOZ_ARG_ENABLE_BOOL(bundled-fonts,
 [  --enable-bundled-fonts  Enable support for bundled fonts on desktop platforms],
     MOZ_BUNDLED_FONTS=1,
     MOZ_BUNDLED_FONTS=)
 
@@ -4048,17 +4031,16 @@ AC_SUBST(MOZ_TOOLKIT_SEARCH)
 AC_SUBST(MOZ_FEEDS)
 
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)
 AC_SUBST(MOZ_SPELLCHECK)
 AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
 AC_SUBST(MOZ_CRASHREPORTER)
 AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
-AC_SUBST(MOZ_MAINTENANCE_SERVICE)
 AC_SUBST(MOZ_STUB_INSTALLER)
 AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
 AC_SUBST(MOZ_ENABLE_SIGNMAR)
 AC_SUBST(MOZ_UPDATER)
 
 AC_SUBST(MOZ_ANGLE_RENDERER)
 AC_SUBST(MOZ_D3D_CPU_SUFFIX)
 AC_SUBST(MOZ_HAS_WINSDK_WITH_D3D)
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1080,8 +1080,20 @@ def libprio(info):
     if info:
       # MSVC is not supported by libprio.
       if info.type in ('msvc',):
         return None
     return True
 
 set_config('MOZ_LIBPRIO', libprio)
 
+# Maintenance service (Windows only)
+# ==============================================================
+
+option('--enable-maintenance-service', help='Enable building of maintenance service',
+       when=target_is_windows, default=target_is_windows)
+
+set_define('MOZ_MAINTENANCE_SERVICE',
+           depends_if('--enable-maintenance-service',
+                      when=target_is_windows)(lambda _: True))
+set_config('MOZ_MAINTENANCE_SERVICE',
+           depends_if('--enable-maintenance-service',
+                      when=target_is_windows)(lambda _: True))