Dockerfile updates: (#2556)

- New Dockerfile for running samples
- New Dockerfile for K/N distribution
- Samples: buildSh should finilize buildAllSamples task to avoid concurrency issues
- Samples: Build avoidance for html5Canvas
This commit is contained in:
Dmitriy Dolovov
2019-01-28 23:46:24 +07:00
committed by GitHub
parent 5927ae8412
commit 0bc3c9a6ad
8 changed files with 195 additions and 12 deletions
+1 -1
View File
@@ -61,8 +61,8 @@ task buildSamplesWithPlatformLibs() {
}
task buildAllSamples() {
dependsOn buildSh
subprojects.each {
dependsOn("${it.path}:assemble")
}
finalizedBy buildSh
}
+7 -1
View File
@@ -42,7 +42,13 @@ task jsinterop(type: Exec) {
def ext = MPPTools.isWindows() ? '.bat' : ''
def distributionPath = project.properties['org.jetbrains.kotlin.native.home'] as String
if (distributionPath != null) {
commandLine Paths.get(file(distributionPath).path, 'bin', "jsinterop$ext").toString(),
def jsinteropCommand = Paths.get(file(distributionPath).path, 'bin', "jsinterop$ext").toString()
inputs.property('jsinteropCommand', jsinteropCommand)
inputs.property('jsinteropPackageName', packageName)
outputs.file(jsinteropKlibFileName)
commandLine jsinteropCommand,
'-pkg', packageName,
'-o', jsinteropKlibFileName,
'-target', 'wasm32'