MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[build scripts] making Windows launcher builder use common classpath list; dropping configurable settings from .rc

Browse Source 
GitOrigin-RevId: b3a16ba924980a6c62b13869455a5747a2789805
This commit is contained in:
Roman Shevchenko
2020-04-20 12:45:50 +00:00
committed by intellij-monorepo-bot
parent 63cd246f7b
commit 51c992cebb
2 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/WinLauncher/WinLauncher/WinLauncher.rc
-16
View File
@@ -137,26 +137,10 @@ END
STRINGTABLE
BEGIN
IDS_APP_TITLE "WinLauncher"
IDS_JDK_ENV_VAR "IDEA_JDK"
IDS_VM_OPTIONS_PATH "%APPDATA%\\JetBrains\\__PRODUCT_PATHS_SELECTOR__"
IDS_VM_OPTION_ERRORFILE "-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log"
IDS_VM_OPTION_HEAPDUMPPATH "-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof"
IDS_MAIN_CLASS "com/intellij/idea/Main"
IDS_CLASSPATH_LIBS "bootstrap.jar;extensions.jar;util.jar;jdom.jar;log4j.jar;trove4j.jar;jna.jar"
IDS_JDK_ONLY "true"
IDC_WINLAUNCHER "WINLAUNCHER"
IDS_COMMAND_LINE_PROCESSOR_CLASS
"com/intellij/ide/WindowsCommandLineProcessor"
END
STRINGTABLE
BEGIN
IDS_VM_OPTIONS "-Didea.jre.check=false -Dide.native.launcher=true"
IDS_PROPS_ENV_VAR "IDEA_PROPERTIES"
IDS_VM_OPTIONS_ENV_VAR "IDEA_VM_OPTIONS"
IDS_ERROR_LAUNCHING_APP "Error Launching IntelliJ Platform"
END
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+13 -12
View File
@@ -143,6 +143,7 @@ class WindowsDistributionBuilder extends OsSpecificDistributionBuilder {
def lowerCaseProductName = buildContext.applicationInfo.shortProductName.toLowerCase()
String vmOptions = "$buildContext.additionalJvmArguments -Dide.native.launcher=true -Didea.paths.selector=${buildContext.systemSelector}".trim()
def productName = buildContext.applicationInfo.shortProductName
String classPath = buildContext.bootClassPathJarNames.join(";")
String jdkEnvVarSuffix = arch == JvmArchitecture.x64 && customizer.include32BitLauncher ? "_64" : ""
String vmOptionsEnvVarSuffix = arch == JvmArchitecture.x64 && customizer.include32BitLauncher ? "64" : ""
@@ -150,18 +151,18 @@ class WindowsDistributionBuilder extends OsSpecificDistributionBuilder {
File icoFilesDirectory = new File(buildContext.paths.temp, "win-launcher-ico")
File appInfoForLauncher = generateApplicationInfoForLauncher(patchedApplicationInfo, icoFilesDirectory)
new File(launcherPropertiesPath).text = """
IDS_JDK_ONLY=$buildContext.productProperties.toolsJarRequired
IDS_JDK_ENV_VAR=${envVarBaseName}_JDK$jdkEnvVarSuffix
IDS_APP_TITLE=$productName Launcher
IDS_VM_OPTIONS_PATH=%APPDATA%\\\\${buildContext.applicationInfo.shortCompanyName}\\\\${buildContext.systemSelector}
IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\\\java_error_in_${lowerCaseProductName}_%p.log
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\\\java_error_in_${lowerCaseProductName}.hprof
IDC_WINLAUNCHER=${upperCaseProductName}_LAUNCHER
IDS_PROPS_ENV_VAR=${envVarBaseName}_PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=$envVarBaseName${vmOptionsEnvVarSuffix}_VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching $productName
IDS_VM_OPTIONS=$vmOptions
""".trim()
IDS_JDK_ONLY=$buildContext.productProperties.toolsJarRequired
IDS_JDK_ENV_VAR=${envVarBaseName}_JDK$jdkEnvVarSuffix
IDS_APP_TITLE=$productName Launcher
IDS_VM_OPTIONS_PATH=%APPDATA%\\\\${buildContext.applicationInfo.shortCompanyName}\\\\${buildContext.systemSelector}
IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\\\java_error_in_${lowerCaseProductName}_%p.log
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\\\java_error_in_${lowerCaseProductName}.hprof
IDC_WINLAUNCHER=${upperCaseProductName}_LAUNCHER
IDS_PROPS_ENV_VAR=${envVarBaseName}_PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=$envVarBaseName${vmOptionsEnvVarSuffix}_VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching ${productName}
IDS_VM_OPTIONS=${vmOptions}
IDS_CLASSPATH_LIBS=${classPath}""".stripIndent().trim()
def communityHome = "$buildContext.paths.communityHome"
String inputPath = "$communityHome/bin/WinLauncher/WinLauncher${arch.fileSuffix}.exe"