From 4e8da1a485edea20f065e1583511262fcf8c85b1 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 25 Nov 2016 00:49:48 +0300 Subject: Add support for VC14U3 --- INSTALL | 2 +- build/root.build | 2 -- buildfile | 32 ++++++++++++++++++-------------- cl-14u3-32 | 10 ++++++++++ cl-14u3-64 | 10 ++++++++++ etc/lowercase-headers | 2 +- lib-14u3-32 | 10 ++++++++++ lib-14u3-64 | 10 ++++++++++ link-14u3-32 | 10 ++++++++++ link-14u3-64 | 10 ++++++++++ msvc-14/msvc-14u3-32 | 35 +++++++++++++++++++++++++++++++++++ msvc-14/msvc-14u3-64 | 35 +++++++++++++++++++++++++++++++++++ mt-14u3-32 | 10 ++++++++++ mt-14u3-64 | 10 ++++++++++ rc-14u3-32 | 10 ++++++++++ rc-14u3-64 | 10 ++++++++++ 16 files changed, 190 insertions(+), 18 deletions(-) create mode 100755 cl-14u3-32 create mode 100755 cl-14u3-64 create mode 100755 lib-14u3-32 create mode 100755 lib-14u3-64 create mode 100755 link-14u3-32 create mode 100755 link-14u3-64 create mode 100755 msvc-14/msvc-14u3-32 create mode 100755 msvc-14/msvc-14u3-64 create mode 100755 mt-14u3-32 create mode 100755 mt-14u3-64 create mode 100755 rc-14u3-32 create mode 100755 rc-14u3-64 diff --git a/INSTALL b/INSTALL index a8c6109..6031b47 100644 --- a/INSTALL +++ b/INSTALL @@ -46,7 +46,7 @@ shorter tool names, for example: for t in cl link lib mt rc; do \ ln -s .../msvc-linux/$t-14u2-64 ~/bin/$t-14; done -While you can modify the configuration scripts, retainig such modifications +While you can modify the configuration scripts, retaining such modifications over updates will be tedious. As a result, there are several environment variables that you can set (e.g., in your .bashrc) to adjust some of the common configuration values. diff --git a/build/root.build b/build/root.build index 62bf08a..622dca9 100644 --- a/build/root.build +++ b/build/root.build @@ -10,5 +10,3 @@ hxx{*}: extension = ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx - -cxx.poptions =+ -I$src_root diff --git a/buildfile b/buildfile index db3f8ea..84feff7 100644 --- a/buildfile +++ b/buildfile @@ -6,20 +6,24 @@ define sh: file sh{*}: extension = sh{*}: install = bin/ -s = cl-11-32 cl-12-32 cl-14u0-32 cl-14u2-32 cl-14u2-64 \ - lib-11-32 lib-12-32 lib-14u0-32 lib-14u2-32 lib-14u2-64 \ - link-11-32 link-12-32 link-14u0-32 link-14u2-32 link-14u2-64 \ - mt-11-32 mt-12-32 mt-14u0-32 mt-14u2-32 mt-14u2-64 \ - rc-11-32 rc-12-32 rc-14u0-32 rc-14u2-32 rc-14u2-64 \ - \ - msvc-dispatch \ - \ - msvc-common/{msvc-cl-common msvc-common msvc-lib-common \ - msvc-link-common msvc-mt-common msvc-rc-common} \ - \ - msvc-11/{msvc-11-32} \ - msvc-12/{msvc-12-32} \ - msvc-14/{msvc-14u0-32 msvc-14u2-32 msvc-14u2-64} +s = cl-11-32 lib-11-32 link-11-32 mt-11-32 rc-11-32 \ + cl-12-32 lib-12-32 link-12-32 mt-12-32 rc-12-32 \ + cl-14u0-32 lib-14u0-32 link-14u0-32 mt-14u0-32 rc-14u0-32 \ + cl-14u2-32 lib-14u2-32 link-14u2-32 mt-14u2-32 rc-14u2-32 \ + cl-14u2-64 lib-14u2-64 link-14u2-64 mt-14u2-64 rc-14u2-64 \ + cl-14u3-32 lib-14u3-32 link-14u3-32 mt-14u3-32 rc-14u3-32 \ + cl-14u3-64 lib-14u3-64 link-14u3-64 mt-14u3-64 rc-14u3-64 \ + \ + msvc-dispatch \ + \ + msvc-common/{msvc-cl-common msvc-common msvc-lib-common \ + msvc-link-common msvc-mt-common msvc-rc-common} \ + \ + msvc-11/{msvc-11-32} \ + msvc-12/{msvc-12-32} \ + msvc-14/{msvc-14u0-32 \ + msvc-14u2-32 msvc-14u2-64 \ + msvc-14u3-32 msvc-14u3-64} ./: msvc-common/exe{msvc-filter} sh{$s} \ diff --git a/cl-14u3-32 b/cl-14u3-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/cl-14u3-32 @@ -0,0 +1,10 @@ +#! /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 --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/cl-14u3-64 b/cl-14u3-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/cl-14u3-64 @@ -0,0 +1,10 @@ +#! /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 --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/etc/lowercase-headers b/etc/lowercase-headers index 3a217db..28868fc 100755 --- a/etc/lowercase-headers +++ b/etc/lowercase-headers @@ -15,7 +15,7 @@ if [ $# -eq 0 ]; then fi for d in "$@"; do - find $d -type f -name '*[[:upper:]]*.h' | + find "$d" -type f -name '*[[:upper:]]*.h' | while read f; do b="$(basename "$f")" d="$(dirname "$f")" diff --git a/lib-14u3-32 b/lib-14u3-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/lib-14u3-32 @@ -0,0 +1,10 @@ +#! /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 --. 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-14u3-64 b/lib-14u3-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/lib-14u3-64 @@ -0,0 +1,10 @@ +#! /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 --. 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-14u3-32 b/link-14u3-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/link-14u3-32 @@ -0,0 +1,10 @@ +#! /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 --. 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-14u3-64 b/link-14u3-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/link-14u3-64 @@ -0,0 +1,10 @@ +#! /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 --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/msvc-14/msvc-14u3-32 b/msvc-14/msvc-14u3-32 new file mode 100755 index 0000000..6d9f277 --- /dev/null +++ b/msvc-14/msvc-14u3-32 @@ -0,0 +1,35 @@ +#! /usr/bin/env bash + +# MSVC 14U3 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 14.0" +fi + +# SDK +# +SDK="C:\\Program Files (x86)\\Windows Kits\\10" +SDKBIN="$SDK\\bin\\x86" +SDKVER="10.0.14393.0" + +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="10.0.14393.0" + +INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE" +LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB" + +# VC +# +VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC" +VCBIN="$VC\\bin\\amd64_x86" +VCDLL="$VC\\bin\\amd64" + +INCLUDE="$VC\\include;$INCLUDE" +LIB="$VC\\lib;$LIB" diff --git a/msvc-14/msvc-14u3-64 b/msvc-14/msvc-14u3-64 new file mode 100755 index 0000000..deec271 --- /dev/null +++ b/msvc-14/msvc-14u3-64 @@ -0,0 +1,35 @@ +#! /usr/bin/env bash + +# MSVC 14U3 64-bit setup/configuration. +# +# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables. +# +if [ -z "$MSVC_INSTALLDIR" ]; then + MSVC_INSTALLDIR="Microsoft Visual Studio 14.0" +fi + +# SDK +# +SDK="C:\\Program Files (x86)\\Windows Kits\\10" +SDKBIN="$SDK\\bin\\x64" +SDKVER="10.0.14393.0" + +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="10.0.14393.0" + +INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE" +LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB" + +# VC +# +VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC" +VCBIN="$VC\\bin\\amd64" +VCDLL="$VC\\bin\\amd64" + +INCLUDE="$VC\\include;$INCLUDE" +LIB="$VC\\lib\\amd64;$LIB" diff --git a/mt-14u3-32 b/mt-14u3-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/mt-14u3-32 @@ -0,0 +1,10 @@ +#! /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 --. 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-14u3-64 b/mt-14u3-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/mt-14u3-64 @@ -0,0 +1,10 @@ +#! /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 --. 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-14u3-32 b/rc-14u3-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/rc-14u3-32 @@ -0,0 +1,10 @@ +#! /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 --. 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-14u3-64 b/rc-14u3-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/rc-14u3-64 @@ -0,0 +1,10 @@ +#! /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 --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" -- cgit v1.1