Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated to XCode 15.1 for the Darwin server #333

Merged
merged 1 commit into from
Jan 5, 2024
Merged

Updated to XCode 15.1 for the Darwin server #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion server/scripts/standalone/service-standalone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ export IOS_VERSION_MIN=11.0
export MACOS_VERSION_MIN=10.13

# Versions from >=1.6.2
export XCODE_15_VERSION=15.0.1
export XCODE_15_VERSION=15.1
export XCODE_15_CLANG_VERSION=15.0.0
# Versions from >=1.6.3
export MACOS_14_VERSION=14.2
export IOS_17_VERSION=17.2

# Added 1.4.9
export ZIG_PATH_0_11=${PLATFORMSDK_DIR}/zig-0-11
Expand Down
12 changes: 6 additions & 6 deletions server/scripts/standalone/setup-standalone-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,8 @@ function download_package() {
local package_name=$1
local out_package_name=$package_name

if [ "XcodeDefault14.2.xctoolchain.darwin" == "$package_name" ]; then
out_package_name="XcodeDefault14.2.xctoolchain"
fi
if [ "XcodeDefault15.0.1.xctoolchain.darwin" == "$package_name" ]; then
out_package_name="XcodeDefault15.0.1.xctoolchain"
if [[ "$package_name" == *darwin ]]; then
out_package_name=$(sed "s/.darwin//g" <<< ${package_name})
fi

if [[ ! -e ${PLATFORMSDK_DIR}/${out_package_name} ]]; then
Expand Down Expand Up @@ -97,10 +94,13 @@ function download_zig() {
# Keep Apple's naming convention to avoid bugs
PACKAGES=(
iPhoneOS16.2.sdk
iPhoneOS17.2.sdk
iPhoneSimulator16.2.sdk
iPhoneSimulator17.2.sdk
MacOSX13.1.sdk
MacOSX14.2.sdk
XcodeDefault14.2.xctoolchain.darwin
XcodeDefault15.0.1.xctoolchain.darwin
XcodeDefault15.1.xctoolchain.darwin
)

ZIG_VERSION=0.11.0
Expand Down
4 changes: 3 additions & 1 deletion server/src/test/java/com/defold/extender/ExtenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ static Map<String, String> createEnv()
// TODO: Read these from the Dockerfile itself
env.put("PLATFORMSDK_DIR", "/opt/platformsdk");
env.put("MANIFEST_MERGE_TOOL", "/opt/local/bin/manifestmergetool.jar");
env.put("XCODE_15_VERSION", "15.0.1");
env.put("XCODE_15_VERSION", "15.1");
env.put("XCODE_15_CLANG_VERSION", "15.0.0");
env.put("IOS_16_VERSION", "16.2");
env.put("IOS_17_VERSION", "17.2");
env.put("LIB_TAPI_1_6_PATH", "/usr/local/tapi1.6/lib");
env.put("MACOS_13_VERSION", "13.1");
env.put("MACOS_14_VERSION", "14.2");
env.put("MACOS_VERSION_MIN", "10.13");
env.put("SWIFT_5_5_VERSION", "5.5");
env.put("SYSROOT", "/opt/platformsdk/MacOSX13.1.sdk");
Expand Down
8 changes: 4 additions & 4 deletions server/test-data/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ ANDROID_64_NDK_API_VERSION='21'
ANDROID_SYS_ROOT=${ANDROID_NDK}/toolchains/llvm/prebuilt/${HOST}-x86_64/sysroot
ANDROID_INCLUDE_ARCH=${ANDROID_NDK}/sources/android/cpufeatures

IOS_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.0.1.xctoolchain/usr/bin/clang++
IOS_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.0.1.xctoolchain/usr/bin/ar
IOS_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.1.xctoolchain/usr/bin/clang++
IOS_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.1.xctoolchain/usr/bin/ar
IOS_MIN_VERSION=11.0
IOS_SYS_ROOT=${DYNAMO_HOME}/ext/SDKs/iPhoneOS16.2.sdk

OSX_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.0.1.xctoolchain/usr/bin/clang++
OSX_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.0.1.xctoolchain/usr/bin/ar
OSX_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.1.xctoolchain/usr/bin/clang++
OSX_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault15.1.xctoolchain/usr/bin/ar
OSX_MIN_VERSION=10.13
OSX_SYS_ROOT=${DYNAMO_HOME}/ext/SDKs/MacOSX13.1.sdk

Expand Down