nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1747855 - Move --disable-updater to python configure. r=firefox-build-system-reviewers,geckoview-reviewers,mhentges,calu

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D134769
This commit is contained in:
Mike Hommey 2021-12-30 00:54:02 +00:00
parent cc5858cdcc
commit a1425cc7d4
8 changed files with 16 additions and 20 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
browser/confvars.sh
View file

@ -4,7 +4,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_VENDOR=Mozilla MOZ_APP_VENDOR=Mozilla
MOZ_UPDATER=1
if test "$OS_ARCH" = "WINNT"; then if test "$OS_ARCH" = "WINNT"; then
if ! test "$HAVE_64BIT_BUILD"; then if ! test "$HAVE_64BIT_BUILD"; then

1
build/moz.configure/old.configure
View file

@ -95,7 +95,6 @@ def old_configure_options(*options):
"--cache-file", "--cache-file",
"--datadir", "--datadir",
"--enable-official-branding", "--enable-official-branding",
"--enable-updater",
"--includedir", "--includedir",
"--libdir", "--libdir",
"--prefix", "--prefix",

16
build/moz.configure/update-programs.configure
View file

@ -4,6 +4,22 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Updater
# ==============================================================
@depends(build_project)
def updater_default(build_project):
return build_project != "mobile/android"
option(
"--enable-updater",
default=updater_default,
help="{Enable|Disable} building the updater",
)
set_config("MOZ_UPDATER", True, when="--enable-updater")
set_define("MOZ_UPDATER", True, when="--enable-updater")
# Verify MAR signatures # Verify MAR signatures
# ============================================================== # ==============================================================

1
mobile/android/branding/beta/configure.sh
View file

@ -4,4 +4,3 @@
MOZ_APP_DISPLAYNAME="Firefox Beta" MOZ_APP_DISPLAYNAME="Firefox Beta"
ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
MOZ_UPDATER=

1
mobile/android/branding/nightly/configure.sh
View file

@ -3,4 +3,3 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_DISPLAYNAME="Firefox Nightly" MOZ_APP_DISPLAYNAME="Firefox Nightly"
MOZ_UPDATER=

1
mobile/android/branding/official/configure.sh
View file

@ -4,4 +4,3 @@
MOZ_APP_DISPLAYNAME=Firefox MOZ_APP_DISPLAYNAME=Firefox
ANDROID_PACKAGE_NAME=org.mozilla.firefox ANDROID_PACKAGE_NAME=org.mozilla.firefox
MOZ_UPDATER=

1
mobile/android/branding/unofficial/configure.sh
View file

@ -4,4 +4,3 @@
ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo ${USER:-unknown} | sed 's/-/_/g'` ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo ${USER:-unknown} | sed 's/-/_/g'`
MOZ_APP_DISPLAYNAME="Fennec `echo ${USER:-unknown} | sed 's/-/_/g'`" MOZ_APP_DISPLAYNAME="Fennec `echo ${USER:-unknown} | sed 's/-/_/g'`"
MOZ_UPDATER=

14
old-configure.in
View file

@ -1125,19 +1125,6 @@ fi
AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID") AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
AC_SUBST(MOZ_DISTRIBUTION_ID) AC_SUBST(MOZ_DISTRIBUTION_ID)
dnl ========================================================
dnl Updater
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(updater,
[ --disable-updater Disable building of updater],
MOZ_UPDATER=,
MOZ_UPDATER=1 )
if test -n "$MOZ_UPDATER"; then
AC_DEFINE(MOZ_UPDATER)
fi
dnl ======================================================== dnl ========================================================
dnl = Disable smartcard support dnl = Disable smartcard support
dnl ======================================================== dnl ========================================================
@ -1322,7 +1309,6 @@ AC_SUBST_LIST(MOZ_DEBUG_LDFLAGS)
AC_SUBST_LIST(WARNINGS_CFLAGS) AC_SUBST_LIST(WARNINGS_CFLAGS)
AC_SUBST(MOZ_STUB_INSTALLER) AC_SUBST(MOZ_STUB_INSTALLER)
AC_SUBST(MOZ_UPDATER)
AC_SUBST_LIST(MOZ_FIX_LINK_PATHS) AC_SUBST_LIST(MOZ_FIX_LINK_PATHS)