Drop now unused MSVC / VS 2017 container
UWP support was removed from Godot 4.x, and recent attempts at building this container couldn't reproduce a functional one for UWP builds anyway.
This commit is contained in:
parent
73fa70dcf4
commit
0e210c72f1
|
@ -1,29 +0,0 @@
|
|||
ARG img_version
|
||||
FROM godot-fedora:${img_version}
|
||||
|
||||
ENV WINEDEBUG=-all
|
||||
|
||||
RUN dnf -y install --setopt=install_weak_deps=False \
|
||||
wine winetricks xorg-x11-server-Xvfb p7zip-plugins findutils && \
|
||||
curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z && \
|
||||
curl -LO https://www.python.org/ftp/python/3.7.2/python-3.7.2-amd64.exe && \
|
||||
xvfb-run sh -c "winetricks -q vcrun2017; wineserver -w" ;\
|
||||
xvfb-run sh -c "winetricks -q dotnet461; wineserver -w" ;\
|
||||
xvfb-run sh -c "wine /root/python-3.7.2-amd64.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0; wineserver -w" ;\
|
||||
rm /root/python-3.7.2-amd64.exe && \
|
||||
wine python -m pip install --upgrade pip ; wineserver -w ; \
|
||||
wine pip install -U setuptools ; wineserver -w ; \
|
||||
wine pip install -U wheel ; wineserver -w ; \
|
||||
wine pip install scons pywin32 ; wineserver -w ; \
|
||||
cd /root/.wine/drive_c && \
|
||||
7z x /root/angle.7z && \
|
||||
rm /root/angle.7z && \
|
||||
cd "/root/.wine/drive_c/Program Files (x86)" && \
|
||||
tar xf /root/files/msvc2017.tar && \
|
||||
cd /root && \
|
||||
bash /root/files/msvc-fixup.sh && \
|
||||
find /root/.wine -name vctip.exe -delete && \
|
||||
rm -rf /root/.wine/drive_c/users/root/Temp/* && \
|
||||
rm -rf /root/.cache
|
||||
|
||||
CMD /bin/bash
|
17
build.sh
17
build.sh
|
@ -23,7 +23,6 @@ godot_branch=$1
|
|||
base_distro=$2
|
||||
img_version=$godot_branch-$base_distro
|
||||
files_root="$basedir/files"
|
||||
build_msvc=0
|
||||
|
||||
if [ ! -z "$PS1" ]; then
|
||||
# Confirm settings
|
||||
|
@ -81,19 +80,3 @@ fi
|
|||
|
||||
podman_build osx
|
||||
podman_build ios
|
||||
|
||||
if [ "${build_msvc}" != "0" ]; then
|
||||
if [ ! -e "${files_root}"/msvc2017.tar ]; then
|
||||
echo
|
||||
echo "files/msvc2017.tar is missing. This file can be created on a Windows 7 or 10 machine by downloading the 'Visual Studio Tools' installer."
|
||||
echo "here: https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2017"
|
||||
echo "The required components can be installed by running"
|
||||
echo "vs_buildtools.exe --add Microsoft.VisualStudio.Workload.UniversalBuildTools --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop --add Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native --passive"
|
||||
echo "after that create a zipfile of C:/Program Files (x86)/Microsoft Visual Studio"
|
||||
echo "tar -cf msvc2017.tar -C \"c:/Program Files (x86)/ Microsoft Visual Studio\""
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
|
||||
podman_build msvc
|
||||
fi
|
||||
|
|
|
@ -23,4 +23,3 @@ fi
|
|||
"$podman" push godot-android:${img_version} ${registry}/godot-private/android
|
||||
"$podman" push godot-ios:${img_version} ${registry}/godot-private/ios
|
||||
"$podman" push godot-osx:${img_version} ${registry}/godot-private/macosx
|
||||
"$podman" push godot-msvc:${img_version} ${registry}/godot-private/uwp
|
||||
|
|
Loading…
Reference in New Issue