Skip to content

S
skiko
Unverified Commit fe3b47b4 authored by Ivan Matkov's avatar Ivan Matkov Committed by GitHub
Browse files
Options

Move build scripts from skia-pack to skia repo (#1183) 

[SKIKO-1095](https://youtrack.jetbrains.com/issue/SKIKO-1095) Move build
scripts from `skia-pack` to `skia` fork

https://github.com/JetBrains/skia/pull/15
parent be90a3fa
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 68 deletions
skiko/build-with-local-skia.sh
View file @ fe3b47b4
...@@ -3,53 +3,50 @@ ...@@ -3,53 +3,50 @@
# #
# This script handles git operations and delegates configuration to Gradle. # This script handles git operations and delegates configuration to Gradle.
# For more control, use Gradle tasks directly: # For more control, use Gradle tasks directly:
# ./gradlew prepareLocalSkiaBuild -Pskia.pack.dir=/path/to/skia-pack # ./gradlew prepareLocalSkiaBuild -Pskia.repo.dir=/path/to/skia
# ./gradlew publishToMavenLocal -Pskia.dir=/path/to/skia # ./gradlew publishToMavenLocal -Pskia.dir=/path/to/skia
# #
# Environment variables: # Environment variables:
# SKIA_VERSION - Skia version to build (default: from gradle.properties) # SKIA_VERSION - Skia version to build (default: from gradle.properties)
# SKIA_TARGET - Target platform: ios, iosSim, macos, windows, linux, wasm (default: current OS) # SKIA_TARGET - Target platform: ios, iosSim, macos, windows, linux, wasm (default: current OS)
# SKIA_PACK_DIR - Skia-pack repository directory with tools/skia_release/ (default: ./skia-pack) # SKIA_REPO_DIR - Skia repository directory with tools/skia_release/ (default: ./skia)
# SKIA_DIR - Skia source directory for publishing (default: $SKIA_PACK_DIR/skia) # SKIA_DIR - Skia source directory for publishing (default: $SKIA_REPO_DIR)
set -e # Exit on error set -e # Exit on error
cd "$(dirname "$0")" cd "$(dirname "$0")"
SCRIPT_DIR="$(pwd)" SCRIPT_DIR="$(pwd)"
# Use provided skia-pack directory or default # Use provided Skia repository directory or default
SKIA_PACK_DIR="${SKIA_PACK_DIR:-$SCRIPT_DIR/skia-pack}" SKIA_REPO_DIR="${SKIA_REPO_DIR:-${SKIA_PACK_DIR:-$SCRIPT_DIR/skia}}"
# Clone if needed # Clone if needed
if [ ! -d "$SKIA_PACK_DIR" ]; then if [ ! -d "$SKIA_REPO_DIR" ]; then
echo "Cloning skia-pack repository to $SKIA_PACK_DIR..." echo "Cloning skia repository to $SKIA_REPO_DIR..."
git clone https://github.com/JetBrains/skia-pack.git "$SKIA_PACK_DIR" git clone https://github.com/JetBrains/skia.git "$SKIA_REPO_DIR"
fi fi
# Convert to absolute path if relative # Convert to absolute path if relative
if [[ "$SKIA_PACK_DIR" != /* ]]; then if [[ "$SKIA_REPO_DIR" != /* ]]; then
SKIA_PACK_DIR="$(cd "$SKIA_PACK_DIR" && pwd)" SKIA_REPO_DIR="$(cd "$SKIA_REPO_DIR" && pwd)"
fi fi
echo "Using skia-pack directory: $SKIA_PACK_DIR" echo "Using skia repository: $SKIA_REPO_DIR"
cd "$SKIA_PACK_DIR" cd "$SKIA_REPO_DIR"
# Get version from Gradle (respects SKIA_VERSION env var) # Get version from Gradle (respects SKIA_VERSION env var)
SKIA_VERSION=$(cd "$SCRIPT_DIR" && ./gradlew -q printSkiaVersion) SKIA_VERSION=$(cd "$SCRIPT_DIR" && ./gradlew -q printSkiaVersion)
echo "Using Skia version: $SKIA_VERSION" echo "Using Skia version: $SKIA_VERSION"
# Checkout the Skia sources corresponding to the selected version
echo "Checking out Skia sources for version: $SKIA_VERSION"
python3 script/checkout.py --version "$SKIA_VERSION"
# Build Skia binaries # Build Skia binaries
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR"
echo "Building Skia binaries with Gradle..." echo "Building Skia binaries with Gradle..."
./gradlew prepareLocalSkiaBuild -Pskia.pack.dir="$SKIA_PACK_DIR" ./gradlew prepareLocalSkiaBuild -Pskia.repo.dir="$SKIA_REPO_DIR"
# Publish Skiko to Maven Local with the built Skia binaries # Publish Skiko to Maven Local with the built Skia binaries
# If SKIA_DIR not explicitly set, use the default location where Python scripts output built Skia # If SKIA_DIR is not explicitly set, use the same checkout that contains the
# integrated release scripts and the built outputs.
if [ -z "$SKIA_DIR" ]; then if [ -z "$SKIA_DIR" ]; then
SKIA_DIR="$SKIA_PACK_DIR/skia" SKIA_DIR="$SKIA_REPO_DIR"
fi fi
echo "Publishing Skiko to Maven Local..." echo "Publishing Skiko to Maven Local..."
......
skiko/build.gradle.kts
View file @ fe3b47b4
...@@ -378,13 +378,11 @@ tasks.register<BuildLocalSkiaTask>("prepareLocalSkiaBuild") { ...@@ -378,13 +378,11 @@ tasks.register<BuildLocalSkiaTask>("prepareLocalSkiaBuild") {
skiaTarget.set(provider { skiko.skiaTarget }) skiaTarget.set(provider { skiko.skiaTarget })
buildType.set(skiko.buildType) buildType.set(skiko.buildType)
// Set skiaPackDir - either from property or default location val skiaRepoDir = skiko.skiaRepoDir
val skiaPackDir = skiko.skiaPackDir if (skiaRepoDir != null) {
if (skiaPackDir != null) { this.skiaRepoDir.set(skiaRepoDir)
this.skiaPackDir.set(skiaPackDir)
} else { } else {
// Will be set by bash script via -Pskia.pack.dir, or use default skia-pack this.skiaRepoDir.set(project.file("skia"))
this.skiaPackDir.set(project.file("skia-pack"))
} }
skikoTargetFlags.set(provider { skikoTargetFlags.set(provider {
......
skiko/buildSrc/src/main/kotlin/BuildLocalSkiaTask.kt
View file @ fe3b47b4
...@@ -19,7 +19,7 @@ abstract class BuildLocalSkiaTask : DefaultTask() { ...@@ -19,7 +19,7 @@ abstract class BuildLocalSkiaTask : DefaultTask() {
abstract val buildType: Property<SkiaBuildType> abstract val buildType: Property<SkiaBuildType>
@get:InputDirectory @get:InputDirectory
abstract val skiaPackDir: DirectoryProperty abstract val skiaRepoDir: DirectoryProperty
@get:Internal @get:Internal
abstract val skikoTargetFlags: ListProperty<String> abstract val skikoTargetFlags: ListProperty<String>
...@@ -29,15 +29,14 @@ abstract class BuildLocalSkiaTask : DefaultTask() { ...@@ -29,15 +29,14 @@ abstract class BuildLocalSkiaTask : DefaultTask() {
val version = skiaVersion.get() val version = skiaVersion.get()
val target = skiaTarget.get() val target = skiaTarget.get()
val type = buildType.get() val type = buildType.get()
val skiaPackRoot = skiaPackDir.get().asFile val skiaRepoRoot = skiaRepoDir.get().asFile
// Validate that skiaPackDir points to skia-pack repository root val scriptsDir = File(skiaRepoRoot, "tools/skia_release")
val scriptsDir = File(skiaPackRoot, "script")
if (!scriptsDir.isDirectory) { if (!scriptsDir.isDirectory) {
throw GradleException( throw GradleException(
"Directory script not found in ${skiaPackRoot.absolutePath}\n" + "Directory tools/skia_release not found in ${skiaRepoRoot.absolutePath}\n" +
"Expected: skia-pack repository root containing script/\n" + "Expected: skia repository root containing tools/skia_release/\n" +
"Ensure skia.pack.dir points to the correct skia-pack directory" "Ensure skia.repo.dir points to the correct skia checkout"
) )
} }
...@@ -51,8 +50,8 @@ abstract class BuildLocalSkiaTask : DefaultTask() { ...@@ -51,8 +50,8 @@ abstract class BuildLocalSkiaTask : DefaultTask() {
} }
logger.lifecycle("Building Skia $version for target ${target.id} in ${type.id} mode") logger.lifecycle("Building Skia $version for target ${target.id} in ${type.id} mode")
logger.lifecycle("Using skia-pack directory: ${skiaPackRoot.absolutePath}") logger.lifecycle("Using skia repository: ${skiaRepoRoot.absolutePath}")
logger.lifecycle("Using scripts directory: script") logger.lifecycle("Using scripts directory: tools/skia_release")
// Determine host architecture // Determine host architecture
val hostArch = when (System.getProperty("os.arch")) { val hostArch = when (System.getProperty("os.arch")) {
...@@ -64,14 +63,12 @@ abstract class BuildLocalSkiaTask : DefaultTask() { ...@@ -64,14 +63,12 @@ abstract class BuildLocalSkiaTask : DefaultTask() {
val machines = target.machines(hostArch) val machines = target.machines(hostArch)
logger.lifecycle("Building for architectures: ${machines.joinToString { it.id }}") logger.lifecycle("Building for architectures: ${machines.joinToString { it.id }}")
// Checkout Skia dependencies
runPythonScript(skiaPackRoot, "checkout.py", "--version", version)
// Build and archive for each machine // Build and archive for each machine
machines.forEach { machine -> machines.forEach { machine ->
logger.lifecycle("Building for ${machine.id}...") logger.lifecycle("Building for ${machine.id}...")
runPythonScript( runPythonScript(
skiaPackRoot, "build.py", skiaRepoRoot, "build.py",
"--skia-dir", ".",
"--target", target.id, "--target", target.id,
"--machine", machine.id, "--machine", machine.id,
"--build-type", type.id "--build-type", type.id
...@@ -79,7 +76,8 @@ abstract class BuildLocalSkiaTask : DefaultTask() { ...@@ -79,7 +76,8 @@ abstract class BuildLocalSkiaTask : DefaultTask() {
logger.lifecycle("Archiving ${machine.id}...") logger.lifecycle("Archiving ${machine.id}...")
runPythonScript( runPythonScript(
skiaPackRoot, "archive.py", skiaRepoRoot, "archive.py",
"--skia-dir", ".",
"--version", version, "--version", version,
"--target", target.id, "--target", target.id,
"--machine", machine.id, "--machine", machine.id,
...@@ -92,19 +90,19 @@ abstract class BuildLocalSkiaTask : DefaultTask() { ...@@ -92,19 +90,19 @@ abstract class BuildLocalSkiaTask : DefaultTask() {
project.file("build/classes/kotlin").deleteRecursively() project.file("build/classes/kotlin").deleteRecursively()
logger.lifecycle("Skia binaries built successfully") logger.lifecycle("Skia binaries built successfully")
logger.lifecycle("Next: Run './gradlew publishToMavenLocal -Pskia.dir=<skia-source-dir>' to publish") logger.lifecycle("Next: Run './gradlew publishToMavenLocal -Pskia.dir=<skia-repo-dir>' to publish")
} }
private fun runPythonScript(skiaPackRoot: File, script: String, vararg args: String) { private fun runPythonScript(skiaRepoRoot: File, script: String, vararg args: String) {
val scriptPath = "script/$script" val scriptPath = "tools/skia_release/$script"
val scriptFile = File(skiaPackRoot, scriptPath) val scriptFile = File(skiaRepoRoot, scriptPath)
// Validate script file exists // Validate script file exists
if (!scriptFile.exists()) { if (!scriptFile.exists()) {
throw GradleException( throw GradleException(
"Python script not found: ${scriptFile.absolutePath}\n" + "Python script not found: ${scriptFile.absolutePath}\n" +
"Expected: skia-pack directory with script/$script\n" + "Expected: skia directory with tools/skia_release/$script\n" +
"Ensure skia.pack.dir points to correct skia-pack directory" "Ensure skia.repo.dir points to the correct skia checkout"
) )
} }
...@@ -114,7 +112,7 @@ abstract class BuildLocalSkiaTask : DefaultTask() { ...@@ -114,7 +112,7 @@ abstract class BuildLocalSkiaTask : DefaultTask() {
val output = ByteArrayOutputStream() val output = ByteArrayOutputStream()
val result = project.exec { val result = project.exec {
workingDir = skiaPackRoot workingDir = skiaRepoRoot
commandLine = fullCommand commandLine = fullCommand
standardOutput = output standardOutput = output
errorOutput = output errorOutput = output
......
skiko/buildSrc/src/main/kotlin/SkikoProjectContext.kt
View file @ fe3b47b4
...@@ -29,16 +29,24 @@ class SkikoProjectContext( ...@@ -29,16 +29,24 @@ class SkikoProjectContext(
} }
fun SkikoProjectContext.declareSkiaTasks() { fun SkikoProjectContext.declareSkiaTasks() {
val basicConfigs = listOf("android", "ios", "iosSim", "linux", "macos", "tvos", "tvosSim", "wasm", "windows") mapOf(
"android" to listOf("arm64", "x64"),
basicConfigs.forEach { config -> "ios" to listOf("arm64", "x64"),
(if (config == "wasm") listOf("wasm") else listOf("arm64", "x64")).forEach { arch -> "iosSim" to listOf("arm64", "x64"),
"linux" to listOf("arm64", "x64"),
"macos" to listOf("arm64", "x64"),
"tvos" to listOf("arm64"),
"tvosSim" to listOf("arm64", "x64"),
"wasm" to listOf("wasm"),
"windows" to listOf("arm64", "x64"),
).forEach { (config, architectures) ->
architectures.forEach { arch ->
val taskNameSuffix = joinToTitleCamelCase(config, arch) val taskNameSuffix = joinToTitleCamelCase(config, arch)
val target = "$config-$arch" val target = "$config-$arch"
val skiaReleaseTag = project.skiaVersion(target) val skiaReleaseTag = project.skiaVersion(target)
val skiaBaseUrl = "https://github.com/JetBrains/skia-pack/releases/download/$skiaReleaseTag" val skiaBaseUrl = "https://github.com/JetBrains/skia/releases/download/$skiaReleaseTag"
val artifactId = "Skia-${skiaReleaseTag}-${config}-$buildType-${arch}" val artifactId = "Skia-${skiaReleaseTag}-${config}-$buildType-${arch}"
......
skiko/buildSrc/src/main/kotlin/properties.kt
View file @ fe3b47b4
...@@ -158,23 +158,34 @@ class SkikoProperties(private val myProject: Project) { ...@@ -158,23 +158,34 @@ class SkikoProperties(private val myProject: Project) {
get() = System.getenv()["SKIKO_VSBT_PATH"]?.let { File(it) }?.takeIf { it.isDirectory } get() = System.getenv()["SKIKO_VSBT_PATH"]?.let { File(it) }?.takeIf { it.isDirectory }
/** /**
* Skia-pack repository root directory for building Skia from source. * Skia repository root directory for building Skia from source.
* *
* Property naming conventions: * Property naming conventions:
* - Gradle property: `-Pskia.pack.dir=...` (kebab-case, Gradle convention) * - Gradle property: `-Pskia.repo.dir=...` (preferred)
* - Kotlin accessor: `skiaPackDir` (camelCase, Kotlin convention) * - Kotlin accessor: `skiaRepoDir`
* - Environment variable: `SKIA_PACK_DIR` * - Environment variable: `SKIA_REPO_DIR`
* *
* Usage: `-Pskia.pack.dir=/path/to/skia-pack` * Legacy `skia.pack.dir` and `SKIA_PACK_DIR` are still accepted to keep
* existing local workflows working while the standalone repo is retired.
* *
* Note: Must point to skia-pack repository root containing script/ with Python build scripts. * Usage: `-Pskia.repo.dir=/path/to/skia`
*
* Note: Must point to skia repository root containing tools/skia_release/.
*/ */
// todo: make compatible with the configuration cache // todo: make compatible with the configuration cache
val skiaPackDir: File? val skiaRepoDir: File?
get() = (System.getenv()["SKIA_PACK_DIR"] ?: System.getProperty("skia.pack.dir") ?: myProject.findProperty("skia.pack.dir") get() = (
?.toString())?.let { skiaPackDirProp -> System.getenv()["SKIA_REPO_DIR"]
val file = File(skiaPackDirProp) ?: System.getenv()["SKIA_PACK_DIR"]
if (!file.isDirectory) throw (GradleException("\"skia.pack.dir\" property was explicitly set to ${skiaPackDirProp} which is not resolved as a directory")) ?: System.getProperty("skia.repo.dir")
?: System.getProperty("skia.pack.dir")
?: myProject.findProperty("skia.repo.dir")?.toString()
?: myProject.findProperty("skia.pack.dir")?.toString()
)?.let { skiaRepoDirProp ->
val file = File(skiaRepoDirProp)
if (!file.isDirectory) {
throw GradleException("\"skia.repo.dir\" property was explicitly set to $skiaRepoDirProp which is not resolved as a directory")
}
file file
} }
...@@ -189,6 +200,7 @@ class SkikoProperties(private val myProject: Project) { ...@@ -189,6 +200,7 @@ class SkikoProperties(private val myProject: Project) {
* Usage: `-Pskia.dir=/path/to/skia` * Usage: `-Pskia.dir=/path/to/skia`
* *
* Note: Must point to directory containing built Skia source code and headers. * Note: Must point to directory containing built Skia source code and headers.
* When using the integrated release scripts this is typically the same path as `skia.repo.dir`.
*/ */
// todo: make compatible with the configuration cache // todo: make compatible with the configuration cache
val skiaDir: File? val skiaDir: File?
......
skiko/buildSrc/src/main/kotlin/tasks/configuration/CommonTasksConfiguration.kt
View file @ fe3b47b4
...@@ -24,6 +24,21 @@ import supportWeb ...@@ -24,6 +24,21 @@ import supportWeb
import toTitleCase import toTitleCase
import java.io.File import java.io.File
private fun Project.appleToolchainOutputOrNull(vararg args: String): String? =
runCatching {
providers.exec {
commandLine("xcrun", *args)
}.standardOutput.asText.get().trim()
}.getOrNull()?.ifBlank { null }
fun Project.appleToolchainExecutableOrDefault(tool: String, fallback: String): String =
appleToolchainOutputOrNull("--find", tool) ?: fallback
fun Project.appleMacOsSdkFlags(): List<String> =
appleToolchainOutputOrNull("--sdk", "macosx", "--show-sdk-path")
?.let { listOf("-isysroot", it) }
?: emptyList()
fun skiaHeadersDirs(skiaDir: File): List<File> = fun skiaHeadersDirs(skiaDir: File): List<File> =
listOf( listOf(
skiaDir, skiaDir,
......
skiko/buildSrc/src/main/kotlin/tasks/configuration/JvmTasksConfiguration.kt
View file @ fe3b47b4
...@@ -72,8 +72,10 @@ fun SkikoProjectContext.createCompileJvmBindingsTask( ...@@ -72,8 +72,10 @@ fun SkikoProjectContext.createCompileJvmBindingsTask(
val osFlags: Array<String> val osFlags: Array<String>
when (targetOs) { when (targetOs) {
OS.MacOS -> { OS.MacOS -> {
compiler.set(project.appleToolchainExecutableOrDefault("clang++", compiler.get()))
includeHeadersNonRecursive(jdkHome.resolve("include/darwin")) includeHeadersNonRecursive(jdkHome.resolve("include/darwin"))
osFlags = arrayOf( osFlags = arrayOf(
*project.appleMacOsSdkFlags().toTypedArray(),
*targetOs.clangFlags, *targetOs.clangFlags,
*buildType.clangFlags, *buildType.clangFlags,
"-arch", if (targetArch == Arch.Arm64) "arm64" else "x86_64", "-arch", if (targetArch == Arch.Arm64) "arm64" else "x86_64",
...@@ -199,7 +201,7 @@ fun SkikoProjectContext.createObjcCompileTask( ...@@ -199,7 +201,7 @@ fun SkikoProjectContext.createObjcCompileTask(
includeHeadersNonRecursive(projectDir.resolve("src/commonMain/cpp/common/include")) includeHeadersNonRecursive(projectDir.resolve("src/commonMain/cpp/common/include"))
includeHeadersNonRecursive(projectDir.resolve("src/jvmMain/cpp")) includeHeadersNonRecursive(projectDir.resolve("src/jvmMain/cpp"))
compiler.set("clang") compiler.set(project.appleToolchainExecutableOrDefault("clang", "clang"))
buildVariant.set(buildType) buildVariant.set(buildType)
buildTargetOS.set(os) buildTargetOS.set(os)
buildTargetArch.set(arch) buildTargetArch.set(arch)
...@@ -207,6 +209,7 @@ fun SkikoProjectContext.createObjcCompileTask( ...@@ -207,6 +209,7 @@ fun SkikoProjectContext.createObjcCompileTask(
listOf( listOf(
"-fobjc-arc", "-fobjc-arc",
"-arch", if (arch == Arch.Arm64) "arm64" else "x86_64", "-arch", if (arch == Arch.Arm64) "arm64" else "x86_64",
*project.appleMacOsSdkFlags().toTypedArray(),
*os.clangFlags, *os.clangFlags,
*buildType.clangFlags, *buildType.clangFlags,
*skiaPreprocessorFlags(os, buildType), *skiaPreprocessorFlags(os, buildType),
......
skiko/buildSrc/src/main/kotlin/tasks/configuration/NativeTasksConfiguration.kt
View file @ fe3b47b4
...@@ -116,7 +116,9 @@ fun SkikoProjectContext.compileNativeBridgesTask( ...@@ -116,7 +116,9 @@ fun SkikoProjectContext.compileNativeBridgesTask(
)) ))
} }
OS.MacOS -> { OS.MacOS -> {
compiler.set(project.appleToolchainExecutableOrDefault("clang++", compiler.get()))
flags.set(listOf( flags.set(listOf(
*project.appleMacOsSdkFlags().toTypedArray(),
*buildType.clangFlags, *buildType.clangFlags,
*skiaPreprocessorFlags(OS.MacOS, buildType), *skiaPreprocessorFlags(OS.MacOS, buildType),
when(arch) { when(arch) {
......
skiko/gradle.properties
View file @ fe3b47b4
...@@ -6,8 +6,8 @@ kotlin.mpp.enableCInteropCommonization=true ...@@ -6,8 +6,8 @@ kotlin.mpp.enableCInteropCommonization=true
deploy.version=0.0.0 deploy.version=0.0.0
# a tag from https://github.com/JetBrains/skia-pack # a tag from https://github.com/JetBrains/skia/releases
dependencies.skia=m144-e2e6623374-4 dependencies.skia=m144-22f58c9fd4
# a tag from https://github.com/JetBrains/angle-pack # a tag from https://github.com/JetBrains/angle-pack
dependencies.angle=ec4d8f8e4d dependencies.angle=ec4d8f8e4d
...@@ -24,7 +24,6 @@ dependencies.angle=ec4d8f8e4d ...@@ -24,7 +24,6 @@ dependencies.angle=ec4d8f8e4d
# dependencies.skia.macos-arm64 # dependencies.skia.macos-arm64
# dependencies.skia.macos-x64 # dependencies.skia.macos-x64
# dependencies.skia.tvos-arm64 # dependencies.skia.tvos-arm64
# dependencies.skia.tvos-x64
# dependencies.skia.tvosSim-arm64 # dependencies.skia.tvosSim-arm64
# dependencies.skia.tvosSim-x64 # dependencies.skia.tvosSim-x64
# dependencies.skia.wasm-wasm # dependencies.skia.wasm-wasm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment