Bug 1142335 - Port mozconfig changes from Bug 1141534 to c-c. r=jcranmer a=bustage fix on CLOSED TREE
authoraleth <aleth@instantbird.org>
Tue, 10 Mar 2015 11:25:00 +0100
changeset 28670 d1ca2cc2bd7e42619264362461deb766c9f511f3
parent 28669 f04bb162851a1c327797d98f778b3722e02c2ba4
child 28671 7f567330c710c27c487e08867bfc12f654effa3e
child 28673 edafc098a2a36540f08f96b9e24d2c27cd4b769e
child 28680 a1a18e559d0d05d2d3f2e54f2e9ad7b3fd14cb9c
push id2272
push userkent@caspia.com
push dateThu, 12 Mar 2015 04:17:31 +0000
treeherdertry-comm-central@dfabb9ff45f7 [default view] [failures only]
reviewersjcranmer, bustage
bugs1142335, 1141534
Bug 1142335 - Port mozconfig changes from Bug 1141534 to c-c. r=jcranmer a=bustage fix on CLOSED TREE
build/macosx/mozconfig.common
build/unix/mozconfig.linux
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -1,17 +1,18 @@
 # 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/.
 
 MOZ_AUTOMATION_L10N_CHECK=0
 
 if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+  # 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}
 fi
 . "$topsrcdir/build/mozconfig.common"
 
 if [ -d "$topsrcdir/clang" ]; then
     # mozilla-central based build
     export CC=$topsrcdir/clang/bin/clang
     export CXX=$topsrcdir/clang/bin/clang++
     export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -1,11 +1,12 @@
 if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+  # 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}
 fi
 
 . "$topsrcdir/build/mozconfig.common"
 
 # some b2g desktop builds still happen on i686 machines, and the tooltool
 # toolchain is x86_64 only.
 # We also deal with valgrind builds here, they don't use tooltool manifests at
 # all yet.