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: correctly exclude files which need to be scrambled from 'lib' directory when building on Windows; added additional check to make sure that such files aren't copied to 'lib' directory

Browse Source
This commit is contained in:
nik
2016-07-21 18:11:13 +03:00
parent ea13b8cbff
commit d6e4697c9c
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/groovy/org/jetbrains/intellij/build/ScrambleTool.groovy
+5
View File
@@ -31,4 +31,9 @@ interface ScrambleTool {
* Scramble {@code mainJarName} in {@code "$buildContext.paths.distAll/lib"} directory
*/
void scramble(String mainJarName, BuildContext buildContext)
/**
* @return list of names of JAR files which cannot be included into the product 'lib' directory in plain form
*/
List<String> getNamesOfJarsRequiredToBeScrambled()
}
build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
+12 -8
View File
@@ -31,6 +31,7 @@
package org.jetbrains.intellij.build.impl
import com.intellij.openapi.util.io.FileUtil
import com.intellij.util.PathUtilRt
import org.jetbrains.intellij.build.BuildContext
import org.jetbrains.intellij.build.BuildOptions
import org.jetbrains.jps.model.java.JpsJavaClasspathKind
@@ -125,7 +126,16 @@ class DistributionJARsBuilder {
layoutBuilder.patchModuleOutput("platform-resources", FileUtil.toSystemIndependentName(patchedKeyMapDir.absolutePath))
}
Set<String> usedJars = collectUsedJars(includedModules, []) - productLayout.additionalJarsToUnpackIntoMainJar
Set<String> usedJars = collectUsedJars(includedModules, []) - productLayout.additionalJarsToUnpackIntoMainJar.collect {FileUtil.toSystemIndependentName(it)}
if (buildContext.scrambleTool != null) {
def forbiddenJarNames = buildContext.scrambleTool.namesOfJarsRequiredToBeScrambled
def forbiddenJars = usedJars.findAll { forbiddenJarNames.contains(PathUtilRt.getFileName(it)) }
if (!forbiddenJars.empty) {
buildContext.messages.error("The following JARs cannot be included into the product 'lib' directory, they need to be scrambled with the main jar: ${forbiddenJars}")
}
}
def communityHome = "$buildContext.paths.communityHome"
def resourcesIncluded = RESOURCES_INCLUDED
def resourcesExcluded = RESOURCES_EXCLUDED
@@ -360,12 +370,6 @@ class DistributionJARsBuilder {
(["$buildContext.paths.communityHome/lib", "$buildContext.paths.projectHome/lib", "$buildContext.paths.communityHome/xml/relaxng/lib"] as List<String>) +
additionalLibFolders
def forbiddenJars = [
// "/dev/", "/rt/", "/ant/",
// "ls-client-api", "/ideaLicenseDecoder", "jcip-annotations",
// "/eawtstub.jar", "/y.jar", "/ysvg.jar"
]
modules.each {
def module = buildContext.findModule(it)
if (module != null) {
@@ -373,7 +377,7 @@ class DistributionJARsBuilder {
File file = new File(it)
if (file.exists()) {
String path = FileUtil.toSystemIndependentName(file.canonicalPath)
if (path.endsWith(".jar") && approvedJars.any { FileUtil.startsWith(path, it) } && !forbiddenJars.any { path.contains(it) }) {
if (path.endsWith(".jar") && approvedJars.any { FileUtil.startsWith(path, it) }) {
if (usedJars.add(path)) {
buildContext.messages.info("\tADDED: $path for $module.name")
}