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

fixed incremantal building of fatJar: the timestamps of the included jars and classes folders of other projects were not cheched

Browse source
This commit is contained in:
DevCharly 2016-06-08 14:53:03 +02:00
parent ff7402b24f
commit 31a905b3a4
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt
View file

@ -1,13 +1,16 @@
package com.beust.kobalt.archive package com.beust.kobalt.archive
import com.beust.kobalt.Features import com.beust.kobalt.Features
import com.beust.kobalt.IFileSpec
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.api.annotation.ExportedProjectProperty import com.beust.kobalt.api.annotation.ExportedProjectProperty
import com.beust.kobalt.misc.From
import com.beust.kobalt.misc.IncludedFile import com.beust.kobalt.misc.IncludedFile
import com.beust.kobalt.misc.JarUtils import com.beust.kobalt.misc.JarUtils
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.beust.kobalt.misc.To
import java.io.File import java.io.File
import java.io.FileOutputStream import java.io.FileOutputStream
import java.io.OutputStream import java.io.OutputStream
@ -62,13 +65,21 @@ class Archives {
includedFiles.forEach { root -> includedFiles.forEach { root ->
val allFiles = root.allFromFiles(directory) val allFiles = root.allFromFiles(directory)
allFiles.forEach { relFile -> allFiles.forEach { relFile ->
val file = File(KFiles.joinDir(directory, root.from, relFile.path)) val file = if (relFile.isAbsolute)
relFile // e.g. jar file or classes folder (of another project) when building a fat jar
else
File(KFiles.joinDir(directory, root.from, relFile.path))
if (file.isFile) { if (file.isFile) {
if (file.lastModified() > lastModified) { if (file.lastModified() > lastModified) {
log(3, " TS - Outdated $file and $output " log(3, " TS - Outdated $file and $output "
+ Date(file.lastModified()) + " " + Date(output.lastModified())) + Date(file.lastModified()) + " " + Date(output.lastModified()))
return true return true
} }
} else if (file.isDirectory) {
// e.g. classes folder (of another project) when building a fat jar
val includedFile = IncludedFile(From(""), To(""), listOf(IFileSpec.GlobSpec("**")))
if (isOutdated(file.absolutePath, listOf(includedFile), output))
return true
} }
} }
} }