mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 817723 - Only build the stub installer when the update channel equals nightly, aurora, beta, and release. r=khuey
This commit is contained in:
parent
cb91864a79
commit
60b2ab4311
@ -12,10 +12,17 @@ if test "$OS_ARCH" = "WINNT"; then
|
||||
if ! test "$HAVE_64BIT_OS"; then
|
||||
MOZ_VERIFY_MAR_SIGNATURE=1
|
||||
MOZ_MAINTENANCE_SERVICE=1
|
||||
if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
|
||||
"$MOZ_UPDATE_CHANNEL" = "aurora" -o \
|
||||
"$MOZ_UPDATE_CHANNEL" = "beta" -o \
|
||||
"$MOZ_UPDATE_CHANNEL" = "release"; then
|
||||
if ! test "$MOZ_DEBUG"; then
|
||||
MOZ_STUB_INSTALLER=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
MOZ_STUB_INSTALLER=1
|
||||
MOZ_CHROME_FILE_FORMAT=omni
|
||||
MOZ_SAFE_BROWSING=1
|
||||
MOZ_SERVICES_AITC=1
|
||||
|
@ -67,7 +67,9 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
|
||||
cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
|
||||
$(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
|
||||
cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \
|
||||
$(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \
|
||||
$(NULL)
|
||||
|
||||
STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \
|
||||
$(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \
|
||||
cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \
|
||||
chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \
|
||||
|
66
configure.in
66
configure.in
@ -3860,6 +3860,39 @@ if test -n "$SKIP_COMPILER_CHECKS"; then
|
||||
AC_DEFINE(HAVE_LOCALECONV)
|
||||
fi # SKIP_COMPILER_CHECKS
|
||||
|
||||
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
|
||||
|
||||
# app update channel is 'default' when not supplied.
|
||||
MOZ_ARG_ENABLE_STRING([update-channel],
|
||||
[ --enable-update-channel=CHANNEL
|
||||
Select application update channel (default=default)],
|
||||
MOZ_UPDATE_CHANNEL=`echo $enableval | tr A-Z a-z`)
|
||||
|
||||
if test -z "$MOZ_UPDATE_CHANNEL"; then
|
||||
MOZ_UPDATE_CHANNEL=default
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(MOZ_UPDATE_CHANNEL, $MOZ_UPDATE_CHANNEL)
|
||||
AC_SUBST(MOZ_UPDATE_CHANNEL)
|
||||
|
||||
# tools/update-packaging is not checked out by default.
|
||||
MOZ_ARG_ENABLE_BOOL(update-packaging,
|
||||
[ --enable-update-packaging
|
||||
Enable tools/update-packaging],
|
||||
MOZ_UPDATE_PACKAGING=1,
|
||||
MOZ_UPDATE_PACKAGING= )
|
||||
AC_SUBST(MOZ_UPDATE_PACKAGING)
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Check for external package dependencies
|
||||
@ -6300,39 +6333,6 @@ if test -n "$MOZ_ENABLE_SIGNMAR"; then
|
||||
AC_DEFINE(MOZ_ENABLE_SIGNMAR)
|
||||
fi
|
||||
|
||||
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
|
||||
|
||||
# app update channel is 'default' when not supplied.
|
||||
MOZ_ARG_ENABLE_STRING([update-channel],
|
||||
[ --enable-update-channel=CHANNEL
|
||||
Select application update channel (default=default)],
|
||||
MOZ_UPDATE_CHANNEL=`echo $enableval | tr A-Z a-z`)
|
||||
|
||||
if test -z "$MOZ_UPDATE_CHANNEL"; then
|
||||
MOZ_UPDATE_CHANNEL=default
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(MOZ_UPDATE_CHANNEL, $MOZ_UPDATE_CHANNEL)
|
||||
AC_SUBST(MOZ_UPDATE_CHANNEL)
|
||||
|
||||
# tools/update-packaging is not checked out by default.
|
||||
MOZ_ARG_ENABLE_BOOL(update-packaging,
|
||||
[ --enable-update-packaging
|
||||
Enable tools/update-packaging],
|
||||
MOZ_UPDATE_PACKAGING=1,
|
||||
MOZ_UPDATE_PACKAGING= )
|
||||
AC_SUBST(MOZ_UPDATE_PACKAGING)
|
||||
|
||||
dnl ========================================================
|
||||
dnl build the tests by default
|
||||
dnl ========================================================
|
||||
|
@ -113,6 +113,10 @@ repackage-zip: libs-$(AB_CD)
|
||||
-$(PERL) -pi.old -e "s/en-US/$(AB_CD)/g" $(JARLOG_DIR_AB_CD)/*.jar.log
|
||||
# call a hook for apps to put their uninstall helper.exe into the package
|
||||
$(UNINSTALLER_PACKAGE_HOOK)
|
||||
# call a hook for apps to build the stub installer
|
||||
ifdef MOZ_STUB_INSTALLER
|
||||
$(STUB_HOOK)
|
||||
endif
|
||||
# copy xpi-stage over, but not install.rdf and chrome.manifest,
|
||||
# those are just for language packs
|
||||
cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
|
||||
|
Loading…
Reference in New Issue
Block a user