Bug 1356683 - Use new tooltool wrapper for Windows Spidermonkey builds. r?chmanchester draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 12 Apr 2017 17:46:34 +0900
changeset 563039 37f9f677fd50bb17eb10df45312a5c189c005ee2
parent 563038 ef32cc3f15cac23d7818025784a50b03cc6f0b87
child 563040 422d2ea930f6daf35973b9cea1341ca913dd8f2b
push id54195
push userbmo:mh+mozilla@glandium.org
push dateFri, 14 Apr 2017 21:59:19 +0000
reviewerschmanchester
bugs1356683
milestone55.0a1
Bug 1356683 - Use new tooltool wrapper for Windows Spidermonkey builds. r?chmanchester
js/src/devtools/automation/winbuildenv.sh
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -26,11 +26,11 @@ else
 fi
 
 # PATH also needs to point to mozmake.exe, which can come from either
 # newer mozilla-build or tooltool.
 if ! which mozmake 2>/dev/null; then
     export PATH="$PATH:$SOURCE/.."
     if ! which mozmake 2>/dev/null; then
   TT_SERVER=${TT_SERVER:-https://api.pub.build.mozilla.org/tooltool/}
-  ( cd $SOURCE/..; ./scripts/scripts/tooltool/tooltool_wrapper.sh $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest $TT_SERVER setup.sh c:/mozilla-build/python27/python.exe C:/mozilla-build/tooltool.py )
+  ( cd $SOURCE/..; $SOURCE/mach artifact toolchain -v --tooltool-manifest $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest --tooltool-url $TT_SERVER --retry 4 )
     fi
 fi