Move config files to match job configs

- The env variables that change the build configs are now defined in the
  config file.

Change-Id: Ia9428667bfd00f640a416ca2c31f155a9e9baef9

kokoro/windows/build.bat

@@ -1,10 +1,14 @@
 :: Copyright 2017 Google Inc. All Rights Reserved.
-set OUTPUT_DIRECTORY=Release_x64
-set GYP_DEFINES=target_arch=x64
-
 set ROOTDIR=%cd%
 set PACKAGERDIR=%ROOTDIR%\git\src
 
+set GYP_DEFINES="target_arch=%PLATFORM%"
+if "%PLATFORM%"=="x64" (
+  set OUTPUT_DIRECTORY="out\%CONFIGURATION%_x64"
+) else (
+  set OUTPUT_DIRECTORY="out\%CONFIGURATION%"
+)
+
 :: TODO(rkuroiwa): Put this in a batch script and source it, so that this
 :: doesn't need to be copied for all configurations.
 git clone "https://chromium.googlesource.com/chromium/tools/depot_tools.git" depot_tools
@@ -23,8 +27,8 @@ call %DEPOTTOOLSDIR%\gclient sync
 echo on
 
 cd src
-%DEPOTTOOLSDIR%\ninja -C "out\%OUTPUT_DIRECTORY%" -k 100
+%DEPOTTOOLSDIR%\ninja -C "%OUTPUT_DIRECTORY%" -k 100
 
-copy "out\%OUTPUT_DIRECTORY%\packager.exe" packager-win.exe
+copy "%OUTPUT_DIRECTORY%\packager.exe" packager-win.exe
-for %%f in ("out\%OUTPUT_DIRECTORY%\*_*test.exe") do (%%f || exit /b 666)
+for %%f in ("%OUTPUT_DIRECTORY%\*_*test.exe") do (%%f || exit /b 666)
-python "out\%OUTPUT_DIRECTORY%\packager_test.py" -v
+python "%OUTPUT_DIRECTORY%\packager_test.py" -v

kokoro/windows/x64/continuous.cfg

@@ -1 +0,0 @@
-build_file: "src/kokoro/windows/x64/build.bat"

kokoro/windows/x64/debug.cfg

@@ -0,0 +1,11 @@
+build_file: "src/kokoro/windows/build.bat"
+
+env_vars {
+  key: "PLATFORM"
+  value: "x64"
+}
+
+env_vars {
+  key: "CONFIGURATION"
+  value: "Debug"
+}

kokoro/windows/x64/presubmit.cfg

@@ -1 +0,0 @@
-build_file: "src/kokoro/windows/x64/build.bat"

kokoro/windows/x64/release.cfg

@@ -0,0 +1,11 @@
+build_file: "src/kokoro/windows/build.bat"
+
+env_vars {
+  key: "PLATFORM"
+  value: "x64"
+}
+
+env_vars {
+  key: "CONFIGURATION"
+  value: "Release"
+}

kokoro/windows/x86/debug.cfg

@@ -0,0 +1,11 @@
+build_file: "src/kokoro/windows/build.bat"
+
+env_vars {
+  key: "PLATFORM"
+  value: "x86"
+}
+
+env_vars {
+  key: "CONFIGURATION"
+  value: "Debug"
+}

kokoro/windows/x86/release.cfg

@@ -0,0 +1,11 @@
+build_file: "src/kokoro/windows/build.bat"
+
+env_vars {
+  key: "PLATFORM"
+  value: "x86"
+}
+
+env_vars {
+  key: "CONFIGURATION"
+  value: "Release"
+}