From a1bb6cc142c26e4c815e2bb85cf836765e7810a1 Mon Sep 17 00:00:00 2001 From: p01arst0rm Date: Tue, 6 Dec 2022 20:05:38 +0000 Subject: [PATCH] moved vswhere to tools directory --- tools/build/premake | 2 +- tools/vswhere/LICENSE.txt | 20 ++++++++++++++++++++ {third_party => tools}/vswhere/vswhere.exe | Bin xenia-build | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 tools/vswhere/LICENSE.txt rename {third_party => tools}/vswhere/vswhere.exe (100%) diff --git a/tools/build/premake b/tools/build/premake index b77d042ae..b9f423dee 100644 --- a/tools/build/premake +++ b/tools/build/premake @@ -213,7 +213,7 @@ def import_vs_environment(): install_path = None env_tool_args = None - vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -format json -utf8', shell=False, universal_newlines=True, encoding="utf-8") + vswhere = subprocess.check_output('tools/vswhere/vswhere.exe -version "[15,)" -latest -format json -utf8', shell=False, universal_newlines=True, encoding="utf-8") if vswhere: vswhere = json.loads(vswhere) if vswhere and len(vswhere) > 0: diff --git a/tools/vswhere/LICENSE.txt b/tools/vswhere/LICENSE.txt new file mode 100644 index 000000000..0048812bf --- /dev/null +++ b/tools/vswhere/LICENSE.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) +Copyright (C) Microsoft Corporation. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/third_party/vswhere/vswhere.exe b/tools/vswhere/vswhere.exe similarity index 100% rename from third_party/vswhere/vswhere.exe rename to tools/vswhere/vswhere.exe diff --git a/xenia-build b/xenia-build index c521a9504..8985ad9de 100755 --- a/xenia-build +++ b/xenia-build @@ -75,7 +75,7 @@ def import_vs_environment(): env_tool_args = None vswhere = subprocess.check_output( - 'third_party/vswhere/vswhere.exe -version "[15,)" -latest -prerelease -format json -utf8 -products ' + 'tools/vswhere/vswhere.exe -version "[15,)" -latest -prerelease -format json -utf8 -products ' "Microsoft.VisualStudio.Product.Enterprise " "Microsoft.VisualStudio.Product.Professional " "Microsoft.VisualStudio.Product.Community "