Provide shortcuts for producing quick compiler for maven and rebuilding stdlib-js from ant.

This commit is contained in:
Ilya Gorbunov
2017-04-10 14:57:23 +03:00
parent afba967fcf
commit 37e046f6cd
4 changed files with 53 additions and 34 deletions
+4 -4
View File
@@ -14,8 +14,9 @@ buildscript {
ext.JDK_16 = System.getenv("JDK_16")
ext.JDK_17 = System.getenv("JDK_17")
ext.JDK_18 = System.getenv("JDK_18")
ext.distDir = project.file("${rootDir}/../dist/kotlinc/lib")
ext.bootstrapCompilerFile = project.file("${rootDir}/../dist/kotlin-compiler-for-maven.jar")
ext.distDir = project.file("${rootDir}/../dist")
ext.distLibDir = project.file("${rootDir}/../dist/kotlinc/lib")
ext.bootstrapCompilerFile = project.file("$distDir/kotlin-compiler-for-maven.jar")
allprojects {
group = 'org.jetbrains.kotlin'
@@ -141,8 +142,7 @@ static def configurePublishing(Project project) {
task dist(type: Copy, dependsOn: assemble) {
rename "-${java.util.regex.Pattern.quote(version)}", ''
// rename { String fileName -> 'gradle-' + fileName }
into distDir
into distLibDir
}
uploadArchives {
+6 -3
View File
@@ -42,9 +42,12 @@ artifacts {
archives javadocJar
}
task distJs(type: Copy) {
from(compileKotlin2Js.kotlinOptions.outputFile)
into "$distDir/js"
}
dist {
dependsOn distJs
from (jar, sourcesJar)
from(compileKotlin2Js.kotlinOptions.outputFile) {
into '../../js'
}
}
+5 -3
View File
@@ -227,8 +227,13 @@ artifacts {
archives javadocJar
}
task distJs(type: Copy) {
from(compileJs)
into "$distDir/js"
}
dist {
dependsOn distJs
[mergedJar, sourcesJar].forEach {
from(it)
// legacy
@@ -236,9 +241,6 @@ dist {
rename("kotlin-stdlib-js", 'kotlin-jslib')
}
}
from(compileJs) {
into '../../js'
}
}