Skip to content

Commit

Permalink
Bug 1333826 - Remove all references to MOZ_AUTOMATION_SDK, r=mshal
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: CuTK1hn0pVl

--HG--
extra : rebase_source : 4581c71360ccd81505079ee9e068ed2ca0431a6a
  • Loading branch information
bsmedberg committed Jan 25, 2017
1 parent 2487f35 commit 270de3f
Show file tree
Hide file tree
Showing 32 changed files with 0 additions and 37 deletions.
1 change: 0 additions & 1 deletion b2g/config/mozconfigs/linux32_gecko/nightly
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/b2g/config/mozconfigs/common"
. "$topsrcdir/build/unix/mozconfig.linux32"

Expand Down
1 change: 0 additions & 1 deletion b2g/config/mozconfigs/linux64_gecko/nightly
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/b2g/config/mozconfigs/common"
. "$topsrcdir/build/unix/mozconfig.linux"

Expand Down
1 change: 0 additions & 1 deletion b2g/config/mozconfigs/macosx64_gecko/nightly
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/b2g/config/mozconfigs/common"

# Use sccache
Expand Down
1 change: 0 additions & 1 deletion b2g/config/mozconfigs/win32_gecko/nightly
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/b2g/config/mozconfigs/common"

ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
Expand Down
1 change: 0 additions & 1 deletion b2g/dev/config/mozconfigs/linux64/mulet
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"

ac_add_options --enable-application=b2g/dev
Expand Down
1 change: 0 additions & 1 deletion b2g/dev/config/mozconfigs/linux64/mulet-hazards
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"

ac_add_options --enable-application=b2g/dev
Expand Down
1 change: 0 additions & 1 deletion b2g/dev/config/mozconfigs/linux64/mulet_dbg
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"

ac_add_options --enable-application=b2g/dev
Expand Down
1 change: 0 additions & 1 deletion b2g/dev/config/mozconfigs/macosx64/mulet
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ MOZ_AUTOMATION_BUILD_SYMBOLS=0
MOZ_AUTOMATION_PACKAGE_TESTS=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. $topsrcdir/build/macosx/mozconfig.common

ac_add_options --enable-application=b2g/dev
Expand Down
1 change: 0 additions & 1 deletion b2g/dev/config/mozconfigs/win32/mulet
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0
MOZ_AUTOMATION_INSTALLER=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_SDK=0
. "$topsrcdir/browser/config/mozconfigs/win32/nightly"

ac_add_options --enable-application=b2g/dev
Expand Down
1 change: 0 additions & 1 deletion b2g/graphene/config/horizon-mozconfigs/common
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# This needs to be set prior to the next include for it to take effect.
MOZ_AUTOMATION_PACKAGE_TESTS=0
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_SDK=0

. "$topsrcdir/build/mozconfig.common"

Expand Down
1 change: 0 additions & 1 deletion b2g/graphene/config/mozconfigs/common
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# This needs to be set prior to the next include for it to take effect.
MOZ_AUTOMATION_PACKAGE_TESTS=0
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_SDK=0

. "$topsrcdir/build/mozconfig.common"

Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/linux32/beta
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
MOZ_AUTOMATION_UPDATE_PACKAGING=1
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/linux32/release
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/linux64/beta
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
MOZ_AUTOMATION_UPDATE_PACKAGING=1
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/linux64/release
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
Expand Down
2 changes: 0 additions & 2 deletions browser/config/mozconfigs/macosx-universal/beta
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
MOZ_AUTOMATION_UPDATE_PACKAGING=1
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/macosx-universal/release
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
Expand Down
2 changes: 0 additions & 2 deletions browser/config/mozconfigs/macosx64/beta
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
MOZ_AUTOMATION_UPDATE_PACKAGING=1
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/macosx64/release
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/whitelist
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ for platform in all_platforms:
'MOZ_AUTOMATION_UPLOAD_SYMBOLS=1',
'MOZ_AUTOMATION_UPDATE_PACKAGING=1',
'fi',
'MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}',
]
whitelist['release']['win32'] += ['mk_add_options MOZ_PGO=1']
whitelist['release']['win64'] += ['mk_add_options MOZ_PGO=1']
Expand Down
2 changes: 0 additions & 2 deletions browser/config/mozconfigs/win32/beta
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
MOZ_AUTOMATION_UPDATE_PACKAGING=1
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/win32/release
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
Expand Down
2 changes: 0 additions & 2 deletions browser/config/mozconfigs/win64/beta
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
MOZ_AUTOMATION_UPDATE_PACKAGING=1
Expand Down
1 change: 0 additions & 1 deletion browser/config/mozconfigs/win64/release
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This make file should be identical to the beta mozconfig, apart from the
# safeguard below
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}

if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
Expand Down
1 change: 0 additions & 1 deletion build/macosx/cross-mozconfig.common
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
if [ "x$IS_NIGHTLY" = "xyes" ]; then
# Some nightlies (eg: Mulet) don't want these set.
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
fi
. "$topsrcdir/build/mozconfig.common"

Expand Down
1 change: 0 additions & 1 deletion build/macosx/local-mozconfig.common
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
# Some nightlies (eg: Mulet) don't want these set.
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
fi
. "$topsrcdir/build/mozconfig.common"

Expand Down
2 changes: 0 additions & 2 deletions build/moz-automation.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ 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
tier_MOZ_AUTOMATION_SDK = sdk

# Automation build steps. Everything in MOZ_AUTOMATION_TIERS also gets used in
# TIERS for mach display. As such, the MOZ_AUTOMATION_TIERS are roughly sorted
Expand All @@ -54,7 +53,6 @@ moz_automation_symbols = \
MOZ_AUTOMATION_L10N_CHECK \
MOZ_AUTOMATION_PRETTY_L10N_CHECK \
MOZ_AUTOMATION_UPLOAD \
MOZ_AUTOMATION_SDK \
$(NULL)
MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$($(sym))),$(tier_$(sym))))

Expand Down
1 change: 0 additions & 1 deletion build/mozconfig.automation
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
mk_add_options "export MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-0}"

# If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
# stages.
Expand Down
1 change: 0 additions & 1 deletion build/mozconfig.win-common
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
# Some nightlies (eg: Mulet) don't want these set.
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
fi

# Some builds (eg: Mulet) don't want the installer, so only set this if it
Expand Down
1 change: 0 additions & 1 deletion build/unix/mozconfig.linux
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
# Some nightlies (eg: Mulet) don't want these set.
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
fi

. "$topsrcdir/build/mozconfig.common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MOZ_AUTOMATION_INSTALLER=0
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_PACKAGE=0
MOZ_AUTOMATION_PACKAGE_TESTS=0
MOZ_AUTOMATION_SDK=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_UPLOAD=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MOZ_AUTOMATION_INSTALLER=0
MOZ_AUTOMATION_L10N_CHECK=0
MOZ_AUTOMATION_PACKAGE=0
MOZ_AUTOMATION_PACKAGE_TESTS=0
MOZ_AUTOMATION_SDK=0
MOZ_AUTOMATION_UPDATE_PACKAGING=0
MOZ_AUTOMATION_UPLOAD=0
MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
Expand Down

0 comments on commit 270de3f

Please sign in to comment.