azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for proper processing both relative and absolute org.jetbrains.kotlin.native.home

Browse Source
This commit is contained in:
Elena Lepilkina
2019-03-19 11:21:31 +03:00
parent 8cc5f6702e
commit feec5b2cbd
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
performance/helloworld/build.gradle
+2 -1
View File
@@ -1,9 +1,10 @@
def dist = findProperty('org.jetbrains.kotlin.native.home') ?: 'dist' def dist = findProperty('org.jetbrains.kotlin.native.home') ?: 'dist'
dist = (new File(dist)).isAbsolute() ? dist : "${project.getProjectDir()}/$dist"
def toolExtension = System.getProperty("os.name").startsWith('Windows') ? ".bat" : "" def toolExtension = System.getProperty("os.name").startsWith('Windows') ? ".bat" : ""
project.ext { project.ext {
applicationName = 'HelloWorld' applicationName = 'HelloWorld'
repeatNumber = 10 repeatNumber = 10
buildSteps = ["runKonanc": ["${project.getProjectDir()}/$dist/bin/konanc$toolExtension", "${project.getProjectDir()}/src/main/kotlin/main.kt", "-o", buildSteps = ["runKonanc": ["$dist/bin/konanc$toolExtension", "${project.getProjectDir()}/src/main/kotlin/main.kt", "-o",
"${buildDir.absolutePath}/program${MPPTools.getNativeProgramExtension()}"]] "${buildDir.absolutePath}/program${MPPTools.getNativeProgramExtension()}"]]
} }
apply from: rootProject.file("${rootProject.rootDir}/gradle/compileBenchmark.gradle") apply from: rootProject.file("${rootProject.rootDir}/gradle/compileBenchmark.gradle")
performance/videoplayer/build.gradle
+9 -8
View File
@@ -1,4 +1,5 @@
def dist = findProperty('org.jetbrains.kotlin.native.home') ?: 'dist' def dist = findProperty('org.jetbrains.kotlin.native.home') ?: 'dist'
dist = (new File(dist)).isAbsolute() ? dist : "${project.getProjectDir()}/$dist"
def toolExtension = System.getProperty("os.name").startsWith('Windows') ? ".bat" : "" def toolExtension = System.getProperty("os.name").startsWith('Windows') ? ".bat" : ""
def linkerOpts = [] def linkerOpts = []
@@ -36,14 +37,14 @@ if (MPPTools.isMacos()) {
project.ext { project.ext {
applicationName = 'Videoplayer' applicationName = 'Videoplayer'
repeatNumber = 10 repeatNumber = 10
buildSteps = ["runCinteropFfmpeg": ["${project.getProjectDir()}/$dist/bin/cinterop$toolExtension", "-o", "${project.getProjectDir()}/$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-ffmpeg.klib", buildSteps = ["runCinteropFfmpeg": ["$dist/bin/cinterop$toolExtension", "-o", "$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-ffmpeg.klib",
"-def", "${project.getProjectDir()}/$dist/../samples/videoplayer/src/nativeInterop/cinterop/ffmpeg.def"] + filterDirsFfmpeg + includeDirsFfmpeg, "-def", "$dist/../samples/videoplayer/src/nativeInterop/cinterop/ffmpeg.def"] + filterDirsFfmpeg + includeDirsFfmpeg,
"runCinteropSdl": ["${project.getProjectDir()}/$dist/bin/cinterop$toolExtension", "-o", "${project.getProjectDir()}/$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-sdl.klib", "runCinteropSdl": ["$dist/bin/cinterop$toolExtension", "-o", "$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-sdl.klib",
"-def", "${project.getProjectDir()}/$dist/../samples/videoplayer/src/nativeInterop/cinterop/sdl.def"] + includeDirsSdl, "-def", "$dist/../samples/videoplayer/src/nativeInterop/cinterop/sdl.def"] + includeDirsSdl,
"runKonanProgram": ["${project.getProjectDir()}/$dist/bin/konanc$toolExtension", "-ea", "-p", "program", "-o", "${buildDir.absolutePath}/program${MPPTools.getNativeProgramExtension()}", "runKonanProgram": ["$dist/bin/konanc$toolExtension", "-ea", "-p", "program", "-o", "${buildDir.absolutePath}/program${MPPTools.getNativeProgramExtension()}",
"-l", "${project.getProjectDir()}/$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-ffmpeg.klib", "-l", "$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-ffmpeg.klib",
"-l", "${project.getProjectDir()}/$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-sdl.klib", "-l", "$dist/../samples/videoplayer/build/classes/kotlin/videoPlayer/main/videoplayer-cinterop-sdl.klib",
"-Xmulti-platform", "${project.getProjectDir()}/$dist/../samples/videoplayer/src/videoPlayerMain/kotlin", "-Xmulti-platform", "$dist/../samples/videoplayer/src/videoPlayerMain/kotlin",
"-entry", "sample.videoplayer.main"] + linkerOpts] "-entry", "sample.videoplayer.main"] + linkerOpts]
} }
apply from: rootProject.file("${rootProject.rootDir}/gradle/compileBenchmark.gradle") apply from: rootProject.file("${rootProject.rootDir}/gradle/compileBenchmark.gradle")