From 2af3bafacc469e37142eca9c074a8a65dc4e06b8 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 11 Jun 2022 02:48:52 +0200 Subject: [PATCH] Removed most of the tool script that are available in the engine now. --- Makefile | 20 ---- build_ios.sh | 19 ---- build_ios_release.sh | 21 ---- build_osx.sh | 15 --- build_pi.sh | 6 -- podman_build_all.sh | 34 ------ tools/build-containers/.gitignore | 12 --- tools/build-containers/Dockerfile.android | 16 --- tools/build-containers/Dockerfile.base | 9 -- tools/build-containers/Dockerfile.ios | 30 ------ tools/build-containers/Dockerfile.javascript | 13 --- tools/build-containers/Dockerfile.linux | 8 -- tools/build-containers/Dockerfile.msvc | 29 ----- tools/build-containers/Dockerfile.osx | 15 --- tools/build-containers/Dockerfile.windows | 7 -- tools/build-containers/Dockerfile.xcode | 43 -------- tools/build-containers/README.md | 10 -- tools/build-containers/build_containers.sh | 53 ---------- tools/build-containers/files/msvc-fixup.sh | 24 ----- .../files/patches/fix-fuse-check.diff | 27 ----- tools/build-containers/upload.sh | 27 ----- tools/copy_repos.py | 100 ------------------ tools/vscode-setup/launch.json | 67 ------------ tools/vscode-setup/settings.json | 6 -- tools/vscode-setup/tasks.json | 26 ----- 25 files changed, 637 deletions(-) delete mode 100644 Makefile delete mode 100755 build_ios.sh delete mode 100755 build_ios_release.sh delete mode 100755 build_osx.sh delete mode 100644 build_pi.sh delete mode 100755 podman_build_all.sh delete mode 100644 tools/build-containers/.gitignore delete mode 100644 tools/build-containers/Dockerfile.android delete mode 100644 tools/build-containers/Dockerfile.base delete mode 100644 tools/build-containers/Dockerfile.ios delete mode 100644 tools/build-containers/Dockerfile.javascript delete mode 100644 tools/build-containers/Dockerfile.linux delete mode 100644 tools/build-containers/Dockerfile.msvc delete mode 100644 tools/build-containers/Dockerfile.osx delete mode 100644 tools/build-containers/Dockerfile.windows delete mode 100644 tools/build-containers/Dockerfile.xcode delete mode 100644 tools/build-containers/README.md delete mode 100755 tools/build-containers/build_containers.sh delete mode 100644 tools/build-containers/files/msvc-fixup.sh delete mode 100644 tools/build-containers/files/patches/fix-fuse-check.diff delete mode 100644 tools/build-containers/upload.sh delete mode 100644 tools/copy_repos.py delete mode 100644 tools/vscode-setup/launch.json delete mode 100644 tools/vscode-setup/settings.json delete mode 100644 tools/vscode-setup/tasks.json diff --git a/Makefile b/Makefile deleted file mode 100644 index f1b4757..0000000 --- a/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -all: - scons bels -j5 - -e: - scons belsE -j5 - -t: - scons belsT -j5 - -v: - scons belsV -j5 - -W: - scons belsW -j5 - -p: - scons belsP -j5 - -m: - scons belsM -j5 diff --git a/build_ios.sh b/build_ios.sh deleted file mode 100755 index 6d287a4..0000000 --- a/build_ios.sh +++ /dev/null @@ -1,19 +0,0 @@ - -export SCONS_CACHE=~/.scons_cache -export SCONS_CACHE_LIMIT=5000 - -cd ./engine - -scons -j6 p=iphone tools=no target=release_debug arch=arm module_arkit_enabled=no game_center=no -scons -j6 p=iphone tools=no target=release_debug arch=arm64 module_arkit_enabled=no game_center=no -lipo -create bin/libgodot.iphone.opt.debug.arm.a bin/libgodot.iphone.opt.debug.arm64.a -output bin/libgodot.iphone.debug.fat.a -rm bin/ios_xcode/libgodot.iphone.debug.fat.a -cp bin/libgodot.iphone.debug.fat.a bin/ios_xcode/libgodot.iphone.debug.fat.a - -rm bin/iphone.zip -cd bin/ios_xcode -zip -r -X ../iphone.zip . - -cd .. -cd .. -cd .. diff --git a/build_ios_release.sh b/build_ios_release.sh deleted file mode 100755 index f5d8303..0000000 --- a/build_ios_release.sh +++ /dev/null @@ -1,21 +0,0 @@ - -export SCONS_CACHE=~/.scons_cache -export SCONS_CACHE_LIMIT=5000 - -cd ./engine - -scons -j6 p=iphone tools=no target=release arch=arm module_arkit_enabled=no game_center=no -scons -j6 p=iphone tools=no target=release arch=arm64 module_arkit_enabled=no game_center=no -lipo -create bin/libgodot.iphone.opt.arm.a bin/libgodot.iphone.opt.arm64.a -output bin/libgodot.iphone.release.fat.a -rm bin/ios_xcode/libgodot.iphone.release.fat.a -cp bin/libgodot.iphone.release.fat.a bin/ios_xcode/libgodot.iphone.release.fat.a - -rm bin/iphone.zip -cd bin/ios_xcode -zip -r -X ../iphone.zip . - -cd .. -cd .. - - -cd .. diff --git a/build_osx.sh b/build_osx.sh deleted file mode 100755 index fab5d0d..0000000 --- a/build_osx.sh +++ /dev/null @@ -1,15 +0,0 @@ - -export SCONS_CACHE=~/.scons_cache -export SCONS_CACHE_LIMIT=5000 - -cd ./engine - -scons -j6 platform=osx target=release_debug - -rm -Rf bin/Godot.app -cp -r misc/dist/osx_tools.app ./bin/Godot.app -mkdir -p ./bin/Godot.app/Contents/MacOS -cp bin/godot.osx.opt.tools.64 bin/Godot.app/Contents/MacOS/Godot -chmod +x bin/Godot.app/Contents/MacOS/Godot - -cd .. diff --git a/build_pi.sh b/build_pi.sh deleted file mode 100644 index 7412965..0000000 --- a/build_pi.sh +++ /dev/null @@ -1,6 +0,0 @@ - -scons bel_latomic_strip_slim -j4 -scons bl_latomic_strip_slim -j4 -scons blr_latomic_strip_slim -j4 - - diff --git a/podman_build_all.sh b/podman_build_all.sh deleted file mode 100755 index dec8b01..0000000 --- a/podman_build_all.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -set -e - -podman=`which podman || true` - -if [ -z $podman ]; then - echo "podman needs to be in PATH for this script to work." - exit 1 -fi - -project_root=$(pwd)/ -img_version=bs - -mkdir -p logs - -$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bew_strip -j4 . 2>&1 | tee logs/bew.log -#$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bewd_strip -j4 . 2>&1 | tee logs/bewd.log -$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bw_strip -j4 . 2>&1 | tee logs/bw.log -$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bwr_strip -j4 . 2>&1 | tee logs/bwr.log - -$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bel_strip -j4 . 2>&1 | tee logs/bel.log -#$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons beld_strip -j4 . 2>&1 | tee logs/beld.log -$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bl_strip -j4 . 2>&1 | tee logs/bl.log -$podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons blr_strip -j4 . 2>&1 | tee logs/blr.log - - -$podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} scons bj_strip -j4 . 2>&1 | tee logs/bj.log -$podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} scons bjr_strip -j4 . 2>&1 | tee logs/bjr.log - -$podman run -v ${project_root}:/root/project -w /root/project godot-android:${img_version} scons ba_strip -j4 . 2>&1 | tee logs/ba.log -$podman run -v ${project_root}:/root/project -w /root/project godot-android:${img_version} scons bar_strip -j4 . 2>&1 | tee logs/bar.log - -# $podman run -v ${project_root}:/root/project -i -w /root/project -t godot-windows:${img_version} scons bew -j4 - diff --git a/tools/build-containers/.gitignore b/tools/build-containers/.gitignore deleted file mode 100644 index f9d8f5a..0000000 --- a/tools/build-containers/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.tar -*.tar.gz -*.tar.bz2 -*.tar.xz -*.exe -*.swp -*.dmg -*.zip -*.xip - -files/mono-*/ -logs/ diff --git a/tools/build-containers/Dockerfile.android b/tools/build-containers/Dockerfile.android deleted file mode 100644 index 8d45863..0000000 --- a/tools/build-containers/Dockerfile.android +++ /dev/null @@ -1,16 +0,0 @@ -ARG img_version -FROM godot-fedora:${img_version} - -RUN dnf -y install --setopt=install_weak_deps=False \ - gcc gcc-c++ java-1.8.0-openjdk-devel ncurses-compat-libs && \ - mkdir sdk && cd sdk && \ - curl -LO https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \ - unzip sdk-tools-linux-4333796.zip && \ - rm sdk-tools-linux-4333796.zip && \ - yes | tools/bin/sdkmanager --licenses && \ - tools/bin/sdkmanager ndk-bundle 'build-tools;28.0.3' 'platforms;android-28' 'cmake;3.10.2.4988404' - -ENV ANDROID_HOME=/root/sdk/ -ENV ANDROID_NDK_ROOT=/root/sdk/ndk-bundle/ - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.base b/tools/build-containers/Dockerfile.base deleted file mode 100644 index d9a5525..0000000 --- a/tools/build-containers/Dockerfile.base +++ /dev/null @@ -1,9 +0,0 @@ -FROM fedora:31 - -WORKDIR /root - -RUN dnf -y upgrade --setopt=install_weak_deps=False && \ - dnf -y install --setopt=install_weak_deps=False \ - bash bzip2 curl git make patch pkgconfig python3 scons unzip which xz - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.ios b/tools/build-containers/Dockerfile.ios deleted file mode 100644 index 36f6ba0..0000000 --- a/tools/build-containers/Dockerfile.ios +++ /dev/null @@ -1,30 +0,0 @@ -ARG img_version -FROM godot-osx:${img_version} - -RUN dnf -y install --setopt=install_weak_deps=False \ - automake autoconf clang gcc gcc-c++ gcc-objc gcc-objc++ cmake libicu-devel libtool libxml2-devel llvm-devel openssl-devel perl python yasm && \ - git clone --progress https://github.com/tpoechtrager/cctools-port.git && \ - cd /root/cctools-port && \ - git checkout 8239a5211bcf07d6b9d359782e1a889ec1d7cce5 && \ - sed -i 's#./autogen.sh#libtoolize -c -i --force\n./autogen.sh#' usage_examples/ios_toolchain/build.sh && \ - usage_examples/ios_toolchain/build.sh /root/files/iPhoneOS12.4.sdk.tar.xz arm64 && \ - mkdir -p /root/ioscross/arm64 && \ - mv usage_examples/ios_toolchain/target/* /root/ioscross/arm64 && \ - mkdir /root/ioscross/arm64/usr && \ - ln -s /root/ioscross/arm64/bin /root/ioscross/arm64/usr/bin && \ - sed -i 's#^TRIPLE=.*#TRIPLE="x86_64-apple-darwin11"#' usage_examples/ios_toolchain/build.sh && \ - usage_examples/ios_toolchain/build.sh /root/files/iPhoneSimulator12.4.sdk.tar.xz x86_64 && \ - mkdir -p /root/ioscross/x86_64 && \ - mv usage_examples/ios_toolchain/target/* /root/ioscross/x86_64 && \ - mkdir /root/ioscross/x86_64/usr && \ - ln -s /root/ioscross/x86_64/bin /root/ioscross/x86_64/usr/bin - -ENV OSXCROSS_IOS=not_nothing -ENV IOSCROSS_ROOT=/root/ioscross -ENV PATH="/root/ioscross/arm64/bin:/root/ioscross/x86_64/bin:${PATH}" - -# Until we can build the cross-compiler, we include a pre-made build in the container. -RUN mkdir -p /root/aot-compilers/iphone-arm64 && \ - tar xvf /root/files/aarch64-apple-darwin-mono-sgen.tar.xz -C /root/aot-compilers/iphone-arm64 - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.javascript b/tools/build-containers/Dockerfile.javascript deleted file mode 100644 index 18ae029..0000000 --- a/tools/build-containers/Dockerfile.javascript +++ /dev/null @@ -1,13 +0,0 @@ -ARG img_version -FROM godot-fedora:${img_version} - -RUN dnf -y install --setopt=install_weak_deps=False \ - gcc gcc-c++ java-openjdk yasm && \ - git clone --progress https://github.com/emscripten-core/emsdk && \ - cd emsdk && \ - git checkout a5082b232617c762cb65832429f896c838df2483 && \ - ./emsdk install 1.38.47-upstream && \ - ./emsdk activate 1.38.47-upstream && \ - echo "source /root/emsdk/emsdk_env.sh" >> /root/.bashrc - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.linux b/tools/build-containers/Dockerfile.linux deleted file mode 100644 index 3c0ef6d..0000000 --- a/tools/build-containers/Dockerfile.linux +++ /dev/null @@ -1,8 +0,0 @@ -ARG img_version -FROM godot-fedora:${img_version} - -RUN dnf -y install --setopt=install_weak_deps=False \ - gcc-c++ xorg-x11-server-Xvfb libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel alsa-lib-devel pulseaudio-libs-devel libudev-devel mesa-libGL-devel mesa-libGLU-devel mesa-dri-drivers yasm - - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.msvc b/tools/build-containers/Dockerfile.msvc deleted file mode 100644 index 5ca6f09..0000000 --- a/tools/build-containers/Dockerfile.msvc +++ /dev/null @@ -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 diff --git a/tools/build-containers/Dockerfile.osx b/tools/build-containers/Dockerfile.osx deleted file mode 100644 index 041ae82..0000000 --- a/tools/build-containers/Dockerfile.osx +++ /dev/null @@ -1,15 +0,0 @@ -ARG img_version -FROM godot-fedora:${img_version} - -RUN dnf -y install --setopt=install_weak_deps=False \ - automake autoconf bzip2-devel clang libicu-devel libtool libxml2-devel llvm-devel openssl-devel yasm && \ - git clone --progress https://github.com/tpoechtrager/osxcross.git && \ - cd /root/osxcross && \ - git checkout 542acc2ef6c21aeb3f109c03748b1015a71fed63 && \ - ln -s /root/files/MacOSX10.14.sdk.tar.xz /root/osxcross/tarballs && \ - UNATTENDED=1 ./build.sh - -ENV OSXCROSS_ROOT=/root/osxcross -ENV PATH="/root/osxcross/target/bin:${PATH}" - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.windows b/tools/build-containers/Dockerfile.windows deleted file mode 100644 index 6012ad2..0000000 --- a/tools/build-containers/Dockerfile.windows +++ /dev/null @@ -1,7 +0,0 @@ -ARG img_version -FROM godot-fedora:${img_version} - -RUN dnf -y install --setopt=install_weak_deps=False \ - mingw32-gcc mingw32-gcc-c++ mingw32-winpthreads-static mingw64-gcc mingw64-gcc-c++ mingw64-winpthreads-static - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.xcode b/tools/build-containers/Dockerfile.xcode deleted file mode 100644 index ad7391a..0000000 --- a/tools/build-containers/Dockerfile.xcode +++ /dev/null @@ -1,43 +0,0 @@ -ARG img_version -FROM godot-fedora:${img_version} - -RUN dnf -y install --setopt=install_weak_deps=False \ - autoconf automake libtool clang cmake fuse fuse-devel libxml2-devel libicu-devel compat-openssl10-devel bzip2-devel kmod cpio && \ - git clone --progress https://github.com/mackyle/xar.git && \ - cd xar/xar && \ - git checkout 66d451dab1ef859dd0c83995f2379335d35e53c9 && \ - ./autogen.sh --prefix=/usr && \ - make -j && make install && \ - cd /root && \ - git clone --progress https://github.com/NiklasRosenstein/pbzx && \ - cd pbzx && \ - git checkout 2a4d7c3300c826d918def713a24d25c237c8ed53 && \ - clang -O3 -llzma -lxar -I /usr/local/include pbzx.c -o pbzx - -CMD mkdir -p /root/xcode && \ - cd /root/xcode && \ - xar -xf /root/files/Xcode_10.3.xip && \ - /root/pbzx/pbzx -n Content | cpio -i && \ - cp -r Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk /tmp/MacOSX10.14.sdk && \ - mkdir -p /tmp/MacOSX10.14.sdk/usr/include/c++ && \ - cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/MacOSX10.14.sdk/usr/include/c++/ && \ - mkdir -p mkdir -p /tmp/MacOSX10.14.sdk/usr/share/man && \ - cp -rf Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/share/man/man1 \ - Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/share/man/man3 \ - Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/share/man/man5 /tmp/MacOSX10.14.sdk/usr/share/man/ && \ - cd /tmp && \ - tar -cJf /root/files/MacOSX10.14.sdk.tar.xz MacOSX10.14.sdk && \ - rm -rf MacOSX10.14 && \ - cd /root/xcode && \ - cp -r Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk /tmp/iPhoneOS12.4.sdk && \ - mkdir -p /tmp/iPhoneOS12.4.sdk/usr/include/c++ && \ - cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/iPhoneOS12.4.sdk/usr/include/c++/ && \ - cd /tmp && \ - tar -cJf /root/files/iPhoneOS12.4.sdk.tar.xz iPhoneOS12.4.sdk && \ - rm -rf iPhoneOS12.4.sdk && \ - cd /root/xcode && \ - cp -r Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk /tmp/iPhoneOS12.4.sdk && \ - mkdir -p /tmp/iPhoneOS12.4.sdk/usr/include/c++ && \ - cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/iPhoneOS12.4.sdk/usr/include/c++/ && \ - cd /tmp && \ - tar -cJf /root/files/iPhoneSimulator12.4.sdk.tar.xz iPhoneOS12.4.sdk diff --git a/tools/build-containers/README.md b/tools/build-containers/README.md deleted file mode 100644 index 8b98f87..0000000 --- a/tools/build-containers/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Godot engine build containers - -Based on https://github.com/godotengine/build-containers - -This repository contains the Dockerfiles for the official Godot engine builds. These containers should help you build Godot for all platforms supported on any machine that can run Docker containers. - -## Building - -There is a 'build.sh' script included to build the containers themselves. The in-container build scripts will follow shortly. - diff --git a/tools/build-containers/build_containers.sh b/tools/build-containers/build_containers.sh deleted file mode 100755 index 7c84930..0000000 --- a/tools/build-containers/build_containers.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -set -e - -podman=`which podman || true` - -if [ -z $podman ]; then - echo "podman needs to be in PATH for this script to work." - exit 1 -fi - -files_root=$(pwd)/files -img_version=bs - -mkdir -p logs - -export podman_build="$podman build --build-arg img_version=${img_version}" - -$podman build -v ${files_root}:/root/files -t godot-fedora:${img_version} -f Dockerfile.base . 2>&1 | tee logs/base.log -$podman_build -t godot-linux:${img_version} -f Dockerfile.linux . 2>&1 | tee logs/linux.log - -$podman_build -t godot-mono:${img_version} -f Dockerfile.mono . 2>&1 | tee logs/mono.log -$podman_build -t godot-mono-glue:${img_version} -f Dockerfile.mono-glue . 2>&1 | tee logs/mono-glue.log -$podman_build -t godot-windows:${img_version} -f Dockerfile.windows --ulimit nofile=65536 . 2>&1 | tee logs/windows.log -$podman_build -t godot-javascript:${img_version} -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log -$podman_build -t godot-android:${img_version} -f Dockerfile.android . 2>&1 | tee logs/android.log - -if [ ! -e files/MacOSX10.14.sdk.tar.xz ] || [ ! -e files/iPhoneOS12.4.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator12.4.sdk.tar.xz ]; then - if [ ! -e files/Xcode_10.3.xip ]; then - echo "files/Xcode_10.3.xip is required. It can be downloaded from https://developer.apple.com/download/more/ with a valid apple ID" - exit 1 - fi - - echo "Building OSX and iOS SDK packages. This will take a while" - $podman_build -t godot-xcode-packer:${img_version} -f Dockerfile.xcode -v ${files_root}:/root/files . 2>&1 | tee logs/xcode.log - $podman run -it --rm -v ${files_root}:/root/files godot-xcode-packer:${img_version} 2>&1 | tee logs/xcode_packer.logw -fi - -$podman_build -t godot-osx:${img_version} -f Dockerfile.osx . 2>&1 | tee logs/osx.log -$podman_build -t godot-ios:${img_version} -f Dockerfile.ios . 2>&1 | tee logs/ios.log - -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 godot-msvc:${img_version} -f Dockerfile.msvc -v ${files_root}:/root/files . 2>&1 | tee logs/msvc.log diff --git a/tools/build-containers/files/msvc-fixup.sh b/tools/build-containers/files/msvc-fixup.sh deleted file mode 100644 index 95dd799..0000000 --- a/tools/build-containers/files/msvc-fixup.sh +++ /dev/null @@ -1,24 +0,0 @@ -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x64/msobj140.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/arm/ -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x64/msobj140.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x86/ - -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x64/mspdbcore.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/arm/ -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x64/mspdbcore.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x86/ - -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/mspdb140.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/ -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/mspdb140.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/arm/ - -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/msobj140.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/ -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/msobj140.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/arm/ - -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/mspdbcore.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/ -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/mspdbcore.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/arm/ - -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/mspdbsrv.exe /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/ -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x86/mspdbsrv.exe /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx86/arm/ - -cp /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x64/msvcdis140.dll /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/Hostx64/arm/ - -pushd /root/.wine/drive_c/Program\ Files\ \(x86\)/Microsoft\ SDKs/ -rm -rf ClickOnce\ Bootstrapper/ Portable/ Windows NuGetPackages/ UWPNuGetPackages/ -popd - diff --git a/tools/build-containers/files/patches/fix-fuse-check.diff b/tools/build-containers/files/patches/fix-fuse-check.diff deleted file mode 100644 index 7691d57..0000000 --- a/tools/build-containers/files/patches/fix-fuse-check.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -u a/tools/gen_sdk_package_darling_dmg.sh b/tools/gen_sdk_package_darling_dmg.sh ---- a/tools/gen_sdk_package_darling_dmg.sh 2018-12-20 16:06:04.744507679 +0000 -+++ b/tools/gen_sdk_package_darling_dmg.sh 2018-12-20 16:06:39.000379232 +0000 -@@ -33,22 +33,6 @@ - [ -n "$CC" ] && require $CC - [ -n "$CXX" ] && require $CXX - --set +e -- --command -v lsb_release 2>&1 > /dev/null -- --if [[ $? -eq 0 ]] && [[ -n $(lsb_release -a 2>&1 | grep -i ubuntu) ]]; then -- echo "Using ubuntu, skipping fuse module check" --else -- modinfo fuse &>/dev/null --fi -- --if [ $? -ne 0 ]; then -- echo "Required kernel module 'fuse' not loaded" 1>&2 -- echo "Please run 'insmod fuse' as root" 1>&2 -- exit 1 --fi -- - set -e - - pushd $BUILD_DIR &>/dev/null - diff --git a/tools/build-containers/upload.sh b/tools/build-containers/upload.sh deleted file mode 100644 index 919de5b..0000000 --- a/tools/build-containers/upload.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -e - -podman=podman -if ! which $podman; then - podman=docker -fi - -registry=$1 - -if [ -z "${registry}" ]; then - registry=registry.prehensile-tales.com -fi - -$podman push godot-export:latest ${registry}/godot/export -$podman push godot-mono-glue:latest ${registry}/godot/mono-glue -$podman push godot-windows:latest ${registry}/godot/windows -$podman push godot-ubuntu-32:latest ${registry}/godot/ubuntu-32 -$podman push godot-ubuntu-64:latest ${registry}/godot/ubuntu-64 -$podman push godot-javascript:latest ${registry}/godot/javascript -$podman push godot-xcode-packer:latest ${registry}/godot/xcode-packer - -$podman push godot-android:latest ${registry}/godot-private/android -$podman push godot-ios:latest ${registry}/godot-private/ios -$podman push godot-osx:latest ${registry}/godot-private/macosx -$podman push godot-msvc:latest ${registry}/godot-private/uwp diff --git a/tools/copy_repos.py b/tools/copy_repos.py deleted file mode 100644 index 4d87339..0000000 --- a/tools/copy_repos.py +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Copyright (c) 2019-2020 Péter Magyar -# -# 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. - -import sys -import os -import subprocess -import json -import shutil -import traceback - -def onerror(func, path, exc_info): - """ - https://stackoverflow.com/questions/2656322/shutil-rmtree-fails-on-windows-with-access-is-denied - - Because Windows. - - Error handler for ``shutil.rmtree``. - - If the error is due to an access error (read only file) - it attempts to add write permission and then retries. - - If the error is for another reason it re-raises the error. - - Usage : ``shutil.rmtree(path, onerror=onerror)`` - """ - import stat - if not os.access(path, os.W_OK): - # Is the error an access error ? - os.chmod(path, stat.S_IWUSR) - func(path) - else: - raise - -def copytree(src, dst): - for item in os.listdir(src): - - sp = os.path.join(src, item) - dp = os.path.join(dst, item) - - if os.path.isdir(sp): - if item == ".git" or item == "bin" or item == "__pycache__" or item == ".import" or item == "logs" or item == "release" or item == "export" or item == "build" or item == "libs": - continue - - #print(item) - - if os.path.isdir(dp): - shutil.rmtree(dp, onerror=onerror) - - copytree(sp, dp) - else: - if item.endswith(".a") or item.endswith(".class") or item.endswith(".dex") or item.endswith(".pyc") or item.endswith(".o") or item.endswith(".bc") or item.endswith(".so") or item == "export_presets.cfg" or item.endswith(".gen.h") or item.endswith(".os") or item.endswith(".dblite") or item == ".scons_node_count" or item == ".scons_env.json" or item == "compile_commands.json" or item == "config.log" or item.endswith(".gen.inc") or item.endswith(".gen.cpp") : - continue - - #print(item) - - if not os.path.isdir(dst): - os.makedirs(dst) - - shutil.copy2(sp, dp) - -def copy_repository(data, target_folder, clone_path): - copytree(os.path.abspath(clone_path + data[1] + '/' + data[2]), os.path.abspath(target_folder + data[1])) - - -#copy_repository(rep, './game/addons/', '.' + module_clone_path) - -#print(sys.argv) - -if len(sys.argv) == 3: - src_dir = sys.argv[1] - dst_dir = sys.argv[2] - - src_dir = os.path.abspath(src_dir) - dst_dir = os.path.abspath(dst_dir) - - copytree(src_dir, dst_dir) - - -else: - print("Usange: python copy_repos.py source_dir target_dir") diff --git a/tools/vscode-setup/launch.json b/tools/vscode-setup/launch.json deleted file mode 100644 index 985eb3e..0000000 --- a/tools/vscode-setup/launch.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "build and debug", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/bin/godot.x11.opt.tools.64", - "args": [ - "--path", - "${workspaceFolder}/../game/" - ], - "stopAtEntry": false, - "cwd": "${workspaceFolder}", - "environment": [ - { - "name": "LD_LIBRARY_PATH", - "value": "${workspaceFolder}/bin/" - } - ], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ], - "preLaunchTask": "build", - //"miDebuggerPath": "/usr/bin/gdb" - }, - { - "name": "debug", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/bin/godot.x11.opt.tools.64", - //"args": ["-e"], - "args": [ - "--path", - "${workspaceFolder}/../game/", - ], - "stopAtEntry": false, - "cwd": "${workspaceFolder}", - "environment": [ - { - "name": "LD_LIBRARY_PATH", - "value": "${workspaceFolder}/bin/" - } - ], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ], - //"preLaunchTask": "build", - //"miDebuggerPath": "/usr/bin/gdb" - } - ] -} \ No newline at end of file diff --git a/tools/vscode-setup/settings.json b/tools/vscode-setup/settings.json deleted file mode 100644 index 9ce7b68..0000000 --- a/tools/vscode-setup/settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "files.associations": { - "functional": "cpp", - }, - "editor.formatOnSave": true -} \ No newline at end of file diff --git a/tools/vscode-setup/tasks.json b/tools/vscode-setup/tasks.json deleted file mode 100644 index e53957c..0000000 --- a/tools/vscode-setup/tasks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "build", - "type": "shell", - "command": "scons", - "group": "build", - "args": [ - "platform=x11", - "custom_modules_shared=yes", - "target=release_debug", - //"bin/libess.x11.opt.tools.64.so", - //"bin/libtexture_packer.x11.opt.tools.64.so", - "bin/libvoxelman.x11.opt.tools.64.so", - //"bin/libworld_generator.x11.opt.tools.64.so", - //"bin/libprocedural_animations.x11.opt.tools.64.so", - //"bin/libfqms.x11.opt.tools.64.so", - "-j3" - ], - "problemMatcher": "$msCompile" - } - ] -} \ No newline at end of file