diff --git a/Dockerfile.ios b/Dockerfile.ios index ae9e52c..07db1c2 100644 --- a/Dockerfile.ios +++ b/Dockerfile.ios @@ -45,7 +45,7 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand # Until we can build the cross-compiler, we include a pre-made build in the container. RUN mkdir -p /root/aot-compilers/iphone-arm64 && \ - curl -LO https://github.com/godotengine/godot-mono-builds/releases/download/release-bda87f2/ios-cross-arm64.zip && \ + curl -LO https://github.com/godotengine/godot-mono-builds/releases/download/release-df330ce/ios-cross-arm64.zip && \ dnf -y install --setopt=install_weak_deps=False p7zip && \ 7za e ios-cross-arm64.zip ios-cross-arm64-release/bin/aarch64-apple-darwin-mono-sgen -o/root/aot-compilers/iphone-arm64 && \ rm ios-cross-arm64.zip diff --git a/README.md b/README.md index 22ff640..175e155 100644 --- a/README.md +++ b/README.md @@ -35,18 +35,18 @@ The 'build.sh' script included is used to build the containers themselves. Run the command using: - ./build.sh 3.2 mono-6.12.0.114 + ./build.sh 3.x mono-6.12.0.122 Note that this will also download that Mono branch (2020-02) from Mono repository. -That branch corresponds to the given Mono version (6.12.0.114) as per +That branch corresponds to the given Mono version (6.12.0.122) as per https://www.mono-project.com/docs/about-mono/versioning/#mono-source-versioning . More details can be found in the Godot https://github.com/godotengine/godot-mono-builds repository (but you don't need this repository, as in this case Mono is built inside the containers) -The above will generate images using the tag '3.2-mono-6.12.0.114'. This is convenient -since as of today, this branch can be used to compile every 3.2.x version or +The above will generate images using the tag '3.x-mono-6.12.0.122'. This is convenient +since as of today, this branch can be used to compile every 3.x version or your custom modifications. ### Selecting which images to build @@ -138,4 +138,3 @@ These are the expected container image sizes, so you can plan your disk usage in In addition to this, generating containers will also require some host disk space (around 4.5GB) for the downloaded Mono sources and dependencies. - diff --git a/build.sh b/build.sh index fea589c..8853d96 100755 --- a/build.sh +++ b/build.sh @@ -20,7 +20,7 @@ fi if [ -z "$1" -o -z "$2" ]; then echo "Usage: $0 [ ]" echo - echo "Examples: $0 3.2 mono-6.12.0.114" + echo "Examples: $0 3.x mono-6.12.0.122" echo " $0 master mono-6.6.0.160 2019-08 bef1e6335812d32f8eab648c0228fc624b9f8357" echo echo "godot branch:" @@ -97,7 +97,7 @@ if [ ! -e ${mono_root} ]; then # Set up godot-mono-builds in tree git clone --progress https://github.com/godotengine/godot-mono-builds pushd godot-mono-builds - git checkout d462909236457cd212b17378c29ce336749e260d + git checkout df330ce0bec35836a33b97db27c1e72014571103 export MONO_SOURCE_ROOT=${mono_root} python3 patch_mono.py popd