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 the directory problem.

Browse source
This commit is contained in:
Cedric Beust 2016-03-28 19:12:19 -07:00
parent cdd1bb93d4
commit 8871c47561
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/FileSpec.kt
View file

@ -44,7 +44,7 @@ sealed class IFileSpec {
val result = arrayListOf<File>() val result = arrayListOf<File>()
val includes = Glob(*spec.toTypedArray()) val includes = Glob(*spec.toTypedArray())
if (File(filePath).isDirectory) { if (File(baseDir, filePath).isDirectory) {
val orgRootDir = (if (File(filePath).isAbsolute) Paths.get(filePath) val orgRootDir = (if (File(filePath).isAbsolute) Paths.get(filePath)
else if (baseDir != null) Paths.get(baseDir, filePath) else if (baseDir != null) Paths.get(baseDir, filePath)
else Paths.get(filePath)).run { normalize() } else Paths.get(filePath)).run { normalize() }

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt
View file

@ -172,7 +172,7 @@ class IncludedFile(val fromOriginal: From, val toOriginal: To, val specs: List<I
val result = arrayListOf<File>() val result = arrayListOf<File>()
specs.forEach { spec -> specs.forEach { spec ->
// val fullDir = if (directory == null) from else KFiles.joinDir(directory, from) // val fullDir = if (directory == null) from else KFiles.joinDir(directory, from)
spec.toFiles(directory, from).filter { it.isFile }.forEach { source -> spec.toFiles(directory, from).forEach { source ->
result.add(if (source.isAbsolute) source else File(source.path)) result.add(if (source.isAbsolute) source else File(source.path))
} }
} }