Bug 1177025 - [Tracking bug] SeaMonkey 2.35 release: Need to export the SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE env in order to uploadsymbols. r=Callek a=release on a CLOSED TREE SEAMONKEY_2_35_RELEASE_BRANCH SEAMONKEY_2_35_BUILD3 SEAMONKEY_2_35_RELEASE
authorEdmund Wong <ewong@pw-wspx.org>
Wed, 26 Aug 2015 08:37:58 +0800
branchSEAMONKEY_2_35_RELEASE_BRANCH
changeset 31208 b939f5c5904d165bf56a26ffa1a1b46b3b03ed5b
parent 31207 f23c75f0d371ee54d3935ad5faee03bd96cdcefa
child 31209 54e98f75543051fb9f11b22dcc96162095849afb
push id1
push userclokep@gmail.com
push dateMon, 07 May 2018 22:45:56 +0000
treeherdercomm-esr60@57eacde5ef40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, release
bugs1177025
Bug 1177025 - [Tracking bug] SeaMonkey 2.35 release: Need to export the SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE env in order to uploadsymbols. r=Callek a=release on a CLOSED TREE
build/macosx/mozconfig.common
build/mozconfig.win-common
build/unix/mozconfig.linux
suite/config/mozconfigs/win32/release
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -28,8 +28,10 @@ if [ -z "$CC" ]; then
 fi
 
 # If not set use the system default clang++
 if [ -z "$CXX" ]; then
     export CXX=clang++
 fi
 
 . "$topsrcdir/build/mozconfig.cache"
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
new file mode 100644
--- /dev/null
+++ b/build/mozconfig.win-common
@@ -0,0 +1,16 @@
+# 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
+  # 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
+# hasn't already been set.
+MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -34,8 +34,10 @@ if [ -d "$topsrcdir/gtk3" ]; then
   export PKG_CONFIG_SYSROOT_DIR="$topsrcdir/gtk3"
   export PKG_CONFIG_PATH="$topsrcdir/gtk3/usr/local/lib/pkgconfig"
   export PATH="$topsrcdir/gtk3/usr/local/bin:${PATH}"
   # Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
   LDFLAGS="-L$topsrcdir/gtk3/usr/local/lib"
   mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib"
   ac_add_options --enable-default-toolkit=cairo-gtk3
 fi
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,8 +1,9 @@
+. "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-tests
 
@@ -11,10 +12,17 @@ ac_add_options --enable-tests
 ac_add_options --disable-gamepad
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# To enable MSVC 2010 building
-. $topsrcdir/build/win32/mozconfig.vs2010
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
+else
+  . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+# Set up mapi includes (must be done after visual studio setup)
+export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
+mk_export_correct_style INCLUDE