MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

OPENIDE fix build number

Browse Source
This commit is contained in:
Nikita Iarychenko
2025-10-29 11:40:56 +04:00
parent dc4c87a5db
commit 9e28df2257
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt
View File

@@ -1,4 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
//
// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru).
// Any modifications are available on the same license terms as the original source code.
package org.jetbrains.intellij.build.impl package org.jetbrains.intellij.build.impl
import com.intellij.platform.ijent.community.buildConstants.IJENT_WSL_FILE_SYSTEM_REGISTRY_KEY import com.intellij.platform.ijent.community.buildConstants.IJENT_WSL_FILE_SYSTEM_REGISTRY_KEY
@@ -98,9 +101,9 @@ class BuildContextImpl internal constructor(
if (isNightly(value)) { if (isNightly(value)) {
value = "$value.0" value = "$value.0"
} }
check(SemVer.parseFromText(value) != null) { //check(SemVer.parseFromText(value) != null) {
"The plugin build number $value is expected to match the Semantic Versioning, see https://semver.org" // "The plugin build number $value is expected to match the Semantic Versioning, see https://semver.org"
} //}
value value
} }

17
platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginXmlPatcher.kt
View File

@@ -1,4 +1,7 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
//
// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru).
// Any modifications are available on the same license terms as the original source code.
package org.jetbrains.intellij.build.impl package org.jetbrains.intellij.build.impl
import com.intellij.openapi.util.JDOMUtil import com.intellij.openapi.util.JDOMUtil
@@ -96,13 +99,13 @@ private val DEV_BUILD_SCHEME: Regex = Regex("^${SnapshotBuildNumber.BASE.replace
private suspend fun getPluginVersion(plugin: PluginLayout, descriptorContent: String, context: BuildContext): PluginVersionEvaluatorResult { private suspend fun getPluginVersion(plugin: PluginLayout, descriptorContent: String, context: BuildContext): PluginVersionEvaluatorResult {
val pluginVersion = plugin.versionEvaluator.evaluate(pluginXmlSupplier = { descriptorContent }, ideBuildVersion = context.pluginBuildNumber, context = context) val pluginVersion = plugin.versionEvaluator.evaluate(pluginXmlSupplier = { descriptorContent }, ideBuildVersion = context.pluginBuildNumber, context = context)
check( //check(
!plugin.semanticVersioning || // !plugin.semanticVersioning ||
SemVer.parseFromText(pluginVersion.pluginVersion) != null || // SemVer.parseFromText(pluginVersion.pluginVersion) != null ||
DEV_BUILD_SCHEME.matches(pluginVersion.pluginVersion) // DEV_BUILD_SCHEME.matches(pluginVersion.pluginVersion)
) { //) {
"$plugin version '${pluginVersion.pluginVersion}' is expected to match either '$DEV_BUILD_SCHEME' or the Semantic Versioning, see https://semver.org" // "$plugin version '${pluginVersion.pluginVersion}' is expected to match either '$DEV_BUILD_SCHEME' or the Semantic Versioning, see https://semver.org"
} //}
return pluginVersion return pluginVersion
} }