Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions server/envs/generate_user_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ OUTPUT_FILE=$ENV_DIR/user.env
if [[ -z $1 ]]; then
echo "Load macos environment..."
source ${ENV_DIR}/macos.env
APPENDED_PATH=${PLATFORMSDK_DIR}/XcodeDefault${XCODE_26_VERSION}.xctoolchain/usr/bin:/usr/local/bin:${PATH}
APPENDED_PATH=${PLATFORMSDK_DIR}/XcodeDefault${XCODE_VERSION}.xctoolchain/usr/bin:/usr/local/bin:${PATH}
else
echo "Load $1 environment..."
source ${ENV_DIR}/$1.env
Expand All @@ -42,8 +42,8 @@ fi
[ -f "$OUTPUT_FILE" ] && echo "Remove old user.env" && rm "$OUTPUT_FILE"

if [[ "" == "${JAVA_HOME}" ]]; then
# select java home for JDK 21
JAVA_HOME=`/usr/libexec/java_home -v 21`
# select java home for JDK 25
JAVA_HOME=`/usr/libexec/java_home -v 25`
fi

echo "ENV_DIR=${ENV_DIR}" > $OUTPUT_FILE
Expand All @@ -63,7 +63,7 @@ echo "DOTNET_VERSION_FILE=${DOTNET_VERSION_FILE}" >> $OUTPUT_FILE
echo "NUGET_PACKAGES=${NUGET_PACKAGES}" >> $OUTPUT_FILE
# Added 1.4.9
echo "ZIG_PATH_0_11=${ZIG_PATH_0_11}" >> $OUTPUT_FILE
echo "XCTOOLCHAIN_PATH=${PLATFORMSDK_DIR}/XcodeDefault${XCODE_16_VERSION}.xctoolchain" >> $OUTPUT_FILE
echo "XCTOOLCHAIN_PATH=${PLATFORMSDK_DIR}/XcodeDefault${XCODE_VERSION}.xctoolchain" >> $OUTPUT_FILE

echo "PATH=\"${APPENDED_PATH}\"" >> $OUTPUT_FILE

Expand Down
17 changes: 8 additions & 9 deletions server/envs/macos.env
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
SWIFT_5_5_VERSION=5.5
IOS_VERSION_MIN=11.0
MACOS_VERSION_MIN=10.15
XCODE_16_VERSION=16.2
XCODE_16_CLANG_VERSION=16.0.0
MACOS_15_VERSION=15.2
IOS_18_VERSION=18.2
ZIG_VERSION=0.11.0
IOS_VERSION_MIN=15.0
SWIFT_6_2_VERSION=6.2
IOS_26_VERSION_MIN=15.0
MACOS_26_VERSION_MIN=11.5
SWIFT_VERSION=6.2
MACOS_VERSION_MIN=11.5
XCODE_26_VERSION=26.2
XCODE_VERSION=26.2
XCODE_26_CLANG_VERSION=17.0.0
XCODE_CLANG_VERSION=17.0.0
MACOS_26_VERSION=26.2
MACOS_VERSION=26.2
IOS_26_VERSION=26.2
IOS_VERSION=26.2
26 changes: 13 additions & 13 deletions server/test-data/sdk/a/defoldsdk/extender/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ platforms:

osx:
env:
PATH: "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_16_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"
PATH: "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"
PLATFORMSDK_DIR: "{{env.PLATFORMSDK_DIR}}"
MANIFEST_MERGE_TOOL: "{{env.MANIFEST_MERGE_TOOL}}"
XCODE_VERSION: "{{env.XCODE_16_VERSION}}"
XCODE_CLANG_VERSION: "{{env.XCODE_16_CLANG_VERSION}}"
MACOS_VERSION: "{{env.MACOS_15_VERSION}}"
XCODE_VERSION: "{{env.XCODE_VERSION}}"
XCODE_CLANG_VERSION: "{{env.XCODE_CLANG_VERSION}}"
MACOS_VERSION: "{{env.MACOS_VERSION}}"
MACOS_VERSION_MIN: "{{env.MACOS_VERSION_MIN}}"
SWIFT_VERSION: "{{env.SWIFT_5_5_VERSION}}"
SYSROOT: "{{env.PLATFORMSDK_DIR}}/MacOSX{{env.MACOS_15_VERSION}}.sdk"
SWIFT_VERSION: "{{env.SWIFT_VERSION}}"
SYSROOT: "{{env.PLATFORMSDK_DIR}}/MacOSX{{env.MACOS_VERSION}}.sdk"
context:
frameworks: ["Foundation", "AppKit", "Cocoa", "OpenGL", "OpenAL", "AGL", "IOKit", "Carbon", "CoreVideo", "QuartzCore"]
engineLibs: ["engine", "engine_service", "mbedtls", "zip", "profile", "remotery", "profilerext", "record", "gameobject", "ddf", "resource", "gamesys", "gamesys_model", "gamesys_rig", "script_box2d", "graphics", "graphics_transcoder_basisu", "basis_transcoder", "physics", "BulletDynamics", "BulletCollision", "platform", "LinearMath", "Box2D", "render", "render_font_default", "script", "luajit-5.1", "extension", "hid", "input", "particle", "rig", "dlib", "image", "glfw3", "gui", "crashext", "sound", "tremolo", "vpx", "liveupdate"]
Expand Down Expand Up @@ -193,13 +193,13 @@ platforms:

ios:
env:
PATH: "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_16_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"
PATH: "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/bin:{{env.PATH}}"
PLATFORMSDK_DIR: "{{env.PLATFORMSDK_DIR}}"
MANIFEST_MERGE_TOOL: "{{env.MANIFEST_MERGE_TOOL}}"
XCODE_VERSION: "{{env.XCODE_16_VERSION}}"
XCODE_CLANG_VERSION: "{{env.XCODE_16_CLANG_VERSION}}"
SWIFT_VERSION: "{{env.SWIFT_5_5_VERSION}}"
IOS_VERSION: "{{env.IOS_18_VERSION}}"
XCODE_VERSION: "{{env.XCODE_VERSION}}"
XCODE_CLANG_VERSION: "{{env.XCODE_CLANG_VERSION}}"
SWIFT_VERSION: "{{env.SWIFT_VERSION}}"
IOS_VERSION: "{{env.IOS_VERSION}}"
IOS_VERSION_MIN: "{{env.IOS_VERSION_MIN}}"

context:
Expand Down Expand Up @@ -234,7 +234,7 @@ platforms:

arm64-ios:
env:
SYSROOT: "{{env.PLATFORMSDK_DIR}}/iPhoneOS{{env.IOS_18_VERSION}}.sdk"
SYSROOT: "{{env.PLATFORMSDK_DIR}}/iPhoneOS{{env.IOS_VERSION}}.sdk"
context:
libPaths: ["{{dynamo_home}}/lib/arm64-ios", "{{dynamo_home}}/ext/lib/arm64-ios", "{{env.SYSROOT}}/usr/lib", "{{env.SYSROOT}}/usr/lib/swift", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift-{{env.SWIFT_VERSION}}/iphoneos", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift/iphoneos", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/clang/{{env.XCODE_CLANG_VERSION}}/lib/darwin"]
defines: ["DM_PLATFORM_IOS"]
Expand All @@ -251,7 +251,7 @@ platforms:

x86_64-ios:
env:
SYSROOT: "{{env.PLATFORMSDK_DIR}}/iPhoneSimulator{{env.IOS_18_VERSION}}.sdk"
SYSROOT: "{{env.PLATFORMSDK_DIR}}/iPhoneSimulator{{env.IOS_VERSION}}.sdk"
context:
libPaths: ["{{dynamo_home}}/lib/x86_64-ios", "{{dynamo_home}}/ext/lib/x86_64-ios", "{{env.SYSROOT}}/usr/lib", "{{env.SYSROOT}}/usr/lib/swift", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift-{{env.SWIFT_VERSION}}/iphonesimulator", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift/iphonesimulator", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/clang/{{env.XCODE_CLANG_VERSION}}/lib/darwin"]
defines: ["IOS_SIMULATOR", "DM_PLATFORM_IOS", "LUA_BYTECODE_ENABLE_32"]
Expand Down
Loading