From 40286ca6ca2280b899ec1a2fdf44233e7d9a9bd6 Mon Sep 17 00:00:00 2001
From: ashwini <ashwini@unity3d.com>
Date: Wed, 8 May 2019 14:07:25 -0400
Subject: [PATCH] Switch windows to bokken

---
 .gitlab-ci.yml                               | 45 ++++++++++++++------
 external/buildscripts/build_runtime_vs.pl    |  5 +++
 external/buildscripts/build_win_no_cygwin.pl |  5 +++
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6dc6d8003b78..574492b0f459 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,13 +119,20 @@ build_android:
 build_win:
   stage: build
   tags:
-  - buildfarm
-  - windows
+    - bokken-job
+  variables:
+    BOKKEN_VM: build_win_vm
+    BOKKEN_JOB: |
+      resources:
+        - name: build_win_vm
+          image: platform-foundation/windows-mono-bokken:latest
+          flavor: b1.xlarge
+          type: Unity::VM
   script:
   - git submodule update --init --recursive
   - perl external/buildscripts/build_runtime_win64.pl --stevedorebuilddeps=1
-  - mkdir -p incomingbuilds/win64
-  - cp -r builds/* incomingbuilds/win64/
+  - powershell mkdir -p incomingbuilds/win64
+  - powershell cp -r builds/* incomingbuilds/win64/
   artifacts:
     paths:
     - incomingbuilds/win64
@@ -137,13 +144,20 @@ build_win:
 build_win_x86:
   stage: build
   tags:
-  - buildfarm
-  - windows
+    - bokken-job
+  variables:
+    BOKKEN_VM: build_win_x86_vm
+    BOKKEN_JOB: |
+      resources:
+        - name: build_win_x86_vm
+          image: platform-foundation/windows-mono-bokken:latest
+          flavor: b1.xlarge
+          type: Unity::VM
   script:
   - git submodule update --init --recursive
   - perl external/buildscripts/build_runtime_win.pl --stevedorebuilddeps=1
-  - mkdir -p incomingbuilds/win32
-  - cp -r builds/* incomingbuilds/win32/
+  - powershell mkdir -p incomingbuilds/win32
+  - powershell cp -r builds/* incomingbuilds/win32/
   artifacts:
     paths:
     - incomingbuilds/win32
@@ -155,13 +169,20 @@ build_win_x86:
 build_win_bare_minimum:
   stage: build
   tags:
-  - buildfarm
-  - windows
+    - bokken-job
+  variables:
+    BOKKEN_VM: build_win_bare_minimum
+    BOKKEN_JOB: |
+      resources:
+        - name: build_win_bare_minimum
+          image: platform-foundation/windows-mono-bokken:latest
+          flavor: b1.xlarge
+          type: Unity::VM
   script:
   - git submodule update --init --recursive
   - perl external/buildscripts/build_unityscript_bareminimum_win.pl
-  - mkdir -p incomingbuilds/bareminimum
-  - cp -r builds/* incomingbuilds/bareminimum/
+  - powershell mkdir -p incomingbuilds/bareminimum
+  - powershell cp -r builds/* incomingbuilds/bareminimum/
   artifacts:
     paths:
     - incomingbuilds/bareminimum
diff --git a/external/buildscripts/build_runtime_vs.pl b/external/buildscripts/build_runtime_vs.pl
index 5460b34408ba..41b6b65c9461 100644
--- a/external/buildscripts/build_runtime_vs.pl
+++ b/external/buildscripts/build_runtime_vs.pl
@@ -40,6 +40,11 @@ sub CompileVCProj
 	my $config;
 
 	my $msbuild = $ENV{"ProgramFiles(x86)"}."/MSBuild/$msBuildVersion/Bin/MSBuild.exe";
+	
+	if ((! -d $extraBuildTools) || ($ENV{YAMATO_PROJECT_ID}) || ($ENV{USERNAME} == "bokken"))
+	{
+		$msbuild = $ENV{"ProgramFiles(x86)"}."/Microsoft Visual Studio/2017/Professional/MSBuild/15.0/Bin/MSBuild.exe";
+	}
 
     $config = $debug ? "Debug" : "Release";
 	my $arch = $arch32 ? "Win32" : "x64";
diff --git a/external/buildscripts/build_win_no_cygwin.pl b/external/buildscripts/build_win_no_cygwin.pl
index f87fef338ef1..c83236146b5a 100644
--- a/external/buildscripts/build_win_no_cygwin.pl
+++ b/external/buildscripts/build_win_no_cygwin.pl
@@ -39,6 +39,11 @@
 my $buildDeps = "";
 my $stevedoreBuildDeps=1;
 
+if($ENV{YAMATO_PROJECT_ID} || ($ENV{USERNAME} == "bokken"))
+{
+	$msBuildVersion = "15.0";			
+}
+
 print(">>> Build All Args = @ARGV\n");
 
 GetOptions(