Skip to content

S
skiko
Unverified Commit a7cb9eb3 authored by dima.avdeev's avatar dima.avdeev Committed by GitHub
Browse files
Options

Build Skiko with local Skia to mavenLocal (#828)

parent 3aa3db3b
Show whitespace changes
Inline Side-by-side
Showing with 271 additions and 110 deletions
skiko/.gitignore
View file @ a7cb9eb3
...@@ -7,3 +7,5 @@ dependencies/ ...@@ -7,3 +7,5 @@ dependencies/
# Screenshot test actual files # Screenshot test actual files
**/src/**/screenshots/*_actual.png **/src/**/screenshots/*_actual.png
skia-pack
skiko/RELEASE.md
View file @ a7cb9eb3
...@@ -22,6 +22,7 @@ build configuration. ...@@ -22,6 +22,7 @@ build configuration.
./gradlew publishToMavenLocal -Pskiko.native.enabled=true -Pskiko.wasm.enabled=true -Pskiko.android.enabled=true ./gradlew publishToMavenLocal -Pskiko.native.enabled=true -Pskiko.wasm.enabled=true -Pskiko.android.enabled=true
``` ```
Use flag `-Pskiko.debug=true` to build with debug build type. Use flag `-Pskiko.debug=true` to build with debug build type.
Artifact will be published to mavenLocal with postfix "+debug", for example "0.0.0-SNAPSHOT+debug".
##### Publish to `build/repo` directory ##### Publish to `build/repo` directory
```bash ```bash
......
skiko/build-with-local-skia.sh 0 → 100755
View file @ a7cb9eb3
#!/usr/bin/env bash
####### Variables you can edit to change build config, or set same environment variables before script execution #######
SKIA_VERSION="${SKIA_VERSION:="m116-51072f3-1"}" # Version of Skia m###-commit-sha-#. This commit sha will be cloned from repository https://github.com/JetBrains/skia
SKIA_DEBUG_MODE="${SKIA_DEBUG_MODE:="false"}" # in debug mode Skiko will be published with postix "+debug", for example "0.0.0-SNAPSHOT+debug"
SKIA_TARGET="${SKIA_TARGET:="iosSim"}" # possible values: "ios", "iosSim", "macos", "windows", "linux", "wasm", "android", "tvos", "tvosSim"
# For M1 Mac use "iosSim" to build for simulator, and ios to build for device.
# For Intel Mac - use "ios" target to build for iOS x64 simulator.
# For Desktop JVM use "macos", "windows", "linux"
########################################################################################################################
if [[ $SKIA_DEBUG_MODE == "true" ]]; then
skikoBuildType=Debug
else
skikoBuildType=Release
fi
case $SKIA_TARGET in
"ios")
if [[ $(uname -m) == 'arm64' ]]; then
SKIKO_TARGET_FLAGS="-Pskiko.native.ios.arm64.enabled=true -Pskiko.awt.enabled=false"
skikoMachines=("arm64")
else
SKIKO_TARGET_FLAGS="-Pskiko.native.ios.x64.enabled=true -Pskiko.awt.enabled=false"
skikoMachines=("x64")
fi
;;
"iosSim")
if [[ $(uname -m) == 'arm64' ]]; then
SKIKO_TARGET_FLAGS="-Pskiko.native.ios.simulatorArm64.enabled=true -Pskiko.awt.enabled=false"
skikoMachines=("arm64")
else
SKIKO_TARGET_FLAGS="-Pskiko.native.ios.x64.enabled=true -Pskiko.awt.enabled=false"
skikoMachines=("x64")
fi
;;
"macos")
SKIKO_TARGET_FLAGS="-Pskiko.awt.enabled=true"
if [[ $(uname -m) == 'arm64' ]]; then
skikoMachines=("arm64" , "x64") # spaces around comma matters
else
skikoMachines=("x64")
fi
;;
"windows")
SKIKO_TARGET_FLAGS="-Pskiko.awt.enabled=true"
if [[ $(uname -m) == 'arm64' ]]; then
skikoMachines=("arm64")
else
skikoMachines=("x64")
fi
;;
"linux")
SKIKO_TARGET_FLAGS="-Pskiko.awt.enabled=true"
if [[ $(uname -m) == 'arm64' ]]; then
skikoMachines=("arm64")
else
skikoMachines=("x64")
fi
;;
"wasm")
SKIKO_TARGET_FLAGS="-Pskiko.wasm.enabled=true -Pskiko.awt.enabled=false"
if [[ $(uname -m) == 'arm64' ]]; then
skikoMachines=("arm64")
else
skikoMachines=("x64")
fi
;;
*)
echo "can't determine skia target"; exit 1
;;
esac
set -e # fail fast
set -x # print all commands
cd "$(dirname "$0")"
SCRIPT_DIR="$(pwd)"
git clone https://github.com/JetBrains/skia-pack.git || echo "skia-pack exists. You can remove it or update by hands with git pull"
cd skia-pack
[ -d "skia" ] && echo "skip cript/checkout.py, because directory skia-pack/skia already exists"
[ ! -d "skia" ] && python3 script/checkout.py --version "$SKIA_VERSION"
for skikoMachine in ${skikoMachines[@]}; do
python3 script/build.py --target "$SKIA_TARGET" --machine "$skikoMachine" --build-type "$skikoBuildType"
python3 script/archive.py --version "$SKIA_VERSION" --target "$SKIA_TARGET" --machine "$skikoMachine" --build-type "$skikoBuildType"
done
cd "$SCRIPT_DIR"
rm -rf build/classes/kotlin/* # We need to drop old cache. We can do it with ./gradlew clean as well, but it tooks longer time to redownload dependencies dir.
./gradlew publishToMavenLocal $SKIKO_TARGET_FLAGS -Pskia.dir="$(pwd)/skia-pack/skia" -Pskiko.debug=$SKIA_DEBUG_MODE
skiko/build.gradle.kts
View file @ a7cb9eb3
...@@ -213,9 +213,37 @@ internal val Project.isInIdea: Boolean ...@@ -213,9 +213,37 @@ internal val Project.isInIdea: Boolean
return System.getProperty("idea.active")?.toBoolean() == true return System.getProperty("idea.active")?.toBoolean() == true
} }
val Project.supportNative: Boolean val Project.supportAwt: Boolean
get() = findProperty("skiko.awt.enabled") == "true" || isInIdea
val Project.supportAllNative: Boolean
get() = findProperty("skiko.native.enabled") == "true" || isInIdea get() = findProperty("skiko.native.enabled") == "true" || isInIdea
val Project.supportAllNativeIos: Boolean
get() = supportAllNative || findProperty("skiko.native.ios.enabled") == "true" || isInIdea
val Project.supportNativeIosArm64: Boolean
get() = supportAllNativeIos || findProperty("skiko.native.ios.arm64.enabled") == "true" || isInIdea
val Project.supportNativeIosSimulatorArm64: Boolean
get() = supportAllNativeIos || findProperty("skiko.native.ios.simulatorArm64.enabled") == "true" || isInIdea
val Project.supportNativeIosX64: Boolean
get() = supportAllNativeIos || findProperty("skiko.native.ios.x64.enabled") == "true" || isInIdea
val Project.supportAnyNativeIos: Boolean
get() = supportAllNativeIos || supportNativeIosArm64 || supportNativeIosSimulatorArm64 || supportNativeIosX64
val Project.supportNativeMac: Boolean
get() = supportAllNative || findProperty("skiko.native.mac.enabled") == "true" || isInIdea
val Project.supportNativeLinux: Boolean
get() = supportAllNative || findProperty("skiko.native.linux.enabled") == "true" || isInIdea
val Project.supportAnyNative: Boolean
get() = supportAllNative || supportAnyNativeIos || supportNativeMac || supportNativeLinux
val Project.supportWasm: Boolean val Project.supportWasm: Boolean
get() = findProperty("skiko.wasm.enabled") == "true" || isInIdea get() = findProperty("skiko.wasm.enabled") == "true" || isInIdea
...@@ -223,12 +251,14 @@ val Project.supportAndroid: Boolean ...@@ -223,12 +251,14 @@ val Project.supportAndroid: Boolean
get() = findProperty("skiko.android.enabled") == "true" // || isInIdea get() = findProperty("skiko.android.enabled") == "true" // || isInIdea
kotlin { kotlin {
if (supportAwt) {
jvm("awt") { jvm("awt") {
compilations.all { compilations.all {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
generateVersion(targetOs, targetArch) generateVersion(targetOs, targetArch)
} }
}
if (supportAndroid) { if (supportAndroid) {
jvm("android") { jvm("android") {
...@@ -261,14 +291,22 @@ kotlin { ...@@ -261,14 +291,22 @@ kotlin {
} }
} }
if (supportNative) { if (supportNativeMac) {
configureNativeTarget(OS.MacOS, Arch.X64, macosX64()) configureNativeTarget(OS.MacOS, Arch.X64, macosX64())
configureNativeTarget(OS.MacOS, Arch.Arm64, macosArm64()) configureNativeTarget(OS.MacOS, Arch.Arm64, macosArm64())
}
if (supportNativeLinux) {
configureNativeTarget(OS.Linux, Arch.X64, linuxX64()) configureNativeTarget(OS.Linux, Arch.X64, linuxX64())
}
if (supportNativeIosArm64) {
configureNativeTarget(OS.IOS, Arch.Arm64, iosArm64()) configureNativeTarget(OS.IOS, Arch.Arm64, iosArm64())
configureNativeTarget(OS.IOS, Arch.X64, iosX64()) }
if (supportNativeIosSimulatorArm64) {
configureNativeTarget(OS.IOS, Arch.Arm64, iosSimulatorArm64()) configureNativeTarget(OS.IOS, Arch.Arm64, iosSimulatorArm64())
} }
if (supportNativeIosX64) {
configureNativeTarget(OS.IOS, Arch.X64, iosX64())
}
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
...@@ -291,10 +329,11 @@ kotlin { ...@@ -291,10 +329,11 @@ kotlin {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$coroutinesVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$coroutinesVersion")
} }
} }
if (supportAwt) {
val awtMain by getting { val awtMain by getting {
dependsOn(jvmMain) dependsOn(jvmMain)
} }
}
if (supportAndroid) { if (supportAndroid) {
val androidMain by getting { val androidMain by getting {
...@@ -314,9 +353,11 @@ kotlin { ...@@ -314,9 +353,11 @@ kotlin {
} }
} }
if (supportAwt) {
val awtTest by getting { val awtTest by getting {
dependsOn(jvmTest) dependsOn(jvmTest)
} }
}
if (supportAndroid) { if (supportAndroid) {
val androidTest by getting { val androidTest by getting {
...@@ -324,7 +365,7 @@ kotlin { ...@@ -324,7 +365,7 @@ kotlin {
} }
} }
if (supportWasm || supportNative) { if (supportWasm || supportAnyNative) {
val nativeJsMain by creating { val nativeJsMain by creating {
dependsOn(commonMain) dependsOn(commonMain)
} }
...@@ -347,7 +388,7 @@ kotlin { ...@@ -347,7 +388,7 @@ kotlin {
} }
} }
if (supportNative) { if (supportAnyNative) {
all { all {
// Really ugly, see https://youtrack.jetbrains.com/issue/KT-46649 why it is required, // Really ugly, see https://youtrack.jetbrains.com/issue/KT-46649 why it is required,
// note that setting it per source set still keeps it unset in commonized source sets. // note that setting it per source set still keeps it unset in commonized source sets.
...@@ -363,6 +404,7 @@ kotlin { ...@@ -363,6 +404,7 @@ kotlin {
val nativeTest by creating { val nativeTest by creating {
dependsOn(nativeJsTest) dependsOn(nativeJsTest)
} }
if (supportNativeLinux) {
val linuxMain by creating { val linuxMain by creating {
dependsOn(nativeMain) dependsOn(nativeMain)
} }
...@@ -375,24 +417,21 @@ kotlin { ...@@ -375,24 +417,21 @@ kotlin {
val linuxX64Test by getting { val linuxX64Test by getting {
dependsOn(linuxTest) dependsOn(linuxTest)
} }
}
if (supportAnyNativeIos || supportNativeMac) {
val darwinMain by creating { val darwinMain by creating {
dependsOn(nativeMain) dependsOn(nativeMain)
} }
val darwinTest by creating { val darwinTest by creating {
dependsOn(nativeTest) dependsOn(nativeTest)
} }
if (supportNativeMac) {
val macosMain by creating { val macosMain by creating {
dependsOn(darwinMain) dependsOn(darwinMain)
} }
val macosTest by creating { val macosTest by creating {
dependsOn(darwinTest) dependsOn(darwinTest)
} }
val iosMain by creating {
dependsOn(darwinMain)
}
val iosTest by creating {
dependsOn(darwinTest)
}
val macosX64Main by getting { val macosX64Main by getting {
dependsOn(macosMain) dependsOn(macosMain)
} }
...@@ -405,18 +444,23 @@ kotlin { ...@@ -405,18 +444,23 @@ kotlin {
val macosArm64Test by getting { val macosArm64Test by getting {
dependsOn(macosTest) dependsOn(macosTest)
} }
val iosX64Main by getting {
dependsOn(iosMain)
} }
val iosX64Test by getting { if (supportAnyNativeIos) {
dependsOn(iosTest) val iosMain by creating {
dependsOn(darwinMain)
}
val iosTest by creating {
dependsOn(darwinTest)
} }
if (supportNativeIosArm64) {
val iosArm64Main by getting { val iosArm64Main by getting {
dependsOn(iosMain) dependsOn(iosMain)
} }
val iosArm64Test by getting { val iosArm64Test by getting {
dependsOn(iosTest) dependsOn(iosTest)
} }
}
if (supportNativeIosSimulatorArm64) {
val iosSimulatorArm64Main by getting { val iosSimulatorArm64Main by getting {
dependsOn(iosMain) dependsOn(iosMain)
} }
...@@ -424,6 +468,17 @@ kotlin { ...@@ -424,6 +468,17 @@ kotlin {
dependsOn(iosTest) dependsOn(iosTest)
} }
} }
if (supportNativeIosX64) {
val iosX64Main by getting {
dependsOn(iosMain)
}
val iosX64Test by getting {
dependsOn(iosTest)
}
}
}
}
}
} }
} }
...@@ -683,14 +738,6 @@ fun skiaStaticLibraries(skiaDir: String, targetString: String): List<String> { ...@@ -683,14 +738,6 @@ fun skiaStaticLibraries(skiaDir: String, targetString: String): List<String> {
val allJvmRuntimeJars = mutableMapOf<Pair<OS, Arch>, TaskProvider<Jar>>() val allJvmRuntimeJars = mutableMapOf<Pair<OS, Arch>, TaskProvider<Jar>>()
val skikoAwtJarForTests by project.tasks.registering(Jar::class) {
archiveBaseName.set("skiko-awt-test")
from(kotlin.jvm("awt").compilations["main"].output.allOutputs)
}
val skikoAwtRuntimeJarForTests = createSkikoJvmJarTask(targetOs, targetArch, skikoAwtJarForTests)
val skikoRuntimeDirForTests = skikoRuntimeDirForTestsTask(targetOs, targetArch, skikoAwtJarForTests, skikoAwtRuntimeJarForTests)
val skikoJarForTests = skikoJarForTestsTask(skikoRuntimeDirForTests)
if (supportAndroid) { if (supportAndroid) {
val os = OS.Android val os = OS.Android
val skikoAndroidJar by project.tasks.registering(Jar::class) { val skikoAndroidJar by project.tasks.registering(Jar::class) {
...@@ -1196,7 +1243,16 @@ fun skikoJarForTestsTask( ...@@ -1196,7 +1243,16 @@ fun skikoJarForTestsTask(
archiveFileName.set("skiko-runtime-for-tests.jar") archiveFileName.set("skiko-runtime-for-tests.jar")
} }
tasks.withType<Test>().configureEach { if (supportAwt) {
val skikoAwtJarForTests by project.tasks.registering(Jar::class) {
archiveBaseName.set("skiko-awt-test")
from(kotlin.jvm("awt").compilations["main"].output.allOutputs)
}
val skikoAwtRuntimeJarForTests = createSkikoJvmJarTask(targetOs, targetArch, skikoAwtJarForTests)
val skikoRuntimeDirForTests = skikoRuntimeDirForTestsTask(targetOs, targetArch, skikoAwtJarForTests, skikoAwtRuntimeJarForTests)
val skikoJarForTests = skikoJarForTestsTask(skikoRuntimeDirForTests)
tasks.withType<Test>().configureEach {
dependsOn(skikoRuntimeDirForTests) dependsOn(skikoRuntimeDirForTests)
dependsOn(skikoJarForTests) dependsOn(skikoJarForTests)
options { options {
...@@ -1228,6 +1284,7 @@ tasks.withType<Test>().configureEach { ...@@ -1228,6 +1284,7 @@ tasks.withType<Test>().configureEach {
} }
jvmArgs = listOf("--add-opens", "java.desktop/sun.font=ALL-UNNAMED") jvmArgs = listOf("--add-opens", "java.desktop/sun.font=ALL-UNNAMED")
}
} }
afterEvaluate { afterEvaluate {
......
skiko/gradle.properties
View file @ a7cb9eb3
...@@ -20,3 +20,14 @@ dependencies.skia.android-arm64=m116-51072f3-1 ...@@ -20,3 +20,14 @@ dependencies.skia.android-arm64=m116-51072f3-1
org.gradle.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=512m org.gradle.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=512m
kotlin.native.cacheKind.macosX64=none kotlin.native.cacheKind.macosX64=none
kotlin.native.cacheKind.iosX64=none kotlin.native.cacheKind.iosX64=none
skiko.awt.enabled=true
skiko.wasm.enabled=false
skiko.android.enabled=false
skiko.native.enabled=false
skiko.native.linux.enabled=false
skiko.native.mac.enabled=false
skiko.native.ios.enabled=false
skiko.native.ios.arm64.enabled=false
skiko.native.ios.simulatorArm64.enabled=false
skiko.native.ios.x64.enabled=false
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