diff --git a/Dockerfile.ios b/Dockerfile.ios index 66acd12..f66bd48 100644 --- a/Dockerfile.ios +++ b/Dockerfile.ios @@ -3,18 +3,20 @@ FROM godot-osx:${img_version} ARG mono_version +ENV IOS_SDK=14.2 + 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 f85f5e4388047a7ab7515fcdb376b25aa11d4d1b && \ - usage_examples/ios_toolchain/build.sh /root/files/iPhoneOS14.0.sdk.tar.xz arm64 && \ + git checkout 634a084377ee2e2932c66459b0396edf76da2e9f && \ + usage_examples/ios_toolchain/build.sh /root/files/iPhoneOS${IOS_SDK}.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/iPhoneSimulator14.0.sdk.tar.xz x86_64 && \ + usage_examples/ios_toolchain/build.sh /root/files/iPhoneSimulator${IOS_SDK}.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 && \ @@ -29,14 +31,14 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand cd /root/${mono_version} && \ cd godot-mono-builds && \ export MONO_SOURCE_ROOT=/root/${mono_version} && \ - python3 ios.py configure -j --verbose --target=arm64 --ios-toolchain ${IOSCROSS_ROOT}/arm64 --ios-sdk ${IOSCROSS_ROOT}/arm64/SDK/iPhoneOS14.0.sdk --osx-toolchain ${OSXCROSS_ROOT} && \ + python3 ios.py configure -j --verbose --target=arm64 --ios-toolchain ${IOSCROSS_ROOT}/arm64 --ios-sdk ${IOSCROSS_ROOT}/arm64/SDK/iPhoneOS${IOS_SDK}.sdk --osx-toolchain ${OSXCROSS_ROOT} && \ python3 ios.py make -j --verbose --target=arm64 && \ - python3 ios.py configure -j --target=x86_64 --ios-toolchain ${IOSCROSS_ROOT}/x86_64 --ios-sdk ${IOSCROSS_ROOT}/x86_64/SDK/iPhoneOS14.0.sdk --osx-toolchain ${OSXCROSS_ROOT} && \ + python3 ios.py configure -j --target=x86_64 --ios-toolchain ${IOSCROSS_ROOT}/x86_64 --ios-sdk ${IOSCROSS_ROOT}/x86_64/SDK/iPhoneOS${IOS_SDK}.sdk --osx-toolchain ${OSXCROSS_ROOT} && \ python3 ios.py make -j --target=x86_64 && \ python3 bcl.py make -j --product=ios && \ # TODO: Emable once godot-mono-builds supports osxcross for the cross-compiler. # It requires having a build of libclang with support for iOS arm64 + changes to the build scripts. - #python3 ios.py configure -j --target=cross-arm64 --ios-toolchain ${IOSCROSS_ROOT}/arm64 --ios-sdk ${IOSCROSS_ROOT}/arm64/SDK/iPhoneOS14.0.sdk --osx-toolchain ${OSXCROSS_ROOT} && \ + #python3 ios.py configure -j --target=cross-arm64 --ios-toolchain ${IOSCROSS_ROOT}/arm64 --ios-sdk ${IOSCROSS_ROOT}/arm64/SDK/iPhoneOS${IOS_SDK}.sdk --osx-toolchain ${OSXCROSS_ROOT} && \ #python3 ios.py make -j --target=cross-arm64 && \ cd /root && \ rm -rf /root/${mono_version} diff --git a/Dockerfile.osx b/Dockerfile.osx index 7ad1f7e..a8351e2 100644 --- a/Dockerfile.osx +++ b/Dockerfile.osx @@ -8,8 +8,8 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand 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 45d2f7ec2ee68c9ad51d590869609b5b3b028605 && \ - ln -s /root/files/MacOSX10.15.sdk.tar.xz /root/osxcross/tarballs && \ + git checkout 9d7f6c2461dccb2b2781fff323f231a4b096fe41 && \ + ln -s /root/files/MacOSX11.0.sdk.tar.xz /root/osxcross/tarballs && \ UNATTENDED=1 ./build.sh ENV OSXCROSS_ROOT=/root/osxcross @@ -17,11 +17,11 @@ ENV PATH="/root/osxcross/target/bin:${PATH}" RUN cp -a /root/files/${mono_version} /root && \ cd /root/${mono_version} && \ - export CMAKE=/root/osxcross/target/bin/x86_64-apple-darwin19-cmake && \ + export CMAKE=/root/osxcross/target/bin/x86_64-apple-darwin20-cmake && \ NOCONFIGURE=1 ./autogen.sh && \ ./configure --prefix=/root/dependencies/mono \ --build=x86_64-linux-gnu \ - --host=x86_64-apple-darwin19 \ + --host=x86_64-apple-darwin20 \ --disable-boehm \ --disable-mcs-build \ --with-tls=pthread \ diff --git a/Dockerfile.xcode b/Dockerfile.xcode index 58d6102..382788e 100644 --- a/Dockerfile.xcode +++ b/Dockerfile.xcode @@ -16,9 +16,9 @@ RUN dnf -y install --setopt=install_weak_deps=False \ CMD mkdir -p /root/xcode && \ cd /root/xcode && \ - xar -xf /root/files/Xcode_12.0.1.xip && \ + xar -xf /root/files/Xcode_12.2.xip && \ /root/pbzx/pbzx -n Content | cpio -i && \ - export OSX_SDK=MacOSX10.15.sdk && \ + export OSX_SDK=MacOSX11.0.sdk && \ cp -r Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk /tmp/${OSX_SDK} && \ mkdir -p /tmp/${OSX_SDK}/usr/include/c++ && \ cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/${OSX_SDK}/usr/include/c++/ && \ @@ -30,7 +30,8 @@ CMD mkdir -p /root/xcode && \ tar -cJf /root/files/${OSX_SDK}.tar.xz ${OSX_SDK} && \ rm -rf ${OSX_SDK} && \ cd /root/xcode && \ - export IOS_SDK=iPhoneOS14.0.sdk && \ + export IOS_SDK=iPhoneOS14.2.sdk && \ + export IOS_SIMULATOR_SDK=iPhoneSimulator14.2.sdk && \ cp -r Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk /tmp/${IOS_SDK} && \ mkdir -p /tmp/${IOS_SDK}/usr/include/c++ && \ cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/${IOS_SDK}/usr/include/c++/ && \ @@ -42,5 +43,5 @@ CMD mkdir -p /root/xcode && \ mkdir -p /tmp/${IOS_SDK}/usr/include/c++ && \ cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/${IOS_SDK}/usr/include/c++/ && \ cd /tmp && \ - tar -cJf /root/files/iPhoneSimulator14.0.sdk.tar.xz ${IOS_SDK} && \ + tar -cJf /root/files/${IOS_SIMULATOR_SDK}.tar.xz ${IOS_SDK} && \ rm -rf ${IOS_SDK} diff --git a/build.sh b/build.sh index fc5db10..6358470 100755 --- a/build.sh +++ b/build.sh @@ -109,9 +109,12 @@ $podman_build_mono -t godot-ubuntu-32:${img_version} -f Dockerfile.ubuntu-32 . 2 $podman_build_mono -t godot-javascript:${img_version} -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log $podman_build_mono -t godot-android:${img_version} -f Dockerfile.android . 2>&1 | tee logs/android.log -if [ ! -e files/MacOSX10.15.sdk.tar.xz ] || [ ! -e files/iPhoneOS14.0.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator14.0.sdk.tar.xz ]; then - if [ ! -e files/Xcode_12.0.1.xip ]; then - echo "files/Xcode_12.0.1.xip is required. It can be downloaded from https://developer.apple.com/download/more/ with a valid apple ID" +XCODE_SDK=12.2 +OSX_SDK=11.0 +IOS_SDK=14.2 +if [ ! -e files/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneOS${IOS_SDK}.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator${IOS_SDK}.sdk.tar.xz ]; then + if [ ! -e files/Xcode_${XCODE_SDK}.xip ]; then + echo "files/Xcode_${XCODE_SDK}.xip is required. It can be downloaded from https://developer.apple.com/download/more/ with a valid apple ID." exit 1 fi