From 0195734dfac8e3ade4606c37f47312f77c1c680f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 18 Mar 2024 20:35:35 +0100 Subject: [PATCH] [build scripts] dropping JPS-based updater build task Since updater migration to Gradle, the task was producing an incorrect artifact with missing manifest. GitOrigin-RevId: ee4407f9964818477314863864754ac52c354998 --- build.xml | 9 +------- build/full_updater.cmd | 11 ---------- build/src/FullUpdaterBuildTarget.kt | 21 ------------------ .../jetbrains/intellij/build/BuildTasks.kt | 5 ----- .../intellij/build/impl/BuildTasksImpl.kt | 22 ------------------- 5 files changed, 1 insertion(+), 67 deletions(-) delete mode 100755 build/full_updater.cmd delete mode 100644 build/src/FullUpdaterBuildTarget.kt diff --git a/build.xml b/build.xml index 0005bf548b3d..7d6b47c0dac1 100644 --- a/build.xml +++ b/build.xml @@ -57,11 +57,4 @@ - - - - - - - - \ No newline at end of file + diff --git a/build/full_updater.cmd b/build/full_updater.cmd deleted file mode 100755 index 4fd194585690..000000000000 --- a/build/full_updater.cmd +++ /dev/null @@ -1,11 +0,0 @@ -:<<"::CMDLITERAL" -@ECHO OFF -GOTO :CMDSCRIPT -::CMDLITERAL - -set -eux -exec "$(cd "$(dirname "$0")"; pwd)/../platform/jps-bootstrap/jps-bootstrap.sh" "$@" "$(cd "$(dirname "$0")"; pwd)/.." intellij.idea.community.build FullUpdaterBuildTarget -:CMDSCRIPT - -call "%~dp0\..\platform\jps-bootstrap\jps-bootstrap.cmd" %* "%~dp0\.." intellij.idea.community.build FullUpdaterBuildTarget -EXIT /B %ERRORLEVEL% diff --git a/build/src/FullUpdaterBuildTarget.kt b/build/src/FullUpdaterBuildTarget.kt deleted file mode 100644 index 61de0a2b5792..000000000000 --- a/build/src/FullUpdaterBuildTarget.kt +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.runBlocking -import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT -import org.jetbrains.intellij.build.createBuildTasks -import org.jetbrains.intellij.build.createCommunityBuildContext - -object FullUpdaterBuildTarget { - private const val UPDATER_MODULE_NAME = "intellij.platform.updater" - - @JvmStatic - fun main(args: Array) { - runBlocking(Dispatchers.Default) { - val context = createCommunityBuildContext() - val tasks = createBuildTasks(context) - tasks.compileModules(listOf(UPDATER_MODULE_NAME)) - tasks.buildFullUpdaterJar() - } - } -} diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt index 25e6d2e905cf..fe830f10c534 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt @@ -51,10 +51,5 @@ interface BuildTasks { compileModules(moduleNames = moduleNames, includingTestsInModules = java.util.List.of()) } - /** - * Builds updater-full.jar artifact which includes 'intellij.platform.updater' module with all its dependencies - */ - suspend fun buildFullUpdaterJar() - suspend fun buildUnpackedDistribution(targetDirectory: Path, includeBinAndRuntime: Boolean) } diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt index b9863b56b010..853e87d96bb1 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt @@ -116,10 +116,6 @@ class BuildTasksImpl(private val context: BuildContextImpl) : BuildTasks { CompilationTasks.create(context).compileModules(moduleNames) } - override suspend fun buildFullUpdaterJar() { - buildUpdaterJar(context = context, artifactName = "updater-full.jar") - } - override suspend fun buildUnpackedDistribution(targetDirectory: Path, includeBinAndRuntime: Boolean) { val currentOs = OsFamily.currentOs context.paths.distAllDir = targetDirectory @@ -988,24 +984,6 @@ private fun logFreeDiskSpace(phase: String, context: CompilationContext) { } } -suspend fun buildUpdaterJar(context: BuildContext, artifactName: String = "updater.jar") { - val updaterModule = context.findRequiredModule("intellij.platform.updater") - val updaterModuleSource = DirSource(context.getModuleOutputDir(updaterModule), excludes = commonModuleExcludes) - val librarySources = JpsJavaExtensionService.dependencies(updaterModule) - .productionOnly() - .runtimeOnly() - .libraries - .asSequence() - .flatMap { it.getRootUrls(JpsOrderRootType.COMPILED) } - .filter { !JpsPathUtil.isJrtUrl(it) } - .map { - ZipSource(file = Path.of(JpsPathUtil.urlToPath(it)), excludes = listOf(Regex("^META-INF/.*")), distributionFileEntryProducer = null) - } - val updaterJar = context.paths.artifactDir.resolve(artifactName) - buildJar(targetFile = updaterJar, sources = (sequenceOf(updaterModuleSource) + librarySources).toList(), compress = true) - context.notifyArtifactBuilt(updaterJar) -} - private fun buildCrossPlatformZip(distResults: List, context: BuildContext): Path { val executableName = context.productProperties.baseFileName