Bug 1132123 - Port mulet to mozharness+mach; r=bhearsum
authorMike Shal <mshal@mozilla.com>
Wed, 25 Feb 2015 17:25:59 -0500
changeset 231868 653bb7fcb7ed3e4df45dbe641c5c22620670c143
parent 231867 771403b7b48633518f11572cf23745df21f01612
child 231869 a48fb48db853c14749b0f66ff0c8550414594b68
push idunknown
push userunknown
push dateunknown
reviewersbhearsum
bugs1132123
milestone39.0a1
Bug 1132123 - Port mulet to mozharness+mach; r=bhearsum
b2g/dev/config/mozconfigs/linux64/mulet
b2g/dev/config/mozconfigs/macosx-universal/mulet
b2g/dev/config/mozconfigs/macosx64/mulet
b2g/dev/config/mozconfigs/win32/mulet
build/mozconfig.win-common
--- a/b2g/dev/config/mozconfigs/linux64/mulet
+++ b/b2g/dev/config/mozconfigs/linux64/mulet
@@ -1,6 +1,7 @@
+MOZ_AUTOMATION_L10N_CHECK=0
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 
 ac_add_options --enable-application=b2g/dev
 
 # Include Firefox OS fonts.
 MOZTTDIR=$topsrcdir/moztt
deleted file mode 100644
--- a/b2g/dev/config/mozconfigs/macosx-universal/mulet
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/nightly"
-
-ac_add_options --enable-application=b2g/dev
--- a/b2g/dev/config/mozconfigs/macosx64/mulet
+++ b/b2g/dev/config/mozconfigs/macosx64/mulet
@@ -1,8 +1,10 @@
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_PACKAGE_TESTS=0
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-application=b2g/dev
 ac_add_options --disable-install-strip
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-instruments
 ac_add_options --enable-dtrace
--- a/b2g/dev/config/mozconfigs/win32/mulet
+++ b/b2g/dev/config/mozconfigs/win32/mulet
@@ -1,6 +1,10 @@
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_L10N_CHECK=0
+MOZ_AUTOMATION_PACKAGE_TESTS=0
+MOZ_AUTOMATION_INSTALLER=0
 . "$topsrcdir/browser/config/mozconfigs/win32/nightly"
 
 ac_add_options --enable-application=b2g/dev
 
 # Include Firefox OS fonts.
 MOZTTDIR=$topsrcdir/moztt
--- a/build/mozconfig.win-common
+++ b/build/mozconfig.win-common
@@ -1,9 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if [ "x$IS_NIGHTLY" = "xyes" ]; then
   MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
   MOZ_AUTOMATION_UPDATE_PACKAGING=1
 fi
-MOZ_AUTOMATION_INSTALLER=1
+
+# Some builds (eg: Mulet) don't want the installer, so only set this if it
+# hasn't already been set.
+MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}