erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 00:38:11 -07:00
Code Releases Activity

Fix rootDir problem.

Browse source
This commit is contained in:
Cedric Beust 2016-02-19 05:15:51 +04:00
parent 2f386a622d
commit 77ca480f57
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
View file

@ -50,7 +50,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
val includedSpecs = arrayListOf<IFileSpec>()
includedFile.specs.forEach { spec ->
val fromPath = includedFile.from
if (File(fromPath).exists()) {
if (File(directory, fromPath).exists()) {
spec.toFiles(directory, fromPath).forEach { file ->
val fullFile = File(KFiles.joinDir(directory, fromPath, file.path))
if (! fullFile.exists()) {
@ -247,12 +247,14 @@ class PackageConfig(val project: Project) : AttributeHolder {
jar {
name = "${project.name}-${project.version}-sources.jar"
project.sourceDirectories.forEach {
include(from(project.directory + "/" + it), to(""), glob("**"))
if (File(project.directory, it).exists()) {
include(from(it), to(""), glob("**"))
}
}
}
jar {
name = "${project.name}-${project.version}-javadoc.jar"
include(from(project.buildDirectory + "/" + JvmCompilerPlugin.DOCS_DIRECTORY), to(""), glob("**"))
include(from(JvmCompilerPlugin.DOCS_DIRECTORY), to(""), glob("**"))
}
mainJarAttributes.forEach {