Update XCode version for iOS and MacOS

hpvb · hpvb · commit db63b23b592a · 2019-10-01T22:04:13.000+02:00
diff --git a/Dockerfile.base b/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM fedora:30
 
 WORKDIR /root
 
diff --git a/Dockerfile.ios b/Dockerfile.ios
@@ -4,13 +4,13 @@ RUN dnf -y install automake autoconf clang gcc gcc-c++ gcc-objc gcc-objc++ cmake
     git clone https://github.com/tpoechtrager/cctools-port.git && \
     cd /root/cctools-port && \
     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/iPhoneOS11.2.sdk.tar.xz arm64 && \
+    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/iPhoneSimulator11.2.sdk.tar.xz x86_64 && \
+    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 && \
diff --git a/Dockerfile.msvc b/Dockerfile.msvc
@@ -1,7 +1,7 @@
 FROM godot-fedora:latest
 
 ENV WINEDEBUG=-all
-RUN dnf -y install wine winetricks xorg-x11-server-Xvfb curl p7zip-plugins && dnf clean all && \
+RUN dnf -y install wine winetricks xorg-x11-server-Xvfb curl p7zip-plugins findutils && dnf clean all && \
     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" ;\
diff --git a/Dockerfile.osx b/Dockerfile.osx
@@ -7,7 +7,7 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
 RUN dnf -y install automake autoconf bzip2-devel clang git libicu-devel libtool libxml2-devel llvm-devel make openssl-devel patch scons xz bzip2 yasm && dnf clean all && \
     git clone https://github.com/tpoechtrager/osxcross.git && \
     cd /root/osxcross && \
-    ln -s /root/files/MacOSX10.13.sdk.tar.xz /root/osxcross/tarballs && \
+    ln -s /root/files/MacOSX10.14.sdk.tar.xz /root/osxcross/tarballs && \
     UNATTENDED=1 ./build.sh ;\
     cd /root && \
     git clone https://github.com/tpoechtrager/apple-libtapi.git && \
diff --git a/Dockerfile.xcode b/Dockerfile.xcode
@@ -14,24 +14,24 @@ CMD mkdir -p /root/xcode && \
     cd /root/xcode && \
     xar -xf /root/files/Xcode_9.2.xip && \
     /root/pbzx/pbzx -n Content | cpio -i && \
-    cp -r Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk /tmp/MacOSX10.13.sdk && \
-    cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/MacOSX10.13.sdk/usr/include/c++ && \
-    mkdir -p mkdir -p /tmp/MacOSX10.13.sdk/usr/share/man && \
+    cp -r Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk /tmp/MacOSX10.14.sdk && \
+    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.13.sdk/usr/share/man && \
+           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.13.sdk.tar.xz MacOSX10.13.sdk && \
-    rm -rf MacOSX10.13 && \
+    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/iPhoneOS11.2.sdk && \
-    cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/iPhoneOS11.2.sdk/usr/include/c++ && \
+    cp -r Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk /tmp/iPhoneOS12.4.sdk && \
+    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/iPhoneOS11.2.sdk.tar.xz iPhoneOS11.2.sdk && \
-    rm -rf iPhoneOS11.2.sdk && \
+    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/iPhoneOS11.2.sdk && \
-    cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/iPhoneOS11.2.sdk/usr/include/c++ && \
+    cp -r Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk /tmp/iPhoneOS12.4.sdk && \
+    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/iPhoneSimulator11.2.sdk.tar.xz iPhoneOS11.2.sdk
+    tar -cJf /root/files/iPhoneSimulator12.4.sdk.tar.xz iPhoneOS12.4.sdk
 
diff --git a/build.sh b/build.sh
@@ -36,9 +36,9 @@ $podman build -t godot-javascript:latest -f Dockerfile.javascript .
 
 $podman build -t godot-xcode-packer:latest -f Dockerfile.xcode -v $(pwd)/files:/root/files .
 
-if [ ! -e files/MacOSX10.13.sdk.tar.xz ] || [ ! -e files/iPhoneOS11.2.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator11.2.sdk.tar.xz ]; then
-  if [ ! -e files/Xcode_9.2.xip ]; then
-    echo "files/Xcode_9.2.xip is required. It can be downloaded from https://developer.apple.com/download/more/ with a valid apple ID"
+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
 
diff --git a/upload.sh b/upload.sh
@@ -15,7 +15,7 @@ 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-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
@@ -24,4 +24,4 @@ $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
+#$podman push godot-msvc:latest ${registry}/godot-private/uwp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM fedora:29`
	`1`	`+FROM fedora:30`
`2`	`2`
`3`	`3`	`WORKDIR /root`
`4`	`4`