Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
d0b681d2
Unverified
Commit
d0b681d2
authored
Oct 29, 2024
by
Oleksandr Karpovich
Committed by
GitHub
Oct 29, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes required for using MacOS ARM agents instead of x86 (#998)
parent
bbfaf622
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
JvmTasksConfiguration.kt
.../main/kotlin/tasks/configuration/JvmTasksConfiguration.kt
+1
-0
NativeTasksConfiguration.kt
...in/kotlin/tasks/configuration/NativeTasksConfiguration.kt
+17
-2
No files found.
skiko/buildSrc/src/main/kotlin/tasks/configuration/JvmTasksConfiguration.kt
View file @
d0b681d2
...
@@ -455,6 +455,7 @@ fun SkikoProjectContext.createSkikoJvmJarTask(os: OS, arch: Arch, commonJar: Tas
...
@@ -455,6 +455,7 @@ fun SkikoProjectContext.createSkikoJvmJarTask(os: OS, arch: Arch, commonJar: Tas
val
createChecksums2
=
createChecksumsTask
(
os
,
altArch
,
nativeLib2
)
val
createChecksums2
=
createChecksumsTask
(
os
,
altArch
,
nativeLib2
)
nativeFiles
.
add
(
nativeLib2
)
nativeFiles
.
add
(
nativeLib2
)
nativeFiles
.
add
(
createChecksums2
.
map
{
it
.
outputs
.
files
.
singleFile
})
nativeFiles
.
add
(
createChecksums2
.
map
{
it
.
outputs
.
files
.
singleFile
})
allJvmRuntimeJars
[
os
to
altArch
]
=
skikoJvmRuntimeJarTask
(
os
,
altArch
,
commonJar
,
nativeFiles
)
}
}
val
skikoJvmRuntimeJar
=
skikoJvmRuntimeJarTask
(
os
,
arch
,
commonJar
,
nativeFiles
)
val
skikoJvmRuntimeJar
=
skikoJvmRuntimeJarTask
(
os
,
arch
,
commonJar
,
nativeFiles
)
allJvmRuntimeJars
[
os
to
arch
]
=
skikoJvmRuntimeJar
allJvmRuntimeJars
[
os
to
arch
]
=
skikoJvmRuntimeJar
...
...
skiko/buildSrc/src/main/kotlin/tasks/configuration/NativeTasksConfiguration.kt
View file @
d0b681d2
...
@@ -31,6 +31,21 @@ fun String.withSuffix(isUikitSim: Boolean = false) =
...
@@ -31,6 +31,21 @@ fun String.withSuffix(isUikitSim: Boolean = false) =
fun
KotlinTarget
.
isUikitSimulator
()
=
fun
KotlinTarget
.
isUikitSimulator
()
=
name
.
contains
(
"Simulator"
,
ignoreCase
=
true
)
||
name
==
"tvosX64"
// x64 tvOS is implicitly a simulator
name
.
contains
(
"Simulator"
,
ignoreCase
=
true
)
||
name
==
"tvosX64"
// x64 tvOS is implicitly a simulator
fun
Project
.
findXcodeSdkRoot
():
String
{
val
defaultPath
=
"/Applications/Xcode.app/Contents/Developer/Platforms"
if
(
File
(
defaultPath
).
exists
())
{
return
defaultPath
.
also
{
println
(
"findXcodeSdkRoot = $it"
)
}
}
return
(
project
.
property
(
"skiko.ci.xcodehome"
)
as
?
String
)
?.
let
{
val
sdkPath
=
it
+
"/Platforms"
println
(
"findXcodeSdkRoot = $sdkPath"
)
sdkPath
}
?:
error
(
"gradle property `skiko.ci.xcodehome` is not set"
)
}
fun
SkikoProjectContext
.
compileNativeBridgesTask
(
fun
SkikoProjectContext
.
compileNativeBridgesTask
(
os
:
OS
,
arch
:
Arch
,
isUikitSim
:
Boolean
os
:
OS
,
arch
:
Arch
,
isUikitSim
:
Boolean
):
TaskProvider
<
CompileSkikoCppTask
>
=
with
(
this
.
project
)
{
):
TaskProvider
<
CompileSkikoCppTask
>
=
with
(
this
.
project
)
{
...
@@ -52,7 +67,7 @@ fun SkikoProjectContext.compileNativeBridgesTask(
...
@@ -52,7 +67,7 @@ fun SkikoProjectContext.compileNativeBridgesTask(
when
(
os
)
{
when
(
os
)
{
OS
.
IOS
->
{
OS
.
IOS
->
{
val
sdkRoot
=
"/Applications/Xcode.app/Contents/Developer/Platforms"
val
sdkRoot
=
findXcodeSdkRoot
()
val
iphoneOsSdk
=
"$sdkRoot/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
val
iphoneOsSdk
=
"$sdkRoot/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
val
iphoneSimSdk
=
"$sdkRoot/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
val
iphoneSimSdk
=
"$sdkRoot/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
val
iosArchFlags
=
when
(
arch
)
{
val
iosArchFlags
=
when
(
arch
)
{
...
@@ -76,7 +91,7 @@ fun SkikoProjectContext.compileNativeBridgesTask(
...
@@ -76,7 +91,7 @@ fun SkikoProjectContext.compileNativeBridgesTask(
))
))
}
}
OS
.
TVOS
->
{
OS
.
TVOS
->
{
val
sdkRoot
=
"/Applications/Xcode.app/Contents/Developer/Platforms"
val
sdkRoot
=
findXcodeSdkRoot
()
val
tvOsSdk
=
"$sdkRoot/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk"
val
tvOsSdk
=
"$sdkRoot/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk"
val
tvSimSdk
=
"$sdkRoot/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk"
val
tvSimSdk
=
"$sdkRoot/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk"
val
tvosArchFlags
=
when
(
arch
)
{
val
tvosArchFlags
=
when
(
arch
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment