godotengine/build-containers
1
0
Fork 0
mirror of https://github.com/godotengine/build-containers.git synced 2026-01-05 22:10:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update XCode version for iOS and MacOS

Browse Source
This commit is contained in:
Hein-Pieter van Braam-Stewart
2019-10-01 22:04:13 +02:00
parent a62e85620a
commit db63b23b59
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.base
View File

@@ -1,4 +1,4 @@
FROM fedora:29 FROM fedora:30
WORKDIR /root WORKDIR /root

4
Dockerfile.ios
View File

@@ -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 && \ git clone https://github.com/tpoechtrager/cctools-port.git && \
cd /root/cctools-port && \ cd /root/cctools-port && \
sed -i 's#./autogen.sh#libtoolize -c -i --force\n./autogen.sh#' usage_examples/ios_toolchain/build.sh && \ 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 && \ mkdir -p /root/ioscross/arm64 && \
mv usage_examples/ios_toolchain/target/* /root/ioscross/arm64 && \ mv usage_examples/ios_toolchain/target/* /root/ioscross/arm64 && \
mkdir /root/ioscross/arm64/usr && \ mkdir /root/ioscross/arm64/usr && \
ln -s /root/ioscross/arm64/bin /root/ioscross/arm64/usr/bin && \ 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 && \ 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 && \ mkdir -p /root/ioscross/x86_64 && \
mv usage_examples/ios_toolchain/target/* /root/ioscross/x86_64 && \ mv usage_examples/ios_toolchain/target/* /root/ioscross/x86_64 && \
mkdir /root/ioscross/x86_64/usr && \ mkdir /root/ioscross/x86_64/usr && \

2
Dockerfile.msvc
View File

@@ -1,7 +1,7 @@
FROM godot-fedora:latest FROM godot-fedora:latest
ENV WINEDEBUG=-all 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://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 && \ 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 vcrun2017; wineserver -w" ;\

2
Dockerfile.osx
View File

@@ -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 && \ 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 && \ git clone https://github.com/tpoechtrager/osxcross.git && \
cd /root/osxcross && \ 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 ;\ UNATTENDED=1 ./build.sh ;\
cd /root && \ cd /root && \
git clone https://github.com/tpoechtrager/apple-libtapi.git && \ git clone https://github.com/tpoechtrager/apple-libtapi.git && \

26
Dockerfile.xcode
View File

@@ -14,24 +14,24 @@ CMD mkdir -p /root/xcode && \
cd /root/xcode && \ cd /root/xcode && \
xar -xf /root/files/Xcode_9.2.xip && \ xar -xf /root/files/Xcode_9.2.xip && \
/root/pbzx/pbzx -n Content | cpio -i && \ /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/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.13.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.13.sdk/usr/share/man && \ mkdir -p mkdir -p /tmp/MacOSX10.14.sdk/usr/share/man && \
cp -rf Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/share/man/man1 \ 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/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 && \ cd /tmp && \
tar -cJf /root/files/MacOSX10.13.sdk.tar.xz MacOSX10.13.sdk && \ tar -cJf /root/files/MacOSX10.14.sdk.tar.xz MacOSX10.14.sdk && \
rm -rf MacOSX10.13 && \ rm -rf MacOSX10.14 && \
cd /root/xcode && \ 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/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/iPhoneOS11.2.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 && \ cd /tmp && \
tar -cJf /root/files/iPhoneOS11.2.sdk.tar.xz iPhoneOS11.2.sdk && \ tar -cJf /root/files/iPhoneOS12.4.sdk.tar.xz iPhoneOS12.4.sdk && \
rm -rf iPhoneOS11.2.sdk && \ rm -rf iPhoneOS12.4.sdk && \
cd /root/xcode && \ 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/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/iPhoneOS11.2.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 && \ 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

6
build.sh
View File

@@ -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 . $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/MacOSX10.14.sdk.tar.xz ] || [ ! -e files/iPhoneOS12.4.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator12.4.sdk.tar.xz ]; then
if [ ! -e files/Xcode_9.2.xip ]; then if [ ! -e files/Xcode_10.3.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" 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 exit 1
fi fi

4
upload.sh
View File

@@ -15,7 +15,7 @@ fi
$podman push godot-export:latest ${registry}/godot/export $podman push godot-export:latest ${registry}/godot/export
$podman push godot-mono-glue:latest ${registry}/godot/mono-glue $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-32:latest ${registry}/godot/ubuntu-32
$podman push godot-ubuntu-64:latest ${registry}/godot/ubuntu-64 $podman push godot-ubuntu-64:latest ${registry}/godot/ubuntu-64
$podman push godot-javascript:latest ${registry}/godot/javascript $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-android:latest ${registry}/godot-private/android
$podman push godot-ios:latest ${registry}/godot-private/ios $podman push godot-ios:latest ${registry}/godot-private/ios
$podman push godot-osx:latest ${registry}/godot-private/macosx $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