fixes for reproducibility on windows

hotfix/0.8.7
Zlatin Balevsky 2021-05-14 20:41:44 +01:00
parent 8933897853
commit b0b129f679
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 10 additions and 4 deletions

View File

@ -44,6 +44,7 @@ subprojects {
} }
} }
import java.util.jar.* import java.util.jar.*
import java.nio.file.*
void stripJar(File file) { void stripJar(File file) {
if (file.getName().endsWith('.tar')) if (file.getName().endsWith('.tar'))
return return
@ -59,7 +60,9 @@ void stripJar(File file) {
out << jf.getInputStream(it) out << jf.getInputStream(it)
} }
out.finish() out.finish()
jf.close()
} }
newFile.renameTo file Files.copy(newFile.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING)
newFile.delete()
} }

View File

@ -160,21 +160,24 @@ task griffonManifest {
def controllerFile = new File(manifest, "griffon.core.artifact.GriffonController") def controllerFile = new File(manifest, "griffon.core.artifact.GriffonController")
controllerFile.withPrintWriter("US-ASCII", {writer -> controllerFile.withPrintWriter("US-ASCII", {writer ->
controllers.each {controller -> controllers.each {controller ->
writer.println(controller) writer.print(controller)
writer.print('\n')
} }
}) })
def modelsFile = new File(manifest, "griffon.core.artifact.GriffonModel") def modelsFile = new File(manifest, "griffon.core.artifact.GriffonModel")
modelsFile.withPrintWriter("US-ASCII", {writer -> modelsFile.withPrintWriter("US-ASCII", {writer ->
models.each {model -> models.each {model ->
writer.println(model) writer.print(model)
writer.print('\n')
} }
}) })
def viewsFile = new File(manifest, "griffon.core.artifact.GriffonView") def viewsFile = new File(manifest, "griffon.core.artifact.GriffonView")
viewsFile.withPrintWriter("US-ASCII", {writer -> viewsFile.withPrintWriter("US-ASCII", {writer ->
views.each {view -> views.each {view ->
writer.println(view) writer.print(view)
writer.print('\n')
} }
}) })
} }