Build cleanup and fixes from sink testing

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 0 insertions, 405 deletions

diff --git a/subprojects/packagefiles/msvc-wine/msvc-wine-shebang-nixos.diff b/subprojects/packagefiles/msvc-wine/msvc-wine-shebang-nixos.diff
deleted file mode 100644
index 37295a9..0000000
--- a/subprojects/packagefiles/msvc-wine/msvc-wine-shebang-nixos.diff
+++ /dev/null
@@ -1,405 +0,0 @@
-https://github.com/mstorsjo/msvc-wine/pull/187
-
-diff --git a/fixinclude b/fixinclude
-index 4a8c733..bd5280c 100755
---- a/fixinclude
-+++ b/fixinclude
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- #
- # Copyright (c) 2019 Martin Storsjo
- #
-diff --git a/install.sh b/install.sh
-index ac00d9f..039922f 100755
---- a/install.sh
-+++ b/install.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env sh
- #
- # Copyright (c) 2019 Martin Storsjo
- #
-diff --git a/lowercase b/lowercase
-index ee10cc7..32902f7 100755
---- a/lowercase
-+++ b/lowercase
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- #
- # Copyright (c) 2019 Martin Storsjo
- #
-diff --git a/msvcenv-native.sh b/msvcenv-native.sh
-index e83c687..f3a99f1 100755
---- a/msvcenv-native.sh
-+++ b/msvcenv-native.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env sh
- #
- # Copyright (c) 2019 Martin Storsjo
- #
-@@ -33,9 +33,9 @@ else
-     if [ ! -f "$ENV" ]; then
-         echo $ENV doesn\'t exist
-     else
--        export INCLUDE="$(bash -c ". $ENV && /bin/echo \"\$INCLUDE\"" | sed s/z://g | sed 's/\\/\//g')"
--        export LIB="$(bash -c ". $ENV && /bin/echo \"\$LIB\"" | sed s/z://g | sed 's/\\/\//g')"
--        MSVCARCH="$(bash -c ". $ENV && /bin/echo \"\$ARCH\"")"
-+        export INCLUDE="$(bash -c ". $ENV && /usr/bin/env echo \"\$INCLUDE\"" | sed s/z://g | sed 's/\\/\//g')"
-+        export LIB="$(bash -c ". $ENV && /usr/bin/env echo \"\$LIB\"" | sed s/z://g | sed 's/\\/\//g')"
-+        MSVCARCH="$(bash -c ". $ENV && /usr/bin/env echo \"\$ARCH\"")"
-         case $MSVCARCH in
-         x86) TARGET_ARCH=i686 ;;
-         x64) TARGET_ARCH=x86_64 ;;
-diff --git a/test/test-asm.sh b/test/test-asm.sh
-index 5774c02..ba9511b 100755
---- a/test/test-asm.sh
-+++ b/test/test-asm.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Martin Storsjo
- #
-diff --git a/test/test-cl.sh b/test/test-cl.sh
-index 250f092..41fe51b 100755
---- a/test/test-cl.sh
-+++ b/test/test-cl.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Huang Qinjin
- #
-diff --git a/test/test-clang-cl-cmds.sh b/test/test-clang-cl-cmds.sh
-index 885835b..9409d2b 100755
---- a/test/test-clang-cl-cmds.sh
-+++ b/test/test-clang-cl-cmds.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Martin Storsjo
- #
-diff --git a/test/test-clang-cl.sh b/test/test-clang-cl.sh
-index ba7f82d..f99b745 100755
---- a/test/test-clang-cl.sh
-+++ b/test/test-clang-cl.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Martin Storsjo
- #
-diff --git a/test/test-cmake-clang-cl.sh b/test/test-cmake-clang-cl.sh
-index 78485ab..4a6ce3f 100755
---- a/test/test-cmake-clang-cl.sh
-+++ b/test/test-cmake-clang-cl.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Martin Storsjo
- #
-diff --git a/test/test-cmake.sh b/test/test-cmake.sh
-index 6beface..994d07d 100755
---- a/test/test-cmake.sh
-+++ b/test/test-cmake.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Huang Qinjin
- #
-diff --git a/test/test-dumpbin.sh b/test/test-dumpbin.sh
-index 68608d4..dd3841d 100755
---- a/test/test-dumpbin.sh
-+++ b/test/test-dumpbin.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Huang Qinjin
- #
-diff --git a/test/test-mc.sh b/test/test-mc.sh
-index 836a210..2e7d8ab 100755
---- a/test/test-mc.sh
-+++ b/test/test-mc.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2024 Mark Harmstone
- #
-diff --git a/test/test-meson.sh b/test/test-meson.sh
-index 68ac271..bfd6d6d 100755
---- a/test/test-meson.sh
-+++ b/test/test-meson.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Martin Storsjo
- #
-diff --git a/test/test-midl.sh b/test/test-midl.sh
-index 45d9f92..8f9319e 100755
---- a/test/test-midl.sh
-+++ b/test/test-midl.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Martin Storsjo
- #
-diff --git a/test/test-msbuild.sh b/test/test-msbuild.sh
-index 00f03c6..faf284a 100755
---- a/test/test-msbuild.sh
-+++ b/test/test-msbuild.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2024 Sergey Kvachonok
- #
-diff --git a/test/test-mt.sh b/test/test-mt.sh
-index 5f1881b..eda11ab 100755
---- a/test/test-mt.sh
-+++ b/test/test-mt.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Huang Qinjin
- #
-diff --git a/test/test-vcpkg.sh b/test/test-vcpkg.sh
-index dc3d3ce..79ebe51 100755
---- a/test/test-vcpkg.sh
-+++ b/test/test-vcpkg.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2024 Huang Qinjin
- #
-diff --git a/test/test-wdk-msbuild.sh b/test/test-wdk-msbuild.sh
-index b37b3de..90f4189 100755
---- a/test/test-wdk-msbuild.sh
-+++ b/test/test-wdk-msbuild.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2024 Sergey Kvachonok
- #
-diff --git a/test/test.sh b/test/test.sh
-index 1825216..ad9f9c1 100755
---- a/test/test.sh
-+++ b/test/test.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2023 Huang Qinjin
- #
-diff --git a/vsdownload.py b/vsdownload.py
-index d9b4dcf..7598eec 100755
---- a/vsdownload.py
-+++ b/vsdownload.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- #
- # Copyright (c) 2019 Martin Storsjo
- #
-diff --git a/wdk-download.sh b/wdk-download.sh
-index e0ea631..7fa8bf0 100755
---- a/wdk-download.sh
-+++ b/wdk-download.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2024 Sergey Kvachonok
- #
-diff --git a/wrappers/armasm b/wrappers/armasm
-index 3797431..bf8ea5a 100755
---- a/wrappers/armasm
-+++ b/wrappers/armasm
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/armasm64 b/wrappers/armasm64
-index fdfdb38..eb1553f 100755
---- a/wrappers/armasm64
-+++ b/wrappers/armasm64
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/cl b/wrappers/cl
-index 35c1b23..6ca6a56 100755
---- a/wrappers/cl
-+++ b/wrappers/cl
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/cmd b/wrappers/cmd
-index 88a39f0..a7ab236 100755
---- a/wrappers/cmd
-+++ b/wrappers/cmd
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/dumpbin b/wrappers/dumpbin
-index c6f7f9e..18c5591 100755
---- a/wrappers/dumpbin
-+++ b/wrappers/dumpbin
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/findstr b/wrappers/findstr
-index 1146022..136ac0e 100755
---- a/wrappers/findstr
-+++ b/wrappers/findstr
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2024 Huang Qinjin
- #
-diff --git a/wrappers/lib b/wrappers/lib
-index 143da0c..3967675 100755
---- a/wrappers/lib
-+++ b/wrappers/lib
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/link b/wrappers/link
-index dba1774..53920d4 100755
---- a/wrappers/link
-+++ b/wrappers/link
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/mc b/wrappers/mc
-index c1c5d80..bf71882 100755
---- a/wrappers/mc
-+++ b/wrappers/mc
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/midl b/wrappers/midl
-index dd34988..adddcfa 100755
---- a/wrappers/midl
-+++ b/wrappers/midl
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/ml b/wrappers/ml
-index db671c7..a5d537b 100755
---- a/wrappers/ml
-+++ b/wrappers/ml
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/ml64 b/wrappers/ml64
-index 0708ebe..df65803 100755
---- a/wrappers/ml64
-+++ b/wrappers/ml64
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/msbuild b/wrappers/msbuild
-index 65bbf8f..53fdd8f 100755
---- a/wrappers/msbuild
-+++ b/wrappers/msbuild
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2024 Sergey Kvachonok
- #
-diff --git a/wrappers/msvcenv.sh b/wrappers/msvcenv.sh
-index 101e9bb..2d2a918 100755
---- a/wrappers/msvcenv.sh
-+++ b/wrappers/msvcenv.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/mt b/wrappers/mt
-index edebd75..ed92f96 100755
---- a/wrappers/mt
-+++ b/wrappers/mt
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/nmake b/wrappers/nmake
-index 88102d1..3eaf0f5 100755
---- a/wrappers/nmake
-+++ b/wrappers/nmake
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/rc b/wrappers/rc
-index f7b8d97..7afb1ad 100755
---- a/wrappers/rc
-+++ b/wrappers/rc
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #
-diff --git a/wrappers/wine-msvc.sh b/wrappers/wine-msvc.sh
-index a267283..bb08891 100755
---- a/wrappers/wine-msvc.sh
-+++ b/wrappers/wine-msvc.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2018 Martin Storsjo
- #