OPENIDE windows distribution generation update

(cherry picked from commit 912fc288cf4b904298e93fb5ad16b4186baa7f2d)
(cherry picked from commit dcf895f046)
(cherry picked from commit 85ace3f13a)
(cherry picked from commit 1fee579511)
This commit is contained in:
axiom
2025-03-07 21:18:10 +04:00
committed by Nikita Iarychenko
parent 032552b721
commit ddec07ee2c

View File

@@ -1,4 +1,7 @@
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
//
// Modified by Dmitrij Pochepko 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
import com.intellij.openapi.util.SystemInfoRt
@@ -354,26 +357,28 @@ private suspend fun buildWinLauncher(winDistPath: Path, arch: JvmArchitecture, c
val (execPath, licensePath) = NativeBinaryDownloader.getLauncher(context, OsFamily.WINDOWS, arch)
val outputPath = winDistPath.resolve("bin/${executableBaseName}.exe")
if (copyLicense) {
copyFile(licensePath, winDistPath.resolve("license/launcher-third-party-libraries.html"))
if (copyLicense) {
copyFile(licensePath, winDistPath.resolve("license/launcher-third-party-libraries.html"))
}
copyFile(execPath, outputPath); // just copy. it already has everything we need
/*
val generatorModule = context.findRequiredModule("intellij.tools.launcherGenerator")
runJava(
mainClass = "com.pme.launcher.LauncherGeneratorMain",
args = listOf(
execPath.absolutePathString(),
"${communityHome}/native/XPlatLauncher/resources/windows/resource.h",
launcherPropertiesPath.absolutePathString(),
icoFile.absolutePathString(),
outputPath.absolutePathString(),
),
jvmArgs = listOf("-Djava.awt.headless=true"),
context.getModuleRuntimeClasspath(generatorModule, forTests = false),
context.stableJavaExecutable
)
*/
}
val generatorModule = context.findRequiredModule("intellij.tools.launcherGenerator")
runJava(
mainClass = "com.pme.launcher.LauncherGeneratorMain",
args = listOf(
execPath.absolutePathString(),
"${communityHome}/native/XPlatLauncher/resources/windows/resource.h",
launcherPropertiesPath.absolutePathString(),
icoFile.absolutePathString(),
outputPath.absolutePathString(),
),
jvmArgs = listOf("-Djava.awt.headless=true"),
classPath = context.getModuleRuntimeClasspath(module = generatorModule, forTests = false).map { it.toString() },
javaExe = context.stableJavaExecutable,
)
}
}
private suspend fun checkThatExeInstallerAndZipWithJbrAreTheSame(
zipPath: Path,