mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-07 18:04:46 +00:00
Bug 1329355 - Remove MOZ_AUTOMATION_PRETTY*; r=ted
These automation steps are no longer relevant, since the last use of MOZ_AUTOMATION_PRETTY was removed along with non-unified builds in bug 1121000. MozReview-Commit-ID: 11VDu8pIs1p --HG-- extra : rebase_source : a82b52400b73224e06e124dd10d6646d4b21a7fc
This commit is contained in:
Mike Shal
parent
f665f5b5a6
commit
86c94c9187
20
Makefile.in
20
Makefile.in
@ -342,26 +342,6 @@ endif
|
||||
update-packaging:
|
||||
$(MAKE) -C tools/update-packaging
|
||||
|
||||
.PHONY: pretty-package
|
||||
pretty-package:
|
||||
unset MOZ_SIGN_CMD && $(MAKE) package MOZ_PKG_PRETTYNAMES=1
|
||||
|
||||
.PHONY: pretty-package-tests
|
||||
pretty-package-tests:
|
||||
unset MOZ_SIGN_CMD && $(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
|
||||
|
||||
.PHONY: pretty-l10n-check
|
||||
pretty-l10n-check:
|
||||
unset MOZ_SIGN_CMD && $(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
|
||||
|
||||
.PHONY: pretty-update-packaging
|
||||
pretty-update-packaging:
|
||||
unset MOZ_SIGN_CMD && $(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
|
||||
|
||||
.PHONY: pretty-installer
|
||||
pretty-installer:
|
||||
unset MOZ_SIGN_CMD && $(MAKE) installer MOZ_PKG_PRETTYNAMES=1
|
||||
|
||||
#XXX: this is a hack, since we don't want to clobber for MSVC
|
||||
# PGO support, but we can't do this test in client.mk
|
||||
ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
||||
|
||||
@ -23,15 +23,10 @@ endif
|
||||
# corresponding the make target
|
||||
tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols
|
||||
tier_MOZ_AUTOMATION_L10N_CHECK = l10n-check
|
||||
tier_MOZ_AUTOMATION_PRETTY_L10N_CHECK = pretty-l10n-check
|
||||
tier_MOZ_AUTOMATION_INSTALLER = installer
|
||||
tier_MOZ_AUTOMATION_PRETTY_INSTALLER = pretty-installer
|
||||
tier_MOZ_AUTOMATION_PACKAGE = package
|
||||
tier_MOZ_AUTOMATION_PRETTY_PACKAGE = pretty-package
|
||||
tier_MOZ_AUTOMATION_PACKAGE_TESTS = package-tests
|
||||
tier_MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS = pretty-package-tests
|
||||
tier_MOZ_AUTOMATION_UPDATE_PACKAGING = update-packaging
|
||||
tier_MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING = pretty-update-packaging
|
||||
tier_MOZ_AUTOMATION_UPLOAD_SYMBOLS = uploadsymbols
|
||||
tier_MOZ_AUTOMATION_UPLOAD = upload
|
||||
|
||||
@ -41,17 +36,12 @@ tier_MOZ_AUTOMATION_UPLOAD = upload
|
||||
# dependencies between them).
|
||||
moz_automation_symbols = \
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS \
|
||||
MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS \
|
||||
MOZ_AUTOMATION_BUILD_SYMBOLS \
|
||||
MOZ_AUTOMATION_UPLOAD_SYMBOLS \
|
||||
MOZ_AUTOMATION_PACKAGE \
|
||||
MOZ_AUTOMATION_PRETTY_PACKAGE \
|
||||
MOZ_AUTOMATION_INSTALLER \
|
||||
MOZ_AUTOMATION_PRETTY_INSTALLER \
|
||||
MOZ_AUTOMATION_UPDATE_PACKAGING \
|
||||
MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING \
|
||||
MOZ_AUTOMATION_L10N_CHECK \
|
||||
MOZ_AUTOMATION_PRETTY_L10N_CHECK \
|
||||
MOZ_AUTOMATION_UPLOAD \
|
||||
$(NULL)
|
||||
MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$($(sym))),$(tier_$(sym))))
|
||||
@ -61,13 +51,9 @@ automation/uploadsymbols: automation/buildsymbols
|
||||
|
||||
automation/update-packaging: automation/package
|
||||
automation/update-packaging: automation/installer
|
||||
automation/pretty-update-packaging: automation/pretty-package
|
||||
automation/pretty-update-packaging: automation/pretty-installer
|
||||
|
||||
automation/l10n-check: automation/package
|
||||
automation/l10n-check: automation/installer
|
||||
automation/pretty-l10n-check: automation/pretty-package
|
||||
automation/pretty-l10n-check: automation/pretty-installer
|
||||
|
||||
automation/upload: automation/installer
|
||||
automation/upload: automation/package
|
||||
@ -78,31 +64,22 @@ automation/upload: automation/update-packaging
|
||||
# buildsymbols will modify our test binaries, which can interfere with
|
||||
# packaging them. A finer-grained dependency can help performance here
|
||||
# once bug 1329020 is fixed.
|
||||
automation/pretty-package-tests: automation/buildsymbols
|
||||
automation/package-tests: automation/buildsymbols
|
||||
|
||||
# automation/{pretty-}package should depend on build (which is implicit due to
|
||||
# the way client.mk invokes automation/build), but buildsymbols changes the
|
||||
# automation/package should depend on build (which is implicit due to the way
|
||||
# client.mk invokes automation/build), but buildsymbols changes the
|
||||
# binaries/libs, and that's what we package/test.
|
||||
automation/pretty-package: automation/buildsymbols
|
||||
automation/package: automation/buildsymbols
|
||||
|
||||
# The installer and packager all run stage-package, and may conflict
|
||||
# with each other.
|
||||
automation/installer: automation/package
|
||||
|
||||
# The 'pretty' versions of targets run before the regular ones to avoid
|
||||
# conflicts in writing to the same files.
|
||||
automation/installer: automation/pretty-installer
|
||||
automation/package: automation/pretty-package
|
||||
automation/package-tests: automation/pretty-package-tests
|
||||
automation/l10n-check: automation/pretty-l10n-check
|
||||
automation/update-packaging: automation/pretty-update-packaging
|
||||
|
||||
automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
|
||||
@echo Automation steps completed.
|
||||
|
||||
# Note: We have to force -j1 here, at least until bug 1036563 is fixed.
|
||||
AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1
|
||||
AUTOMATION_EXTRA_CMDLINE-pretty-l10n-check = -j1
|
||||
|
||||
# The commands only run if the corresponding MOZ_AUTOMATION_* variable is
|
||||
# enabled. This means, for example, if we enable MOZ_AUTOMATION_UPLOAD, then
|
||||
|
||||
@ -18,17 +18,4 @@ mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_P
|
||||
mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
|
||||
|
||||
# If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
|
||||
# stages.
|
||||
if test "$MOZ_AUTOMATION_PRETTY" = "1"; then
|
||||
mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_PRETTY_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
|
||||
mk_add_options "export MOZ_AUTOMATION_PRETTY_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
|
||||
|
||||
# Note that we always build the update packaging with pretty names even if
|
||||
# we don't build it without, so this is set to 1.
|
||||
mk_add_options "export MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING=1"
|
||||
fi
|
||||
|
||||
export MOZ_AUTOMATION_MOZCONFIG=1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user