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

Revert: build scripts: renamed jre64 to jbr

Browse Source 
relates with JBR-1295 The base directories `jdk` in tarballs need to be replaced by `jbrsdk` (d0fe94dd)

GitOrigin-RevId: 214de71255e8162190c8dad32659c3470d9061f8
This commit is contained in:
Vladimir.Orlov
2019-04-29 16:46:27 +03:00
committed by intellij-monorepo-bot
parent df6e9c7b4c
commit e37c0c8f2b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
+2 -2
View File
@@ -73,7 +73,7 @@ class BundledJreManager {
}
buildContext.messages.block("Extract $archive.absolutePath JRE") {
String destination = "$targetDir/jbr"
String destination = "$targetDir/jre64"
def destinationDir = new File(destination)
if (destinationDir.exists()) destinationDir.deleteDir()
untar(archive, destination, isSecondBundledJreModular())
@@ -130,7 +130,7 @@ class BundledJreManager {
return null
}
buildContext.messages.block("Extract $archive.name JRE") {
String destination = "$targetDir/jbr"
String destination = "$targetDir/jre64"
if (osName == "windows" && arch == JvmArchitecture.x32) {
destination = "$targetDir/jre32"
}
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
+4 -4
View File
@@ -142,8 +142,8 @@ class LinuxDistributionBuilder extends OsSpecificDistributionBuilder {
String javaExecutablePath = null
if (jreDirectoryPath != null) {
paths += jreDirectoryPath
extraBins += "jbr/bin/*"
javaExecutablePath = "jbr/bin/java"
extraBins += "jre64/bin/*"
javaExecutablePath = "jre64/bin/java"
}
def productJsonDir = new File(buildContext.paths.temp, "linux.dist.product-info.json$suffix").absolutePath
generateProductJson(productJsonDir, javaExecutablePath)
@@ -247,11 +247,11 @@ class LinuxDistributionBuilder extends OsSpecificDistributionBuilder {
customizer.extraExecutables.each { include(name: it) }
}
fileset(dir: jreDirectoryPath) {
include(name: "jbr/bin/*")
include(name: "jre64/bin/*")
}
}
generateProductJson(unixSnapDistPath, "jbr/bin/java")
generateProductJson(unixSnapDistPath, "jre64/bin/java")
new ProductInfoValidator(buildContext).validateInDirectory(unixSnapDistPath, "", [unixSnapDistPath, jreDirectoryPath], [])
buildContext.ant.mkdir(dir: "${snapDir}/result")
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+1 -1
View File
@@ -282,7 +282,7 @@ IDS_VM_OPTIONS=$vmOptions
private void generateProductJson(String targetDir, boolean isJreIncluded) {
def launcherPath = "bin/${buildContext.productProperties.baseFileName}64.exe"
def vmOptionsPath = "bin/${buildContext.productProperties.baseFileName}64.exe.vmoptions"
def javaExecutablePath = isJreIncluded ? "jbr/bin/java.exe" : null
def javaExecutablePath = isJreIncluded ? "jre64/bin/java.exe" : null
new ProductInfoGenerator(buildContext)
.generateProductJson(targetDir, "bin", null, launcherPath, javaExecutablePath, vmOptionsPath, OsFamily.WINDOWS)
}