From 098482a936adc408b836d1d7fb5a32aa6a4ae393 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 6 Jun 2017 16:33:36 +0900
Subject: [PATCH] Bug 1356952 - Move tooltool manifests defined in toolchain
 build scripts to taskcluster job definitions. r=mshal

The toolchain build scripts are currently defining the tooltool
manifest they use on their own. We move the definitions to the
taskcluster job definitions to normalize on everything using that.

--HG--
extra : rebase_source : cbab2e32d78d711fcb595763d0c2600c7c0c423e
---
 taskcluster/ci/toolchain/linux.yml                       | 8 ++++++++
 taskcluster/ci/toolchain/macosx.yml                      | 6 ++++++
 taskcluster/ci/toolchain/windows.yml                     | 8 ++++++++
 taskcluster/scripts/misc/build-cctools-port-macosx.sh    | 1 -
 taskcluster/scripts/misc/build-cctools-port.sh           | 1 -
 taskcluster/scripts/misc/build-clang-linux.sh            | 1 -
 taskcluster/scripts/misc/build-clang-macosx.sh           | 1 -
 taskcluster/scripts/misc/build-clang-tidy-linux.sh       | 1 -
 taskcluster/scripts/misc/build-clang-tidy-macosx.sh      | 1 -
 taskcluster/scripts/misc/build-clang-windows-helper32.sh | 3 +--
 taskcluster/scripts/misc/build-clang-windows-helper64.sh | 3 +--
 taskcluster/scripts/misc/build-hfsplus-linux.sh          | 1 -
 12 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml
index 43181debc6ed..1498b86dcb13 100644
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -13,6 +13,8 @@ linux64-clang:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
     run:
         using: toolchain-script
         script: build-clang-linux.sh
@@ -35,6 +37,8 @@ linux64-clang-tidy:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy-linux.sh
@@ -89,6 +93,8 @@ linux64-cctools-port:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest"
     run:
         using: toolchain-script
         script: build-cctools-port.sh
@@ -107,6 +113,8 @@ linux64-hfsplus:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest"
     run:
         using: toolchain-script
         script: build-hfsplus-linux.sh
diff --git a/taskcluster/ci/toolchain/macosx.yml b/taskcluster/ci/toolchain/macosx.yml
index 161e0a3a03c8..c50a7c1c0646 100644
--- a/taskcluster/ci/toolchain/macosx.yml
+++ b/taskcluster/ci/toolchain/macosx.yml
@@ -13,6 +13,8 @@ macosx64-clang:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         using: toolchain-script
         script: build-clang-macosx.sh
@@ -35,6 +37,8 @@ macosx64-clang-tidy:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy-macosx.sh
@@ -55,6 +59,8 @@ macosx64-cctools-port:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         using: toolchain-script
         script: build-cctools-port-macosx.sh
diff --git a/taskcluster/ci/toolchain/windows.yml b/taskcluster/ci/toolchain/windows.yml
index 0e40ddd3244c..cd947f17ab55 100644
--- a/taskcluster/ci/toolchain/windows.yml
+++ b/taskcluster/ci/toolchain/windows.yml
@@ -12,6 +12,8 @@ win32-clang-cl:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang32-windows.sh
@@ -29,6 +31,8 @@ win64-clang-cl:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang64-windows.sh
@@ -49,6 +53,8 @@ win32-clang-tidy:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy32-windows.sh
@@ -69,6 +75,8 @@ win64-clang-tidy:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy64-windows.sh
diff --git a/taskcluster/scripts/misc/build-cctools-port-macosx.sh b/taskcluster/scripts/misc/build-cctools-port-macosx.sh
index 1093d97a405e..806199cdec4d 100755
--- a/taskcluster/scripts/misc/build-cctools-port-macosx.sh
+++ b/taskcluster/scripts/misc/build-cctools-port-macosx.sh
@@ -30,7 +30,6 @@ echo "Building from commit hash `git rev-parse $CROSSTOOL_PORT_REV`..."
 
 # Fetch clang from tooltool
 cd $WORKSPACE/build/src
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/macosx64/cross-clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # Configure crosstools-port
diff --git a/taskcluster/scripts/misc/build-cctools-port.sh b/taskcluster/scripts/misc/build-cctools-port.sh
index bc6c6b033883..2205995dbd66 100755
--- a/taskcluster/scripts/misc/build-cctools-port.sh
+++ b/taskcluster/scripts/misc/build-cctools-port.sh
@@ -26,7 +26,6 @@ echo "Building from commit hash `git rev-parse $CROSSTOOL_PORT_REV`..."
 
 # Fetch clang from tooltool
 cd $WORKSPACE/build/src
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # Configure crosstools-port
diff --git a/taskcluster/scripts/misc/build-clang-linux.sh b/taskcluster/scripts/misc/build-clang-linux.sh
index 8af0d7afb93b..a0d1110b80dd 100755
--- a/taskcluster/scripts/misc/build-clang-linux.sh
+++ b/taskcluster/scripts/misc/build-clang-linux.sh
@@ -9,7 +9,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/releng.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # gets a bit too verbose here
diff --git a/taskcluster/scripts/misc/build-clang-macosx.sh b/taskcluster/scripts/misc/build-clang-macosx.sh
index 212917038f9a..af62e140dea3 100755
--- a/taskcluster/scripts/misc/build-clang-macosx.sh
+++ b/taskcluster/scripts/misc/build-clang-macosx.sh
@@ -8,7 +8,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/macosx64/cross-clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # ld needs libLTO.so from llvm
diff --git a/taskcluster/scripts/misc/build-clang-tidy-linux.sh b/taskcluster/scripts/misc/build-clang-tidy-linux.sh
index b08b085b5b92..21c6987d8d2f 100755
--- a/taskcluster/scripts/misc/build-clang-tidy-linux.sh
+++ b/taskcluster/scripts/misc/build-clang-tidy-linux.sh
@@ -9,7 +9,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/releng.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # gets a bit too verbose here
diff --git a/taskcluster/scripts/misc/build-clang-tidy-macosx.sh b/taskcluster/scripts/misc/build-clang-tidy-macosx.sh
index 3679d130ae93..ef52f5ffd741 100755
--- a/taskcluster/scripts/misc/build-clang-tidy-macosx.sh
+++ b/taskcluster/scripts/misc/build-clang-tidy-macosx.sh
@@ -8,7 +8,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/macosx64/cross-clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # ld needs libLTO.so from llvm
diff --git a/taskcluster/scripts/misc/build-clang-windows-helper32.sh b/taskcluster/scripts/misc/build-clang-windows-helper32.sh
index df5b2f007da1..89ced5cc6c92 100755
--- a/taskcluster/scripts/misc/build-clang-windows-helper32.sh
+++ b/taskcluster/scripts/misc/build-clang-windows-helper32.sh
@@ -13,8 +13,7 @@ if [ ! -e ${TOOLTOOL_AUTH_FILE} ]; then
     exit 1
 fi
 
-TOOLTOOL_MANIFEST=build/src/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
-./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
+./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "build/src/${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
 
 # Set up all the Visual Studio paths.
 MSVC_DIR=vs2015u3
diff --git a/taskcluster/scripts/misc/build-clang-windows-helper64.sh b/taskcluster/scripts/misc/build-clang-windows-helper64.sh
index 223b47556132..da62605b570a 100755
--- a/taskcluster/scripts/misc/build-clang-windows-helper64.sh
+++ b/taskcluster/scripts/misc/build-clang-windows-helper64.sh
@@ -13,8 +13,7 @@ if [ ! -e ${TOOLTOOL_AUTH_FILE} ]; then
     exit 1
 fi
 
-TOOLTOOL_MANIFEST=build/src/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
-./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
+./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "build/src/${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
 
 # Set up all the Visual Studio paths.
 MSVC_DIR=vs2015u3
diff --git a/taskcluster/scripts/misc/build-hfsplus-linux.sh b/taskcluster/scripts/misc/build-hfsplus-linux.sh
index 4f7428c8b008..3551bf726631 100755
--- a/taskcluster/scripts/misc/build-hfsplus-linux.sh
+++ b/taskcluster/scripts/misc/build-hfsplus-linux.sh
@@ -8,7 +8,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 export PATH=$PATH:$HOME_DIR/src/clang/bin