lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exclude javafx.media on linux arm32

Browse Source
This commit is contained in:
Glavo
2021-09-08 09:53:26 +08:00
parent 8f591f99bd
commit e4ac791569
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HMCL/src/main/resources/assets/openjfx-dependencies.json
View File

@@ -66,7 +66,6 @@
"version": "17", "version": "17",
"sha1": { "sha1": {
"linux": "e3bb829ce1447a37a8b0b669a446e0414e54e5c7", "linux": "e3bb829ce1447a37a8b0b669a446e0414e54e5c7",
"linux-arm32-monocle": "c978573b3e71191848f44c96d2c10e631b2cf9e9",
"linux-aarch64": "7e7a50e66e44b902c624680601d5336d7fd16614", "linux-aarch64": "7e7a50e66e44b902c624680601d5336d7fd16614",
"mac": "ef463caf627c4c97b8e5c6a5ae16050c56aed966", "mac": "ef463caf627c4c97b8e5c6a5ae16050c56aed966",
"mac-aarch64": "970178b32e17650591698bae9f23bf5ce1295bb6", "mac-aarch64": "970178b32e17650591698bae9f23bf5ce1295bb6",

8
build.gradle
View File

@@ -58,6 +58,9 @@ var jfxArches = ['linux', 'linux-arm32-monocle', 'linux-aarch64', 'mac', 'mac-aa
var jfxVersion = "17" var jfxVersion = "17"
var jfxRepos = ['https://repo1.maven.org/maven2', 'https://maven.aliyun.com/repository/central'] var jfxRepos = ['https://repo1.maven.org/maven2', 'https://maven.aliyun.com/repository/central']
var jfxDependenciesFile = file('HMCL/src/main/resources/assets/openjfx-dependencies.json') var jfxDependenciesFile = file('HMCL/src/main/resources/assets/openjfx-dependencies.json')
var jfxUnsupported = [
'linux-arm32-monocle': ['media', 'web']
]
import com.google.gson.* import com.google.gson.*
@@ -74,9 +77,10 @@ task 'generateOpenJFXDependencies' {
var sha1 = new JsonObject() var sha1 = new JsonObject()
jfxArches.forEach { arch -> jfxArches.forEach { arch ->
if (module == 'web' && arch.endsWith('linux-arm32-monocle')) { if (jfxUnsupported.getOrDefault(arch, []).contains(module)) {
return return
} }
sha1.addProperty( sha1.addProperty(
arch, arch,
new URL("${jfxRepos.head()}/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar.sha1").getText("UTF-8") new URL("${jfxRepos.head()}/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar.sha1").getText("UTF-8")
@@ -97,7 +101,7 @@ task 'preTouchOpenJFXDependencies' {
jfxRepos.tail().forEach { repo -> jfxRepos.tail().forEach { repo ->
jfxModules.forEach { module -> jfxModules.forEach { module ->
jfxArches.forEach { arch -> jfxArches.forEach { arch ->
if (module == 'web' && arch.endsWith('linux-arm32-monocle')) { if (jfxUnsupported.getOrDefault(arch, []).contains(module)) {
return return
} }
var jarUrl = "$repo/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar" var jarUrl = "$repo/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar"