From a62a30c6076cbd04ca37d343784e8158d79ba42e Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 13 Sep 2017 09:05:36 +0200 Subject: [PATCH] build scripts: take paths to launcher-generator libraries from project model Otherwise build fails if libraries are converted to repository libraries. --- .../build/impl/WindowsDistributionBuilder.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy index 5f6c38c8d063..a14ec8bfbceb 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy @@ -20,6 +20,7 @@ import org.jetbrains.intellij.build.BuildContext import org.jetbrains.intellij.build.BuildOptions import org.jetbrains.intellij.build.JvmArchitecture import org.jetbrains.intellij.build.WindowsDistributionCustomizer +import org.jetbrains.jps.model.library.JpsOrderRootType import org.jetbrains.jps.model.module.JpsModuleSourceRoot /** @@ -206,10 +207,10 @@ IDS_VM_OPTIONS=$vmOptions arg(value: outputPath) classpath { pathelement(location: "$communityHome/build/lib/launcher-generator.jar") - fileset(dir: "$communityHome/lib") { - include(name: "guava*.jar") - include(name: "jdom.jar") - include(name: "commons-imaging*.jar") + ["Guava", "JDOM", "commons-imaging"].each { + buildContext.project.libraryCollection.findLibrary(it).getFiles(JpsOrderRootType.COMPILED).each { + pathelement(location: it.absolutePath) + } } resourceModules.collectMany { it.sourceRoots }.each { JpsModuleSourceRoot root -> pathelement(location: root.file.absolutePath)