1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 08:38:13 -07:00

Timestamp work.

This commit is contained in:
Cedric Beust 2015-12-19 02:26:10 +04:00
parent 0d75f9ad5f
commit d9a287f710
5 changed files with 80 additions and 25 deletions

View file

@ -17,6 +17,7 @@ import java.io.File
import java.io.FileOutputStream
import java.io.OutputStream
import java.nio.file.Paths
import java.util.*
import java.util.jar.JarOutputStream
import java.util.zip.ZipOutputStream
import javax.inject.Inject
@ -236,19 +237,42 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
val fullArchiveName = context.variant.archiveName(project, archiveName, suffix)
val archiveDir = File(libsDir(project))
val result = File(archiveDir.path, fullArchiveName)
val outStream = outputStreamFactory(FileOutputStream(result))
log(2, "Creating $result")
JarUtils.addFiles(project.directory, includedFiles, outStream, expandJarFiles)
log(2, text = "Added ${includedFiles.size} files to $result")
outStream.flush()
outStream.close()
log(1, " Created $result")
if (isOutdated(project.directory, includedFiles, result)) {
val outStream = outputStreamFactory(FileOutputStream(result))
JarUtils.addFiles(project.directory, includedFiles, outStream, expandJarFiles)
log(2, text = "Added ${includedFiles.size} files to $result")
outStream.flush()
outStream.close()
log(1, " Created $result")
} else {
log(2, " $result is up to date")
}
project.projectProperties.put(JAR_NAME, result.absolutePath)
return result
}
private fun isOutdated(directory: String, includedFiles: List<IncludedFile>, output: File): Boolean {
if (! output.exists()) return true
val lastModified = output.lastModified()
includedFiles.forEach { root ->
val allFiles = root.allFromFiles(directory)
allFiles.forEach { file ->
if (file.isFile) {
if (file.lastModified() > lastModified) {
log(2, " Outdated $file and $output "
+ Date(file.lastModified()) + " " + Date(output.lastModified()))
return true
}
}
}
}
return false
}
fun addPackage(p: PackageConfig) {
packages.add(p)
}

View file

@ -0,0 +1,18 @@
package com.beust.kobalt.misc
import com.beust.kobalt.IFileSpec
import org.testng.Assert
import org.testng.annotations.Test
import javax.inject.Inject
@Test
class JarUtilsTest @Inject constructor() {
fun allFromFiles() {
val inf = IncludedFile(From("kobaltBuild/classes"), To(""),
listOf(IFileSpec.FileSpec("com/beust/kobalt/wrapper/Main.class")))
val files = inf.allFromFiles("modules/wrapper")
println("Files: $files")
Assert.assertEquals(files[0].path, "modules/wrapper/kobaltBuild/classes/com/beust/kobalt/wrapper/Main.class")
}
}