improved collecting used modules in layout

This commit is contained in:
nik
2011-02-09 16:31:31 +03:00
parent 6c71c74530
commit 67f8ab4044
+5 -3
View File
@@ -1,6 +1,7 @@
import org.jetbrains.jps.Jps
import org.jetbrains.jps.Module
import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
import org.jetbrains.jps.LayoutInfo
includeTargets << new File("${guessHome(this as Script)}/community/build/scripts/utils.gant")
includeTargets << new File("${guessHome(this)}/build/scripts/libLicenses.gant")
@@ -225,8 +226,8 @@ target('default': "Build artifacts") {
build_searchable_options()
wire_build_date(buildName)
layoutFull(paths.distAll, usedJars)
checkLibLicensesAndGenerateTable("$paths.artifacts/third-party-libraries.txt");
LayoutInfo layoutInfo = layoutFull(paths.distAll, usedJars)
checkLibLicensesAndGenerateTable("$paths.artifacts/third-party-libraries.txt", layoutInfo.usedModules);
buildDebuggerEgg(paths, buildName)
scramble()
@@ -403,7 +404,7 @@ def layoutFull(String target, Set usedJars) {
def openapiModules = platformApiModules()
def implementationModules = [platformImplementationModules(), "python", "python-ide"].flatten()
layout(target) {
def result = layout(target) {
dir("lib") {
jar("util.jar") { module("util") }
@@ -506,6 +507,7 @@ def layoutFull(String target, Set usedJars) {
}
patchPropertiesFile(target)
return result
}
def layoutMac(Map args, String target) {