Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix packageZipTarball defaults for UniversalDocs and UniversalSource #1086

Merged
merged 2 commits into from
Jan 8, 2018
Merged

fix packageZipTarball defaults for UniversalDocs and UniversalSource #1086

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59dca50
fix packageZipTarball defaults for UniversalDocs and UniversalSource
timcharper Aug 24, 2017
485f150
Add mappings to universalSrc/universalDocs and create working directory
muuki88 Jan 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scala/com/typesafe/sbt/packager/universal/UniversalPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ object UniversalPlugin extends AutoPlugin {
private[this] def defaultUniversalArchiveOptions: Seq[Setting[_]] = Seq(
universalArchiveOptions in (Universal, packageZipTarball) := Seq("-pcvf"),
universalArchiveOptions in (Universal, packageXzTarball) := Seq("-pcvf"),
universalArchiveOptions in (UniversalDocs, packageZipTarball) := Seq("-pcvf"),
universalArchiveOptions in (UniversalDocs, packageXzTarball) := Seq("-pcvf"),
universalArchiveOptions in (UniversalDocs, packageXzTarball) := Seq("-pcvf"),
universalArchiveOptions in (UniversalSrc, packageXzTarball) := Seq("-pcvf"),
universalArchiveOptions in (UniversalSrc, packageZipTarball) := Seq("-pcvf"),
universalArchiveOptions in (UniversalSrc, packageXzTarball) := Seq("-pcvf")
)

Expand Down
8 changes: 8 additions & 0 deletions src/sbt-test/universal/test-zips/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@ $ exists target/universal-src/simple-test-0.1.0.zip
# Run the tgz packaging.
> universal:packageZipTarball
$ exists target/universal/simple-test-0.1.0.tgz
> universal-docs:packageZipTarball
$ exists target/universal-docs/simple-test-0.1.0.tgz
> universal-src:packageZipTarball
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These commands don't seem to work at all.

$ exists target/universal-src/simple-test-0.1.0.tgz

# Run the txz packaging.
> universal:packageXzTarball
$ exists target/universal/simple-test-0.1.0.txz
> universal-docs:packageXzTarball
$ exists target/universal-docs/simple-test-0.1.0.txz
> universal-src:packageXzTarball
$ exists target/universal-src/simple-test-0.1.0.txz


# TODO - Check contents of zips