Merge pull request #22 from rust-lang/msvc-32

Add msvc-32 builders

Author: brson

master/master.cfg

@@ -131,6 +131,7 @@ auto_platforms_prod = [
     "win-gnu-64-opt",
     #"win-gnu-64-nopt-c",
     "win-gnu-64-nopt-t",
+    "win-msvc-32-opt",
     "win-msvc-64-opt",
 
     # Tier 2 platforms, also modify nogate_builders
@@ -143,9 +144,9 @@ auto_platforms_prod = [
 try_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "mac"]
 snap_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "mac", "bitrig-64",
                        "freebsd10_32-1", "freebsd10_64-1"]
-dist_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-64", "mac"]
+dist_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-32", "win-msvc-64", "mac"]
 cargo_platforms_prod = ["linux-32", "linux-64", "mac-32", "mac-64", "win-gnu-32", 
-                        "win-gnu-64", "win-msvc-64", "bitrig-64"]
+                        "win-gnu-64", "win-msvc-32", "win-msvc-64", "bitrig-64"]
 
 # Development configuration
 auto_platforms_dev = [
@@ -160,6 +161,7 @@ auto_platforms_dev = [
     "win-gnu-32-nopt-t",
     "win-gnu-64-opt",
     "win-gnu-64-nopt-t",
+    "win-msvc-32-opt",
     "win-msvc-64-opt",
 
     "bitrig-64-opt",
@@ -171,9 +173,9 @@ auto_platforms_dev = [
 try_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64"]
 snap_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "bitrig-64",
                       "freebsd10_32-1", "freebsd10_64-1"]
-dist_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-64"]
+dist_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-32", "win-msvc-64"]
 cargo_platforms_dev = ["linux-32", "linux-64", "win-gnu-32", "win-gnu-64", 
-                       "bitrig-64", "win-msvc-64"]
+                       "bitrig-64", "win-msvc-32", "win-msvc-64"]
 
 if env == "prod":
     auto_platforms = auto_platforms_prod
@@ -194,11 +196,12 @@ else:
 nogate_builders = [
     "auto-bitrig-64-opt", 
     "auto-linux-musl-64-opt",
+    "auto-win-msvc-32-opt",
     "auto-win-msvc-64-opt",
     "auto-freebsd10_32-1",
     "auto-freebsd10_64-1"
 ]
-dist_nogate_platforms = ["win-msvc-64"]
+dist_nogate_platforms = ["win-msvc-32", "win-msvc-64"]
 
 
 ####### BUILDSLAVES
@@ -671,6 +674,10 @@ class CommandEnv(object):
                 env["MSYSTEM"] = "MINGW64"
                 env["PATH"] = win64toolchain + ";c:\\msys64\\usr\\bin;${PATH};c:\\msys64\\mingw64\\bin"
 
+            if "win-msvc-64" in props["buildername"]:
+                env["MACHTYPE"] = "i686-pc-win32"
+                env["MSYSTEM"] = "MINGW32"
+                env["PATH"] = win32toolchain + ";c:\\msys64\\mingw32\\bin;c:\\msys64\\usr\\bin;${PATH}"
             if "win-msvc-64" in props["buildername"]:
                 env["MACHTYPE"] = "x86_64-pc-win32"
                 env["MSYSTEM"] = "MINGW64"