Add parametrized build script

[ci skip]

.github/workflows/release.yml

@@ -37,9 +37,8 @@ jobs:
  shell: bash
  run: |
  python build-scripts/build-release.py \
- --create source \
+ --actions source \
  --commit ${{ inputs.commit }} \
- --project SDL3 \
  --root "${{ github.workspace }}/SDL" \
  --github \
  --debug
@@ -93,7 +92,7 @@ jobs:
  - name: 'Set up Python'
  uses: actions/setup-python@v5
  with:
- python-version: '3.10'
+ python-version: '3.11'
  - name: 'Fetch build-release.py'
  uses: actions/checkout@v4
  with:
@@ -114,9 +113,8 @@ jobs:
  shell: bash
  run: |
  python build-scripts/build-release.py \
- --create xcframework \
+ --actions dmg \
  --commit ${{ inputs.commit }} \
- --project SDL3 \
  --root "${{ steps.tar.outputs.path }}" \
  --github \
  --debug
@@ -240,12 +238,13 @@ jobs:
  outputs:
  VC-x86: ${{ steps.releaser.outputs.VC-x86 }}
  VC-x64: ${{ steps.releaser.outputs.VC-x64 }}
+ VC-arm64: ${{ steps.releaser.outputs.VC-arm64 }}
  VC-devel: ${{ steps.releaser.outputs.VC-devel }}
  steps:
  - name: 'Set up Python'
  uses: actions/setup-python@v5
  with:
- python-version: '3.10'
+ python-version: '3.11'
  - name: 'Fetch build-release.py'
  uses: actions/checkout@v4
  with:
@@ -265,12 +264,11 @@ jobs:
  - name: 'Build MSVC binary archives'
  id: releaser
  run: |
- python build-scripts/build-release.py `
- --create win32 `
- --commit ${{ inputs.commit }} `
- --project SDL3 `
- --root "${{ steps.zip.outputs.path }}" `
- --github `
+ python build-scripts/build-release.py `
+ --actions msvc `
+ --commit ${{ inputs.commit }} `
+ --root "${{ steps.zip.outputs.path }}" `
+ --github `
  --debug
  - name: 'Store MSVC archives'
  uses: actions/upload-artifact@v4
@@ -405,7 +403,7 @@ jobs:
  - name: 'Set up Python'
  uses: actions/setup-python@v5
  with:
- python-version: '3.10'
+ python-version: '3.11'
  - name: 'Fetch build-release.py'
  uses: actions/checkout@v4
  with:
@@ -428,12 +426,11 @@ jobs:
  - name: 'Build MinGW binary archives'
  id: releaser
  run: |
- python build-scripts/build-release.py \
- --create mingw \
- --commit ${{ inputs.commit }} \
- --project SDL3 \
- --root "${{ steps.tar.outputs.path }}" \
- --github \
+ python build-scripts/build-release.py \
+ --actions mingw \
+ --commit ${{ inputs.commit }} \
+ --root "${{ steps.tar.outputs.path }}" \
+ --github \
  --debug
  - name: 'Store MinGW archives'
  uses: actions/upload-artifact@v4
@@ -507,7 +504,7 @@ jobs:
  - name: 'Set up Python'
  uses: actions/setup-python@v5
  with:
- python-version: '3.10'
+ python-version: '3.11'
  - name: 'Fetch build-release.py'
  uses: actions/checkout@v4
  with:
@@ -540,12 +537,11 @@ jobs:
  - name: 'Build Android prefab binary archive(s)'
  id: releaser
  run: |
- python build-scripts/build-release.py \
- --create android \
- --commit ${{ inputs.commit }} \
- --project SDL3 \
- --root "${{ steps.tar.outputs.path }}" \
- --github \
+ python build-scripts/build-release.py \
+ --actions android \
+ --commit ${{ inputs.commit }} \
+ --root "${{ steps.tar.outputs.path }}" \
+ --github \
  --debug
  - name: 'Store Android archive(s)'
  uses: actions/upload-artifact@v4
@@ -560,7 +556,7 @@ jobs:
  - name: 'Set up Python'
  uses: actions/setup-python@v5
  with:
- python-version: '3.10'
+ python-version: '3.11'
  - uses: actions/setup-java@v4
  with:
  distribution: 'temurin'
@@ -581,6 +577,29 @@ jobs:
  mkdir -p /tmp/tardir
  tar -C /tmp/tardir -v -x -f "${{ github.workspace }}/${{ needs.src.outputs.src-tar-gz }}"
  echo "path=/tmp/tardir/${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}" >>$GITHUB_OUTPUT
+ - name: 'Extract Android SDK from AAR'
+ id: sdk
+ run: |
+ python "${{ github.workspace }}/${{ needs.android.outputs.android-aar }}" -o /tmp/SDL3-android
+ echo "prefix=/tmp/SDL3-android" >>$GITHUB_OUTPUT
+ - name: 'CMake (configure + build) x86, x64, arm32, arm64'
+ run: |
+ android_abis="x86 x86_64 armeabi-v7a arm64-v8a"
+ for android_abi in ${android_abis}; do
+ echo "Configuring ${android_abi}..."
+ cmake -S "${{ steps.src.outputs.path }}/cmake/test" \
+ -DTEST_FULL=TRUE \
+ -DTEST_STATIC=FALSE \
+ -DTEST_TEST=TRUE \
+ -DCMAKE_PREFIX_PATH="${{ steps.sdk.outputs.prefix }}" \
+ -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
+ -DANDROID_ABI=${android_abi} \
+ -Werror=dev \
+ -DCMAKE_BUILD_TYPE=Release \
+ -B "${android_abi}"
+ echo "Building ${android_abi}..."
+ cmake --build "${android_abi}" --config Release --verbose
+ done
  - name: 'Create gradle project'
  id: create-gradle-project
  run: |
@@ -591,11 +610,6 @@ jobs:
  --variant aar \
  --output "/tmp/projects"
  echo "path=/tmp/projects/org.libsdl.testspriteminimal" >>$GITHUB_OUTPUT
-
- echo ""
- echo "Project contents:"
- echo ""
- find "/tmp/projects/org.libsdl.testspriteminimal"
  - name: 'Copy SDL3 aar into Gradle project'
  run: |
  cp "${{ github.workspace }}/${{ needs.android.outputs.android-aar }}" "${{ steps.create-gradle-project.outputs.path }}/app/libs"
@@ -604,34 +618,11 @@ jobs:
  echo "Project contents:"
  echo ""
  find "${{ steps.create-gradle-project.outputs.path }}"
- - name: 'Build app (Gradle & ndk-build)'
- run: |
- cd "${{ steps.create-gradle-project.outputs.path }}"
- ./gradlew -i assembleRelease -PBUILD_WITH_CMAKE=1
  - name: 'Build app (Gradle & CMake)'
  run: |
  cd "${{ steps.create-gradle-project.outputs.path }}"
- ./gradlew -i assembleRelease
- - name: 'Extract Android SDK from AAR'
- id: sdk
- run: |
- python "${{ github.workspace }}/${{ needs.android.outputs.android-aar }}" -o /tmp/SDL3-android
- echo "prefix=/tmp/SDL3-android" >>$GITHUB_OUTPUT
- - name: 'CMake (configure + build) x86, x64, arm32, arm64'
+ ./gradlew -i assembleRelease -Pandroid.native.buildOutput=verbose -PBUILD_WITH_CMAKE=1
+ - name: 'Build app (Gradle & ndk-build)'
  run: |
- android_abis="x86 x86_64 armeabi-v7a arm64-v8a"
- for android_abi in ${android_abis}; do
- echo "Configuring ${android_abi}..."
- cmake -S "${{ steps.src.outputs.path }}/cmake/test" \
- -DTEST_FULL=TRUE \
- -DTEST_STATIC=FALSE \
- -DTEST_TEST=TRUE \
- -DCMAKE_PREFIX_PATH="${{ steps.sdk.outputs.prefix }}" \
- -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
- -DANDROID_ABI=${android_abi} \
- -Werror=dev \
- -DCMAKE_BUILD_TYPE=Release \
- -B "${android_abi}"
- echo "Building ${android_abi}..."
- cmake --build "${android_abi}" --config Release --verbose
- done
+ cd "${{ steps.create-gradle-project.outputs.path }}"
+ ./gradlew -i assembleRelease -Pandroid.native.buildOutput=verbose

CMakeLists.txt

@@ -1415,13 +1415,20 @@ if(ANDROID)
  set(javadoc_index_html "${javadocdir}/index.html")
  add_custom_command(
  OUTPUT "${javadoc_index_html}"
- COMMAND ${CMAKE_COMMAND} -E rm -rf "${javadocdir}"
+ COMMAND ${CMAKE_COMMAND} -E rm -rf "${javadocdir}" "${javadocjar}"
  COMMAND ${Java_JAVADOC_EXECUTABLE} -encoding utf8 -d "${javadocdir}"
  -classpath "${path_android_jar}"
  -author -use -version ${SDL_JAVA_SOURCES}
  DEPENDS ${SDL_JAVA_SOURCES} "${path_android_jar}"
  )
- add_custom_target(SDL3-javadoc ALL DEPENDS "${javadoc_index_html}")
+ add_custom_command(
+ OUTPUT "${javadocjar}"
+ COMMAND ${Java_JAR_EXECUTABLE} -c -f "${javadocjar}"
+ -C "${javadocdir}" *
+ WORKING_DIRECTORY "${javadocdir}"
+ DEPENDS ${javadoc_index_html}
+ )
+ add_custom_target(SDL3-javadoc ALL DEPENDS "${javadoc_index_html}" "${javadocjar}")
  set_property(TARGET SDL3-javadoc PROPERTY OUTPUT_DIR "${javadocdir}")
  endif()
  endif()
@@ -3645,7 +3652,7 @@ if(NOT SDL_DISABLE_INSTALL)
  )
  endif()
  if(TARGET SDL3-javasources)
- install(FILES  "${SDL3_BINARY_DIR}/SDL3-${SDL3_VERSION}-sources.jar"
+ install(FILES "${SDL3_BINARY_DIR}/SDL3-${SDL3_VERSION}-sources.jar"
  DESTINATION "${SDL_INSTALL_JAVADIR}/SDL3")
  endif()
  endif()
@@ -3659,7 +3666,7 @@ if(NOT SDL_DISABLE_INSTALL)
  )
  if(TARGET SDL3-javadoc)
  set(SDL_INSTALL_JAVADOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/javadoc" CACHE PATH "Path where to install SDL3 javadoc")
- install(DIRECTORY "${SDL3_BINARY_DIR}/docs/javadoc/"
+ install(FILES "${SDL3_BINARY_DIR}/SDL3-${SDL3_VERSION}-javadoc.jar"
  DESTINATION "${SDL_INSTALL_JAVADOCDIR}/SDL3")
  endif()
  endif()

Xcode/SDL/SDL.xcodeproj/project.pbxproj

@@ -2793,7 +2793,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "set -ex\n\nmkdir -p build/dmg-tmp/share/cmake/SDL3\ncp -a build/SDL3.xcframework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/share/cmake/SDL3/sdl3-config.cmake build/dmg-tmp/share/cmake/SDL3\ncp pkg-support/resources/share/cmake/SDL3/sdl3-config-version.cmake build/dmg-tmp/share/cmake/SDL3\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL3 -srcfolder build/dmg-tmp build/SDL3.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
+ shellScript = "set -ex\n\nmkdir -p build/dmg-tmp/share/cmake/SDL3\ncp -a build/SDL3.xcframework build/dmg-tmp/\n\ncp pkg-support/resources/License.txt build/dmg-tmp\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\ncp pkg-support/resources/share/cmake/SDL3/SDL3Config.cmake build/dmg-tmp/share/cmake/SDL3\ncp pkg-support/resources/share/cmake/SDL3/SDL3ConfigVersion.cmake build/dmg-tmp/share/cmake/SDL3\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nfind build/dmg-tmp -name .DS_Store -exec rm -f \"{}\" \\;\n\n# for fancy .dmg\nmkdir -p build/dmg-tmp/.logo\ncp pkg-support/resources/SDL_DS_Store build/dmg-tmp/.DS_Store\ncp pkg-support/sdl_logo.pdf build/dmg-tmp/.logo\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname SDL3 -srcfolder build/dmg-tmp build/SDL3.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
  };
  F3B38CF0296F63D1005DA6D3 /* ShellScript */ = {
  isa = PBXShellScriptBuildPhase;

Xcode/SDL/pkg-support/resources/share/cmake/SDL3/sdl3-config.cmake → Xcode/SDL/pkg-support/resources/share/cmake/SDL3/SDL3Config.cmake

@@ -59,7 +59,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
  set(_xcfw_target_subdir "macos-arm64_x86_64")
 else()
- message(WARNING "Unsupported Apple platform (${CMAKE_SYSTEM_NAME}) and broken sdl3-config-version.cmake")
+ message(WARNING "Unsupported Apple platform (${CMAKE_SYSTEM_NAME}) and broken SDL3ConfigVersion.cmake")
  set(SDL3_FOUND FALSE)
  return()
 endif()