diff --git a/misc/build-containers/build_containers.sh b/misc/build-containers/build_containers.sh index 7caac4c37..c63cee7cc 100755 --- a/misc/build-containers/build_containers.sh +++ b/misc/build-containers/build_containers.sh @@ -9,7 +9,7 @@ if [ -z $podman ]; then fi files_root=$(pwd)/files -img_version=bs +img_version=pe mkdir -p logs @@ -38,18 +38,3 @@ fi $podman_build -t pandemonium-osx:${img_version} -v ${files_root}:/root/files -f Dockerfile.osx . 2>&1 | tee logs/osx.log $podman_build -t pandemonium-ios:${img_version} -v ${files_root}:/root/files -f Dockerfile.ios . 2>&1 | tee logs/ios.log -if [ "${build_msvc}" != "0" ]; then - if [ ! -e files/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 -t pandemonium-msvc:${img_version} -f Dockerfile.msvc -v ${files_root}:/root/files . 2>&1 | tee logs/msvc.log -fi