Bug 1478995 - Add node toolchain path to automation mozconfigs, r=gps

MozReview-Commit-ID: 37gYPLYJD85 --HG-- extra : rebase_source : a0b1cb598eeb852b7df1912a94a085d31862c86f
trman · Jun 1, 2018 · 9fc855e · 9fc855e
1 parent d2201e2
commit 9fc855e
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 0 deletions.
diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,6 +1,7 @@
 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"
 

diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
@@ -1,6 +1,7 @@
 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"
 

diff --git a/browser/config/mozconfigs/linux64/hazards b/browser/config/mozconfigs/linux64/hazards
@@ -40,4 +40,6 @@ CFLAGS="$CFLAGS -Wno-attributes"
 CPPFLAGS="$CPPFLAGS -Wno-attributes"
 CXXFLAGS="$CXXFLAGS -Wno-attributes"
 
+NODEJS="$TOOLTOOL_DIR/node/bin/node"
+
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -3,6 +3,7 @@ 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
 

diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
@@ -3,6 +3,7 @@ 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
 

diff --git a/browser/config/mozconfigs/linux64/plain-opt b/browser/config/mozconfigs/linux64/plain-opt
@@ -6,6 +6,8 @@ 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++"
 

diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -13,6 +13,9 @@ 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

diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@@ -13,6 +13,9 @@ 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

diff --git a/browser/config/mozconfigs/macosx64/repack b/browser/config/mozconfigs/macosx64/repack
@@ -4,4 +4,5 @@
 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
diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -5,6 +5,9 @@ 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

diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
@@ -5,6 +5,9 @@ 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

diff --git a/browser/config/mozconfigs/win64/l10n-mozconfig b/browser/config/mozconfigs/win64/l10n-mozconfig
@@ -6,6 +6,9 @@ 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

diff --git a/browser/config/mozconfigs/win64/l10n-mozconfig-devedition b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
@@ -6,6 +6,9 @@ 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

diff --git a/browser/config/mozconfigs/win64/plain-opt b/browser/config/mozconfigs/win64/plain-opt
@@ -7,6 +7,8 @@ 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
 

diff --git a/build/mozconfig.common b/build/mozconfig.common
@@ -19,6 +19,7 @@ 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"
diff --git a/build/mozconfig.node 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
diff --git a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
@@ -15,6 +15,8 @@ mk_add_options AUTOCLOBBER=
 
 # 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}

diff --git a/mobile/android/config/mozconfigs/android-api-16/l10n-nightly b/mobile/android/config/mozconfigs/android-api-16/l10n-nightly
@@ -15,6 +15,8 @@ mk_add_options AUTOCLOBBER=
 
 # 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}

diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -15,6 +15,8 @@ mk_add_options AUTOCLOBBER=
 
 # 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}