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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Roman Shevchenko
2015-08-19 12:28:43 +02:00
parent 04b22820c9 e3cf383e61
commit 3eae59e3a4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/utils.gant
+7 -3
View File
@@ -18,6 +18,7 @@ import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.jps.gant.JpsGantTool
import org.jetbrains.jps.gant.TeamCityBuildInfoPrinter
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.jps.model.java.JdkVersionDetector
import org.jetbrains.jps.model.java.JpsJavaExtensionService
@@ -737,7 +738,7 @@ binding.setVariable("zipSources", { String home, String targetDir ->
notifyArtifactBuilt(sources)
})
binding.setVariable("zipSourcesOfModules", { String home, String targetFilePath, Collection<String> modules ->
binding.setVariable("zipSourcesOfModules", { String targetFilePath, Collection<String> modules ->
projectBuilder.stage("zip sources of ${modules.size()} modules to $targetFilePath")
ant.mkdir(dir: new File(targetFilePath).getParent())
@@ -745,8 +746,11 @@ binding.setVariable("zipSourcesOfModules", { String home, String targetFilePath,
ant.zip(destfile: targetFilePath) {
modules.each {
JpsModule module = findModule(it)
module.getSourceRoots(JavaSourceRootType.SOURCE).flatten().collect {it.file}.each { File srcRoot ->
zipfileset(prefix: module.name, dir: srcRoot.absolutePath)
module.getSourceRoots(JavaSourceRootType.SOURCE).each { root ->
ant.zipfileset(dir: root.file.absolutePath, prefix: root.properties.packagePrefix.replace('.', '/'), erroronmissingdir: false)
}
module.getSourceRoots(JavaResourceRootType.RESOURCE).each { root ->
ant.zipfileset(dir: root.file.absolutePath, prefix: root.properties.relativeOutputPath, erroronmissingdir: false)
}
}
}