Bug 1424651: Move SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE to the Thunderbird specific mozconfig files; r=me
authorTom Prince <mozilla@hocat.ca>
Sun, 10 Dec 2017 23:53:28 -0700
changeset 29760 02fd46566f884ab908321e95b2bbb9d3f75535fe
parent 29759 37c896fb3de9745e6b594aed91011ff16738a8c7
child 29761 4a70bed624069fb0cfc9e2874cf24fb5535113e1
push id2108
push userclokep@gmail.com
push dateMon, 22 Jan 2018 17:53:55 +0000
treeherdercomm-beta@c44930d8ad9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1424651
Bug 1424651: Move SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE to the Thunderbird specific mozconfig files; r=me MozReview-Commit-ID: GkNGWv7YZLI
build/macosx/cross-mozconfig.common
build/macosx/local-mozconfig.common
build/mozconfig.win-common
build/unix/mozconfig.linux
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/linux64/release
mail/config/mozconfigs/macosx64/nightly
mail/config/mozconfigs/macosx64/release
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win32/release
mail/config/mozconfigs/win64/nightly
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -47,10 +47,8 @@ ac_add_options --target=x86_64-apple-dar
 ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
 
 if [ "x$MOZ_PKG_SPECIAL" != "xasan" -a -z "$MOZ_AUTOMATION_ARTIFACT_BUILDS" ]; then
   # Enable static analysis checks by default on OSX cross builds.
   # Exception is ASan, where this breaks.
   # The option is not valid on artifact builds, so don't add it there either.
   ac_add_options --enable-clang-plugin
 fi
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
--- a/build/macosx/local-mozconfig.common
+++ b/build/macosx/local-mozconfig.common
@@ -54,10 +54,8 @@ export LDFLAGS="$ldflags"
 if [ -z "$CC" ]; then
     export CC=clang
 fi
 
 # If not set use the system default clang++
 if [ -z "$CXX" ]; then
     export CXX=clang++
 fi
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
--- a/build/mozconfig.win-common
+++ b/build/mozconfig.win-common
@@ -6,12 +6,10 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
   # Some nightlies (eg: Mulet) don't want these set.
   MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
 fi
 
 # 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}
 
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token
-
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 export MAKECAB=$TOOLTOOL_DIR/makecab.exe
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -24,11 +24,9 @@ else
   CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
 fi
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
 
 # PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
 export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
 
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
-
 . "$topsrcdir/build/unix/mozconfig.gtk"
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -24,9 +24,11 @@ export MOZ_DEBUG_SYMBOLS=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
+
 . "$topsrcdir/build/mozconfig.cache"
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/release
@@ -23,8 +23,10 @@ export MOZ_DEBUG_SYMBOLS=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
+
+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -29,8 +29,10 @@ if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
   ac_add_options RUSTFLAGS='-C debuginfo=1'
 fi
 
 if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
   ac_add_options --disable-clang-plugin
 fi
+
+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/macosx64/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -26,8 +26,10 @@ if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
   ac_add_options RUSTFLAGS='-C debuginfo=1'
 fi
 
 if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
   ac_add_options --disable-clang-plugin
 fi
+
+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -32,8 +32,10 @@ export INCLUDE=$INCLUDE:/c/Office\ 2010\
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
 
 # Use the TOOLTOOL provided xz for mar generation.
 mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
+
+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -32,8 +32,10 @@ export INCLUDE=$INCLUDE:/c/Office\ 2010\
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
 
 # Use the TOOLTOOL provided xz for mar generation.
 mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
+
+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -31,8 +31,10 @@ export INCLUDE=$INCLUDE:/c/Office\ 2010\
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
 
 # Use the TOOLTOOL provided xz for mar generation.
 mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
+
+mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"