Bug 1415811 - Use TOOLTOOL_DIR if defined, else topsrcdir/commreltopsrcdir. r=frg
authorEdmund Wong <ewong@pw-wspx.org>
Mon, 13 Nov 2017 23:01:51 +0800
changeset 29369 f57390a5d6ddef0380e5be087fa4b96b340501bd
parent 29368 32a2cee5b0713085c06bb6ca8dd14eef9d1dae54
child 29370 00e527d74ef26e8f974f74b4a97676e5e0eb32b5
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg
bugs1415811
Bug 1415811 - Use TOOLTOOL_DIR if defined, else topsrcdir/commreltopsrcdir. r=frg
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/macosx64/nightly
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win64/nightly
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,12 +1,14 @@
-. "$topsrcdir/build/unix/mozconfig.linux32"
-. "$topsrcdir/build/mozconfig.stylo"
-. "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
-. "$topsrcdir/suite/config/mozconfigs/common"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+
+. "$TOOLTOOL_DIR/build/unix/mozconfig.linux32"
+. "$TOOLTOOL_DIR/build/mozconfig.stylo"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,12 +1,14 @@
-. "$topsrcdir/build/unix/mozconfig.linux"
-. "$topsrcdir/build/mozconfig.stylo"
-. "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
-. "$topsrcdir/suite/config/mozconfigs/common"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+
+. "$TOOLTOOL_DIR/build/unix/mozconfig.linux"
+. "$TOOLTOOL_DIR/build/mozconfig.stylo"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.linux.common"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/macosx64/nightly
+++ b/suite/config/mozconfigs/macosx64/nightly
@@ -1,11 +1,13 @@
-. $topsrcdir/build/macosx/mozconfig.common
-. $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
-. $topsrcdir/suite/config/mozconfigs/common
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+
+. $TOOLTOOL_DIR/build/macosx/mozconfig.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.macosx.common
+. $TOOLTOOL_DIR/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Package js shell
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,25 +1,27 @@
-. "$topsrcdir/build/mozconfig.comm-support"
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/build/mozconfig.stylo"
-. "$topsrcdir/build/win32/mozconfig.vs2015-win64"
-. "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
-. "$topsrcdir/suite/config/mozconfigs/common"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+
+. "$TOOLTOOL_DIR/build/mozconfig.comm-support"
+. "$TOOLTOOL_DIR/build/mozconfig.win-common"
+. "$TOOLTOOL_DIR/build/mozconfig.common"
+. "$TOOLTOOL_DIR/build/mozconfig.stylo"
+. "$TOOLTOOL_DIR/build/win32/mozconfig.vs2015-win64"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-. $topsrcdir/build/win32/mozconfig.vs-latest
+. $TOOLTOOL_DIR/build/win32/mozconfig.vs-latest
 
 # 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
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -1,14 +1,16 @@
-. "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/build/mozconfig.stylo"
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-. "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
-. "$topsrcdir/suite/config/mozconfigs/common"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/$commreltopsrcdir}
+
+. "$TOOLTOOL_DIR/build/mozconfig.win-common"
+. "$TOOLTOOL_DIR/build/mozconfig.common"
+. "$TOOLTOOL_DIR/build/mozconfig.stylo"
+. "$TOOLTOOL_DIR/build/win64/mozconfig.vs-latest"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/mozconfig.win.common"
+. "$TOOLTOOL_DIR/suite/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling