Bug 1478995 - Add node toolchain path to automation mozconfigs, r=gps
authorDan Mosedale <dmose@meer.net>
Fri, 01 Jun 2018 14:59:45 -0700
changeset 484698 51795a3214ea428b69c324d62a59f4a5ff7007dd
parent 484697 98578393d6357aa701b062b231ed867209b9825c
child 484699 13f6f213eecd82a9b1a0651fd4ccc8a26b9375f7
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1478995
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1478995 - Add node toolchain path to automation mozconfigs, r=gps MozReview-Commit-ID: 37gYPLYJD85
browser/config/mozconfigs/linux32/l10n-mozconfig
browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
browser/config/mozconfigs/linux64/hazards
browser/config/mozconfigs/linux64/l10n-mozconfig
browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
browser/config/mozconfigs/linux64/plain-opt
browser/config/mozconfigs/macosx64/l10n-mozconfig
browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
browser/config/mozconfigs/macosx64/repack
browser/config/mozconfigs/win32/l10n-mozconfig
browser/config/mozconfigs/win32/l10n-mozconfig-devedition
browser/config/mozconfigs/win64/l10n-mozconfig
browser/config/mozconfigs/win64/l10n-mozconfig-devedition
browser/config/mozconfigs/win64/plain-opt
build/mozconfig.common
build/mozconfig.node
mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
mobile/android/config/mozconfigs/android-api-16/l10n-nightly
mobile/android/config/mozconfigs/android-x86/l10n-nightly
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,11 +1,12 @@
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --disable-nodejs
 
 . "$topsrcdir/build/mozconfig.no-compile"
 
 if test `uname -m` = "x86_64"; then
   ac_add_options --target=i686-pc-linux
   ac_add_options --host=i686-pc-linux
 fi
 
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
@@ -1,11 +1,12 @@
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --disable-nodejs
 
 . "$topsrcdir/build/mozconfig.no-compile"
 
 if test `uname -m` = "x86_64"; then
   ac_add_options --target=i686-pc-linux
   ac_add_options --host=i686-pc-linux
 fi
 
--- a/browser/config/mozconfigs/linux64/hazards
+++ b/browser/config/mozconfigs/linux64/hazards
@@ -35,9 +35,11 @@ ac_add_options --with-compiler-wrapper=$
 ac_add_options --without-ccache
 
 ac_add_options --disable-replace-malloc
 
 CFLAGS="$CFLAGS -Wno-attributes"
 CPPFLAGS="$CPPFLAGS -Wno-attributes"
 CXXFLAGS="$CXXFLAGS -Wno-attributes"
 
+NODEJS="$TOOLTOOL_DIR/node/bin/node"
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,13 +1,14 @@
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.no-compile"
+ac_add_options --disable-nodejs
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
@@ -1,13 +1,14 @@
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 
 . "$topsrcdir/build/mozconfig.no-compile"
+ac_add_options --disable-nodejs
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/linux64/plain-opt
+++ b/browser/config/mozconfigs/linux64/plain-opt
@@ -1,13 +1,15 @@
 export TOOLTOOL_DIR="$topsrcdir"
 export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
 
 CARGO="${TOOLTOOL_DIR}/rustc/bin/cargo"
 RUSTC="${TOOLTOOL_DIR}/rustc/bin/rustc"
 RUSTDOC="${TOOLTOOL_DIR}/rustc/bin/rustdoc"
 RUSTFMT="${TOOLTOOL_DIR}/rustc/bin/rustfmt"
 
+export NODEJS="${TOOLTOOL_DIR}/node/bin/node"
+
 CC="${TOOLTOOL_DIR}/gcc/bin/gcc"
 CXX="${TOOLTOOL_DIR}/gcc/bin/g++"
 
 mk_add_options "export PATH=${TOOLTOOL_DIR}/gcc/bin:${PATH}"
 mk_add_options "export LD_LIBRARY_PATH=${TOOLTOOL_DIR}/gcc/lib64:${TOOLTOOL_DIR}/gcc/lib32:${TOOLTOOL_DIR}/gcc/lib"
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -8,16 +8,19 @@ if test `uname -s` = "Linux"; then
   export DMG_TOOL=$topsrcdir/dmg/dmg
   export HFS_TOOL=$topsrcdir/dmg/hfsplus
 fi
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
+ac_add_options --disable-nodejs
+unset NODEJS
+
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@@ -8,16 +8,19 @@ if test `uname -s` = "Linux"; then
   export DMG_TOOL=$topsrcdir/dmg/dmg
   export HFS_TOOL=$topsrcdir/dmg/hfsplus
 fi
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 
+ac_add_options --disable-nodejs
+unset NODEJS
+
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
--- a/browser/config/mozconfigs/macosx64/repack
+++ b/browser/config/mozconfigs/macosx64/repack
@@ -1,7 +1,8 @@
 # This mozconfig is responsible merely for getting the cross tools setup
 # for repacking a .tar into a .dmg as returned from signing.
 
 export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
 export DMG_TOOL=$topsrcdir/dmg/dmg
 export HFS_TOOL=$topsrcdir/dmg/hfsplus
+export NODEJS=$topsrcdir/node/bin/node
 ac_add_options --disable-compile-environment
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -1,15 +1,18 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/nightly
 
+ac_add_options --disable-nodejs
+unset NODEJS
+
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
@@ -1,15 +1,18 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/aurora
 
+ac_add_options --disable-nodejs
+unset NODEJS
+
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig
@@ -1,16 +1,19 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/nightly
 
+ac_add_options --disable-nodejs
+unset NODEJS
+
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
@@ -1,16 +1,19 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-branding=browser/branding/aurora
 
+ac_add_options --disable-nodejs
+unset NODEJS
+
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
--- a/browser/config/mozconfigs/win64/plain-opt
+++ b/browser/config/mozconfigs/win64/plain-opt
@@ -2,12 +2,14 @@ TOOLTOOL_DIR=${topsrcdir}
 export MAKECAB=$TOOLTOOL_DIR/makecab.exe
 export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
 
 RUSTC="${TOOLTOOL_DIR}/rustc/bin/rustc"
 CARGO="${TOOLTOOL_DIR}/rustc/bin/cargo"
 RUSTDOC="${TOOLTOOL_DIR}/rustc/bin/rustdoc"
 RUSTFMT="${TOOLTOOL_DIR}/rustc/bin/rustfmt"
 
+NODEJS="${TOOLTOOL_DIR}/node/node.exe"
+
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -14,11 +14,12 @@ mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
 
 ac_add_options --enable-js-shell
 
+. "$topsrcdir/build/mozconfig.node"
 . "$topsrcdir/build/mozconfig.automation"
 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.cache"
new file mode 100644
--- /dev/null
+++ b/build/mozconfig.node
@@ -0,0 +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/.
+
+case "$(uname -s)" in
+MINGW*)
+    export NODEJS=$topsrcdir/node/node.exe
+    ;;
+*)
+    export NODEJS=$topsrcdir/node/bin/node
+    ;;
+esac
--- a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
@@ -10,13 +10,15 @@ ac_add_options --with-l10n-base=../../l1
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Global options
 ac_add_options --disable-tests
+ac_add_options --disable-nodejs
+unset NODEJS
 
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-16/l10n-nightly
@@ -10,13 +10,15 @@ ac_add_options --with-l10n-base=../../l1
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Global options
 ac_add_options --disable-tests
+ac_add_options --disable-nodejs
+unset NODEJS
 
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -10,13 +10,15 @@ ac_add_options --with-l10n-base=../../l1
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Global options
 ac_add_options --disable-tests
+ac_add_options --disable-nodejs
+unset NODEJS
 
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"