Merge pull request #440 from eikek/fix-mk-tools

Fix packaging tools
This commit is contained in:
mergify[bot] 2020-11-13 22:14:52 +00:00 committed by GitHub
commit 7216629059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -672,14 +672,20 @@ def packageTools(logger: Logger, dir: File, version: String): Seq[File] = {
webext webext
) )
val excludes = Seq(wx, target)
val files =
(dir ** "*")
.filter(f => !excludes.exists(p => f.absolutePath.startsWith(p.absolutePath)))
.pair(sbt.io.Path.relativeTo(dir))
.map({case (f, name) => (f, s"docspell-tools-${version}/$name") })
IO.zip( IO.zip(
Seq( Seq(
webext -> s"docspell-tools-${version}/firefox/docspell-extension.xpi", webext -> s"docspell-tools-${version}/firefox/docspell-extension.xpi",
wx / "native/app_manifest.json" -> s"docspell-tools-${version}/firefox/native/app_manifest.json", wx / "native/app_manifest.json" -> s"docspell-tools-${version}/firefox/native/app_manifest.json",
wx / "native/native.py" -> s"docspell-tools-${version}/firefox/native/native.py", wx / "native/native.py" -> s"docspell-tools-${version}/firefox/native/native.py"
dir / "ds.sh" -> s"docspell-tools-${version}/ds.sh", ) ++ files,
dir / "consumedir.sh" -> s"docspell-tools-${version}/consumedir.sh"
),
archive archive
) )