Drop 15rc* and add 15u0

26 files changed, 15 insertions, 209 deletions

diff --git a/INSTALL b/INSTALL
index b8f0232..7656d2a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ form:
 Where:
 
 <tool>     is one of 'cl' 'link' 'lib' 'mt' 'rc'
-<version>  is the Visual Studio version, for example, 11, 12, 14u2, 15rc1
+<version>  is the Visual Studio version, for example, 11, 12, 14u3, 15rc1
 <target>   is the compiler target, for example, 32 (x86), 64 (x86_64).
 
 There are also the "configuration" scripts, msvc-NN/msvc-<version>-<target>,
@@ -263,8 +263,6 @@ The following overrides are necessary because of some unimplemented functions:
 Copy and Setup Visual Studio 15
 -------------------------------
 
-Note: based on 15RC1.
-
 Note: 15 uses the same CRT runtime DLL version (140) as 14. If using together,
       then it makes sense to use versions from 15 which are claimed to be
       backwards compatible. The same probably applies to the SDK tools.
@@ -290,7 +288,7 @@ $ etc/lowercase-headers \
 Installing via the redistributable DLLs still does not work as of Wine 1.9.8.
 Instead, we have to manually copy a bunch of DLLs from:
 
-.wine/.../VC/Redist/MSVC/14.10.24629/{x86 x64}/Microsoft.VC150.CRT/
+.wine/.../VC/Redist/MSVC/14.10.NNNNN/{x86 x64}/Microsoft.VC150.CRT/
 
 And:
 
diff --git a/buildfile b/buildfile
index d3ee204..44d460f 100644
--- a/buildfile
+++ b/buildfile
@@ -23,13 +23,9 @@ s = cl-11-32     lib-11-32     link-11-32     mt-11-32     rc-11-32     \
     cl-14u3-64   lib-14u3-64   link-14u3-64   mt-14u3-64   rc-14u3-64   \
     msvc-14/{msvc-14u3-32 msvc-14u3-64}                                 \
                                                                         \
-    cl-15rc1-32  lib-15rc1-32  link-15rc1-32  mt-15rc1-32  rc-15rc1-32  \
-    cl-15rc1-64  lib-15rc1-64  link-15rc1-64  mt-15rc1-64  rc-15rc1-64  \
-    msvc-15/{msvc-15rc1-32 msvc-15rc1-64}                               \
-                                                                        \
-    cl-15rc2-32  lib-15rc2-32  link-15rc2-32  mt-15rc2-32  rc-15rc2-32  \
-    cl-15rc2-64  lib-15rc2-64  link-15rc2-64  mt-15rc2-64  rc-15rc2-64  \
-    msvc-15/{msvc-15rc2-32 msvc-15rc2-64}                               \
+    cl-15u0-32   lib-15u0-32   link-15u0-32   mt-15u0-32   rc-15u0-32   \
+    cl-15u0-64   lib-15u0-64   link-15u0-64   mt-15u0-64   rc-15u0-64   \
+    msvc-15/{msvc-15u0-32 msvc-15u0-64}                                 \
                                                                         \
     msvc-dispatch                                                       \
                                                                         \
diff --git a/cl-15rc1-32 b/cl-15u0-32
index 0d34aea..0d34aea 100755
--- a/cl-15rc1-32
+++ b/cl-15u0-32
diff --git a/cl-15rc1-64 b/cl-15u0-64
index 0d34aea..0d34aea 100755
--- a/cl-15rc1-64
+++ b/cl-15u0-64
diff --git a/cl-15rc2-32 b/lib-15u0-32
index 0d34aea..0d34aea 100755
--- a/cl-15rc2-32
+++ b/lib-15u0-32
diff --git a/cl-15rc2-64 b/lib-15u0-64
index 0d34aea..0d34aea 100755
--- a/cl-15rc2-64
+++ b/lib-15u0-64
diff --git a/link-15rc2-32 b/link-15rc2-32
deleted file mode 100755
index 0d34aea..0000000
--- a/link-15rc2-32
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/link-15rc2-64 b/link-15rc2-64
deleted file mode 100755
index 0d34aea..0000000
--- a/link-15rc2-64
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/lib-15rc1-32 b/link-15u0-32
index 0d34aea..0d34aea 100755
--- a/lib-15rc1-32
+++ b/link-15u0-32
diff --git a/lib-15rc1-64 b/link-15u0-64
index 0d34aea..0d34aea 100755
--- a/lib-15rc1-64
+++ b/link-15u0-64
diff --git a/msvc-15/msvc-15rc2-32 b/msvc-15/msvc-15rc2-32
deleted file mode 100755
index 70248e2..0000000
--- a/msvc-15/msvc-15rc2-32
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : msvc-15/msvc-15rc2-32
-# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# MSVC 15RC2 32-bit setup/configuration (note: using 64-to-32 cross-compiler).
-#
-# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
-#
-if [ -z "$MSVC_INSTALLDIR" ]; then
-  MSVC_INSTALLDIR="Microsoft Visual Studio 15.0"
-fi
-
-if [ -z "$MSVC_SDKVERSION" ]; then
-  source "$src_dir/msvc-common/msvc-sdk-common"
-  MSVC_SDKVERSION="$(windows10_sdkversion)"
-fi
-
-# SDK
-#
-SDK="C:\\Program Files (x86)\\Windows Kits\\10"
-SDKBIN="$SDK\\bin\\x86"
-SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
-
-INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
-LIB="$SDK\\lib\\$SDKVER\\um\\x86"
-
-# CRT
-#
-CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
-
-INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
-LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
-
-# VC
-#
-VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.24728"
-VCBIN="$VC\\bin\\HostX64\\x86"
-VCDLL="$VC\\bin\\HostX64\\x64"
-
-INCLUDE="$VC\\include;$INCLUDE"
-LIB="$VC\\lib\\x86;$LIB"
diff --git a/msvc-15/msvc-15rc2-64 b/msvc-15/msvc-15rc2-64
deleted file mode 100755
index 53c2fd5..0000000
--- a/msvc-15/msvc-15rc2-64
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : msvc-15/msvc-15rc2-64
-# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license   : MIT; see accompanying LICENSE file
-
-# MSVC 15RC2 64-bit setup/configuration.
-#
-# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
-#
-if [ -z "$MSVC_INSTALLDIR" ]; then
-  MSVC_INSTALLDIR="Microsoft Visual Studio 15.0"
-fi
-
-if [ -z "$MSVC_SDKVERSION" ]; then
-  source "$src_dir/msvc-common/msvc-sdk-common"
-  MSVC_SDKVERSION="$(windows10_sdkversion)"
-fi
-
-# SDK
-#
-SDK="C:\\Program Files (x86)\\Windows Kits\\10"
-SDKBIN="$SDK\\bin\\x64"
-SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
-
-INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
-LIB="$SDK\\lib\\$SDKVER\\um\\x64"
-
-# CRT
-#
-CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
-
-INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
-LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB"
-
-# VC
-#
-VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.24728"
-VCBIN="$VC\\bin\\HostX64\\x64"
-VCDLL="$VC\\bin\\HostX64\\x64"
-
-INCLUDE="$VC\\include;$INCLUDE"
-LIB="$VC\\lib\\x64;$LIB"
diff --git a/msvc-15/msvc-15rc1-32 b/msvc-15/msvc-15u0-32
index 57eb08c..b9c932e 100755
--- a/msvc-15/msvc-15rc1-32
+++ b/msvc-15/msvc-15u0-32
@@ -1,10 +1,10 @@
 #! /usr/bin/env bash
 
-# file      : msvc-15/msvc-15rc1-32
+# file      : msvc-15/msvc-15u0-32
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-# MSVC 15RC1 32-bit setup/configuration (note: using 64-to-32 cross-compiler).
+# MSVC 15 32-bit setup/configuration (note: using 64-to-32 cross-compiler).
 #
 # Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
 #
@@ -21,7 +21,7 @@ fi
 #
 SDK="C:\\Program Files (x86)\\Windows Kits\\10"
 SDKBIN="$SDK\\bin\\x86"
-SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
+SDKVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
 LIB="$SDK\\lib\\$SDKVER\\um\\x86"
@@ -29,14 +29,14 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x86"
 # CRT
 #
 CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
+CRTVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
 LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
 
 # VC
 #
-VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.24629"
+VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.25017"
 VCBIN="$VC\\bin\\HostX64\\x86"
 VCDLL="$VC\\bin\\HostX64\\x64"
 
diff --git a/msvc-15/msvc-15rc1-64 b/msvc-15/msvc-15u0-64
index 33fe760..a52fc58 100755
--- a/msvc-15/msvc-15rc1-64
+++ b/msvc-15/msvc-15u0-64
@@ -1,10 +1,10 @@
 #! /usr/bin/env bash
 
-# file      : msvc-15/msvc-15rc1-64
+# file      : msvc-15/msvc-15u0-64
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-# MSVC 15RC1 64-bit setup/configuration.
+# MSVC 64-bit setup/configuration.
 #
 # Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
 #
@@ -21,7 +21,7 @@ fi
 #
 SDK="C:\\Program Files (x86)\\Windows Kits\\10"
 SDKBIN="$SDK\\bin\\x64"
-SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
+SDKVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
 LIB="$SDK\\lib\\$SDKVER\\um\\x64"
@@ -29,14 +29,14 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x64"
 # CRT
 #
 CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393".
+CRTVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
 LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB"
 
 # VC
 #
-VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.24629"
+VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.25017"
 VCBIN="$VC\\bin\\HostX64\\x64"
 VCDLL="$VC\\bin\\HostX64\\x64"
 
diff --git a/mt-15rc1-32 b/mt-15rc1-32
deleted file mode 100755
index 0d34aea..0000000
--- a/mt-15rc1-32
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/mt-15rc1-64 b/mt-15rc1-64
deleted file mode 100755
index 0d34aea..0000000
--- a/mt-15rc1-64
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/mt-15rc2-32 b/mt-15rc2-32
deleted file mode 100755
index 0d34aea..0000000
--- a/mt-15rc2-32
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/mt-15rc2-64 b/mt-15rc2-64
deleted file mode 100755
index 0d34aea..0000000
--- a/mt-15rc2-64
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/lib-15rc2-32 b/mt-15u0-32
index 0d34aea..0d34aea 100755
--- a/lib-15rc2-32
+++ b/mt-15u0-32
diff --git a/lib-15rc2-64 b/mt-15u0-64
index 0d34aea..0d34aea 100755
--- a/lib-15rc2-64
+++ b/mt-15u0-64
diff --git a/rc-15rc1-32 b/rc-15rc1-32
deleted file mode 100755
index 0d34aea..0000000
--- a/rc-15rc1-32
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/rc-15rc1-64 b/rc-15rc1-64
deleted file mode 100755
index 0d34aea..0000000
--- a/rc-15rc1-64
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/rc-15rc2-32 b/rc-15rc2-32
deleted file mode 100755
index 0d34aea..0000000
--- a/rc-15rc2-32
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/rc-15rc2-64 b/rc-15rc2-64
deleted file mode 100755
index 0d34aea..0000000
--- a/rc-15rc2-64
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-
-# The contents of these files are all identical; the information is carries by
-# the file name which should be in the form <tool>-<version>-<target>. See
-# msvc-dispatch for details.
-#
-src_exe="$(realpath ${BASH_SOURCE[0]})"
-src_dir="$(dirname "$src_exe")"
-
-source "$src_dir/msvc-dispatch"
diff --git a/link-15rc1-32 b/rc-15u0-32
index 0d34aea..0d34aea 100755
--- a/link-15rc1-32
+++ b/rc-15u0-32
diff --git a/link-15rc1-64 b/rc-15u0-64
index 0d34aea..0d34aea 100755
--- a/link-15rc1-64
+++ b/rc-15u0-64