bug 1259832 - move artifact build automation step overrides to a common mozconfig. r=chmanchester
A followup change will be adding a new automation step that wants to be skipped
in artifact builds, and this will make that simpler.
MozReview-Commit-ID: 5xwRB9eCRQn
--- a/browser/config/mozconfigs/linux32/artifact
+++ b/browser/config/mozconfigs/linux32/artifact
@@ -1,8 +1,7 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
. "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
ac_add_options --enable-artifact-build-symbols
--- a/browser/config/mozconfigs/linux32/debug-artifact
+++ b/browser/config/mozconfigs/linux32/debug-artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
. "$topsrcdir/build/unix/mozconfig.linux32"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
ac_add_options --enable-artifact-build-symbols
ac_add_options --enable-debug
--- a/browser/config/mozconfigs/linux64/artifact
+++ b/browser/config/mozconfigs/linux64/artifact
@@ -1,8 +1,7 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
ac_add_options --enable-artifact-build-symbols
--- a/browser/config/mozconfigs/linux64/debug-artifact
+++ b/browser/config/mozconfigs/linux64/debug-artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
. "$topsrcdir/build/unix/mozconfig.linux"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
ac_add_options --enable-artifact-build-symbols
ac_add_options --enable-debug
--- a/browser/config/mozconfigs/macosx64/artifact
+++ b/browser/config/mozconfigs/macosx64/artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
# Needed to set SourceRepository in application.ini (used by Talos)
export MOZILLA_OFFICIAL=1
. "$topsrcdir/build/macosx/mozconfig.common"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
--- a/browser/config/mozconfigs/macosx64/debug-artifact
+++ b/browser/config/mozconfigs/macosx64/debug-artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
. "$topsrcdir/build/macosx/mozconfig.common"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
ac_add_options --enable-artifact-build-symbols
ac_add_options --enable-debug
--- a/browser/config/mozconfigs/win32/artifact
+++ b/browser/config/mozconfigs/win32/artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
# Needed to set SourceRepository in application.ini (used by Talos)
export MOZILLA_OFFICIAL=1
. "$topsrcdir/browser/config/mozconfigs/common"
. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/build/win32/mozconfig.vs-latest"
. "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win32/debug-artifact
+++ b/browser/config/mozconfigs/win32/debug-artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
. "$topsrcdir/browser/config/mozconfigs/common"
. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/build/win32/mozconfig.vs-latest"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
ac_add_options --enable-artifact-build-symbols
--- a/browser/config/mozconfigs/win64/artifact
+++ b/browser/config/mozconfigs/win64/artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
# Needed to set SourceRepository in application.ini (used by Talos)
export MOZILLA_OFFICIAL=1
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
. "$topsrcdir/browser/config/mozconfigs/common"
. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/build/win64/mozconfig.vs-latest"
--- a/browser/config/mozconfigs/win64/debug-artifact
+++ b/browser/config/mozconfigs/win64/debug-artifact
@@ -1,10 +1,9 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/build/mozconfig.artifact.automation"
. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
. "$topsrcdir/browser/config/mozconfigs/common"
. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/build/win64/mozconfig.vs-latest"
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.artifact"
new file mode 100644
--- /dev/null
+++ b/build/mozconfig.artifact.automation
@@ -0,0 +1,5 @@
+# Common options for artifact builds to set automation steps.
+# This gets included before mozconfig.automation.
+
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_L10N_CHECK=0