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

[build][kotlin-build-gradle-plugin] bump version 0.0.25

Browse Source 
- kotlin native versioning support
- disable metadata
- fixes of drop 0 maintanence clause
- support for kotlin.native.enabled flag to switch on/off kotlin native build
- add mode to version generatation to dump version to resourse file
This commit is contained in:
Vasily Levchenko
2020-11-20 09:24:48 +01:00
parent 326ab1cd02
commit ec0f6b9ede
7 changed files with 151 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/kotlin-native-binary-version/kotlin/org/jetbrains/kotlin/konan/kotlin-native-version.kt
View File
buildSrc/src/to_bootstrap/kotlin/org/jetbrains/kotlin/VersionGenerator.kt
-84
View File
@@ -1,84 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.*
import java.io.File
import java.io.FileNotFoundException
import java.io.PrintWriter
import java.util.regex.Pattern
open class VersionGenerator: DefaultTask() {
@OutputDirectory
fun getVersionSourceDirectory(): File {
return getProject().file("build/generated")
}
@OutputFile
open fun getVersionFile(): File? {
return getProject().file(getVersionSourceDirectory().path + "/src/generated/org/jetbrains/kotlin/konan/CompilerVersionGenerated.kt")
}
@Input
open fun getKonanVersion(): String? {
return getProject().getProperties().get("konanVersion").toString()
}
// TeamCity passes all configuration parameters into a build script as project properties.
// Thus we can use them here instead of environment variables.
@Optional
@Input
open fun getBuildNumber(): String? {
val property: Any = getProject().findProperty("build.number") ?: return null
return property.toString()
}
@Input
open fun getMeta(): String {
val konanMetaVersionProperty: Any = getProject().getProperties().get("konanMetaVersion") ?: return "MetaVersion.DEV"
return "MetaVersion." + konanMetaVersionProperty.toString().toUpperCase()
}
private val versionPattern = Pattern.compile(
"^(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-M(\\p{Digit}))?(?:-(\\p{Alpha}\\p{Alnum}*))?(?:-(\\d+))?$"
)
@TaskAction
open fun generateVersion() {
val matcher = versionPattern.matcher(getKonanVersion())
require(matcher.matches()) { "Cannot parse Kotlin/Native version: \$konanVersion" }
val major = matcher.group(1).toInt()
val minor = matcher.group(2).toInt()
val maintenanceStr = matcher.group(3)
val maintenance = maintenanceStr?.toInt() ?: 0
val milestoneStr = matcher.group(4)
val milestone = milestoneStr?.toInt() ?: -1
val buildNumber = getBuildNumber()
getProject().getLogger().info("BUILD_NUMBER: " + getBuildNumber())
var build = -1
if (buildNumber != null) {
val buildNumberSplit = buildNumber.split("-".toRegex()).toTypedArray()
build = buildNumberSplit[buildNumberSplit.size - 1].toInt() // //7-dev-buildcount
}
try {
PrintWriter(getVersionFile()).use { printWriter ->
printWriter.println(
"""package org.jetbrains.kotlin.konan
internal val currentCompilerVersion: CompilerVersion =
CompilerVersionImpl(${getMeta()}, $major, $minor,
$maintenance, $milestone, $build)
val CompilerVersion.Companion.CURRENT: CompilerVersion
get() = currentCompilerVersion"""
)
}
} catch (e: FileNotFoundException) {
throw IllegalStateException(e)
}
}
}
compiler/util-io/src/org/jetbrains/kotlin/konan/CompilerVersion.kt
+2 -4
View File
@@ -53,10 +53,8 @@ data class CompilerVersionImpl(
append(major)
append('.')
append(minor)
if (maintenance != 0) {
append('.')
append(maintenance)
}
append('.')
append(maintenance)
if (milestone != -1) {
append("-M")
append(milestone)
compiler/util-io/src/org/jetbrains/kotlin/util/Util.kt
+8 -5
View File
@@ -10,12 +10,15 @@ import org.jetbrains.kotlin.konan.file.*
import java.lang.StringBuilder
fun <T> printMillisec(message: String, body: () -> T): T {
val result: T
val msec = measureTimeMillis {
result = body()
var msec = 0L
try {
msec = measureTimeMillis {
return body()
}
} finally {
println("$message: $msec msec")
}
println("$message: $msec msec")
return result
error("shouldn't happens")
}
fun profile(message: String, body: () -> Unit) = profileIf(
dependencies/kotlin-build-gradle-plugin/build.gradle.kts
Vendored
+7 -2
View File
@@ -4,7 +4,7 @@ plugins {
}
group = "org.jetbrains.kotlin"
version = "0.0.21"
version = "0.0.25"
repositories {
mavenCentral()
@@ -29,10 +29,15 @@ java {
sourceSets {
main {
java.setSrcDirs(listOf("src"))
/*TODO: move version to build-plugin*/
java.setSrcDirs(listOf("src", "../../compiler/util-io/src"))
}
}
tasks.withType<GenerateModuleMetadata> {
enabled = false
}
publishing {
publications {
create<MavenPublication>("KotlinBuildGradlePlugin") {
dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
Vendored
+2
View File
@@ -120,6 +120,8 @@ class KotlinBuildProperties(
val teamCityBootstrapUrl: String? = getOrNull("bootstrap.teamcity.url") as String?
val rootProjectDir: File = propertiesProvider.rootProjectDir
val isKotlinNativeEnabled: Boolean = getBoolean("kotlin.native.enabled")
}
private const val extensionName = "kotlinBuildProperties"
dependencies/kotlin-build-gradle-plugin/src/VersionGenerator.kt
Vendored
+132
View File
@@ -0,0 +1,132 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.*
import java.io.*
import java.util.regex.Pattern
import java.util.Properties
import org.gradle.api.Project
import org.jetbrains.kotlin.konan.*
fun Project.konanVersionGeneratedSrc() = rootProject.findProject(":kotlin-native")?.file("../buildSrc/build/version-generated/src/generated") ?: file("build/version-generated/src/generated")
fun Project.kotlinNativeVersionSrc():File {
val kotlinNativeProject = rootProject.findProject(":kotlin-native")
return if(kotlinNativeProject != null){
if (kotlinNativeVersionInResources)
kotlinNativeProject.file("${findProperty("kotlin_root")!!}/buildSrc/src/kotlin-native-binary-version/kotlin")
else
kotlinNativeProject.file("../buildSrc/build/version-generated/src/generated")
} else {
if (kotlinNativeVersionInResources)
file("src/kotlin-native-binary-version/kotlin")
else
file("build/version-generated/src/generated")
}
}
fun Project.konanRootDir() = rootProject.findProject(":kotlin-native")?.projectDir ?: file("../kotlin-native")
fun Project.kotlinNativeProperties() = Properties().apply{
val kotlinNativeProperyFile = File(this@kotlinNativeProperties.konanRootDir(), "gradle.properties")
if (!kotlinNativeProperyFile.exists())
return@apply
FileReader(kotlinNativeProperyFile).use {
load(it)
}
}
val Project.kotlinNativeVersionInResources:Boolean
get() = kotlinNativeProperties()["kotlinNativeVersionInResources"]?.toString()?.toBoolean() ?: false
fun Project.kotlinNativeVersionResourceFile() = File("${project.findProperty("kotlin_root")!!}/buildSrc/build/version-generated/META-INF/kotlin-native.compiler.version")
fun Project.kotlinNativeVersionValue(): CompilerVersion? {
return if (this.kotlinNativeVersionInResources)
kotlinNativeVersionResourceFile().let { file ->
file.readLines().single().parseCompilerVersion()
}
else null
}
open class VersionGenerator: DefaultTask() {
private val kotlinNativeProperties = project.kotlinNativeProperties()
@Input
var kotlinNativeVersionInResources = project.kotlinNativeVersionInResources
@OutputDirectory
val versionSourceDirectory = project.file("build/version-generated")
@OutputFile
open var versionFile: File? = project.file("${versionSourceDirectory.path}/org/jetbrains/kotlin/konan/CompilerVersionGenerated.kt")
@Input
open val konanVersion = kotlinNativeProperties["konanVersion"].toString()
// TeamCity passes all configuration parameters into a build script as project properties.
// Thus we can use them here instead of environment variables.
@Optional
@Input
open val buildNumber = project.findProperty("build.number")?.toString()
@Input
open val meta = kotlinNativeProperties["konanMetaVersion"]?.let{ MetaVersion.valueOf(it.toString().toUpperCase()) } ?: MetaVersion.DEV
private val versionPattern = Pattern.compile(
"^(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-M(\\p{Digit}))?(?:-(\\p{Alpha}\\p{Alnum}*))?(?:-(\\d+))?$"
)
fun defaultVersionFileLocation() {
versionFile = if (kotlinNativeVersionInResources)
project.file("${versionSourceDirectory.path}/META-INF/kotlin-native.compiler.version")
else
project.file("${versionSourceDirectory.path}/org/jetbrains/kotlin/konan/CompilerVersionGenerated.kt")
}
@TaskAction
open fun generateVersion() {
val matcher = versionPattern.matcher(konanVersion)
require(matcher.matches()) { "Cannot parse Kotlin/Native version: \$konanVersion" }
val major = matcher.group(1).toInt()
val minor = matcher.group(2).toInt()
val maintenanceStr = matcher.group(3)
val maintenance = maintenanceStr?.toInt() ?: 0
val milestoneStr = matcher.group(4)
val milestone = milestoneStr?.toInt() ?: -1
project.logger.info("BUILD_NUMBER: $buildNumber")
var build = -1
if (buildNumber != null) {
val buildNumberSplit = buildNumber!!.split("-".toRegex()).toTypedArray()
build = buildNumberSplit[buildNumberSplit.size - 1].toInt() // //7-dev-buildcount
}
val versionObject = CompilerVersionImpl(meta, major, minor, maintenance, milestone, build)
versionObject.serialize()
}
private fun CompilerVersion.serialize() {
versionFile!!.parentFile.mkdirs()
project.logger.info("version file: ${versionFile}")
if (!kotlinNativeVersionInResources) {
PrintWriter(versionFile).use { printWriter ->
printWriter.println(
"""|package org.jetbrains.kotlin.konan
|internal val currentCompilerVersion: CompilerVersion =
|CompilerVersionImpl($meta, $major, $minor,
| $maintenance, $milestone, $build)
|val CompilerVersion.Companion.CURRENT: CompilerVersion
|get() = currentCompilerVersion""".trimMargin()
)
}
} else {
PrintStream(versionFile).use {
it.println(this)
}
}
}
}