☠☠ backed out by 6be47ffba716 ☠ ☠ | |
author | Robert Strong <robert.bugzilla@gmail.com> |
Fri, 07 Dec 2012 15:53:24 -0800 | |
changeset 125256 | ec6a21cbe5164e04cfabda08babf9f03a8ab13fd |
parent 125255 | 5a66c7b34dfe5c1f12b5d8f14436cc7ed50cdfd1 |
child 125257 | 4356739a6f444da38d9bec9605b63bfaf1a50954 |
push id | 297 |
push user | lsblakk@mozilla.com |
push date | Tue, 26 Mar 2013 17:28:00 +0000 |
treeherder | mozilla-release@64d7b45c34e6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | khuey |
bugs | 817723 |
milestone | 20.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
|
--- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -7,20 +7,27 @@ MOZ_APP_BASENAME=Firefox MOZ_APP_VENDOR=Mozilla MOZ_UPDATER=1 MOZ_PHOENIX=1 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 MOZ_SERVICES_COMMON=1 MOZ_SERVICES_CRYPTO=1 MOZ_SERVICES_METRICS=1 MOZ_SERVICES_NOTIFICATIONS=1 MOZ_SERVICES_SYNC=1
--- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -62,17 +62,19 @@ MOZ_PKG_MAC_EXTRA=--symlink "/Applicatio endif ifeq (WINNT,$(OS_ARCH)) UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \ $(NSINSTALL) -D $(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"; \ $(NULL) endif include $(topsrcdir)/config/rules.mk
--- a/configure.in +++ b/configure.in @@ -3856,16 +3856,49 @@ dnl features that Windows actually does if test -n "$SKIP_COMPILER_CHECKS"; then dnl Windows has malloc.h AC_DEFINE(MALLOC_H, [<malloc.h>]) AC_DEFINE(HAVE_FORCEINLINE) 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 dnl = dnl ======================================================== MOZ_ARG_HEADER(External Packages) MOZ_ARG_WITH_STRING(libxul-sdk, [ --with-libxul-sdk=PFX Use the libXUL SDK at <PFX>], @@ -6296,49 +6329,16 @@ MOZ_ARG_ENABLE_BOOL(signmar, MOZ_ENABLE_SIGNMAR=1, MOZ_ENABLE_SIGNMAR= ) 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 ======================================================== MOZ_ARG_DISABLE_BOOL(tests, [ --disable-tests Do not build test libraries & programs], ENABLE_TESTS=, ENABLE_TESTS=1 ) dnl ========================================================
--- a/toolkit/locales/l10n.mk +++ b/toolkit/locales/l10n.mk @@ -108,16 +108,20 @@ endif repackage-zip: UNPACKAGE="$(ZIP_IN)" repackage-zip: libs-$(AB_CD) # Adjust jar logs with the new locale (can't use sed -i because of bug 373784) mkdir -p $(JARLOG_DIR_AB_CD) -cp -r $(JARLOG_DIR)/en-US/*.jar.log $(JARLOG_DIR_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) && \ tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - ) mv $(STAGEDIST)/chrome/$(AB_CD).manifest $(STAGEDIST)/chrome/localized.manifest ifdef MOZ_WEBAPP_RUNTIME mv $(STAGEDIST)/webapprt/chrome/$(AB_CD).manifest $(STAGEDIST)/webapprt/chrome/localized.manifest endif