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.

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

make-vendored.sh: remove "./" from path #267

Merged
merged 3 commits into from
Mar 4, 2020

Conversation

eszlari
Copy link

@eszlari eszlari commented Mar 4, 2020

fixes #206

@RazrFalcon
Copy link
Collaborator

This change breaks the --exclude patterns. And again, archive does contain capi/Cargo.toml.

@RazrFalcon
Copy link
Collaborator

This one breaks compilation. What are you even trying to do?

@eszlari
Copy link
Author

eszlari commented Mar 4, 2020

And again, archive does contain capi/Cargo.toml

Yes, it does, but there is also a top level "." directory, compare:

$ tar tf resvg-0.6.1.tar.xz
[...]
resvg-0.6.1/Cargo.toml
[...]

$ tar tf resvg-0.9.0.tar.xz
[...]
./resvg-0.9.0/Cargo.toml
[...]

@RazrFalcon
Copy link
Collaborator

Looks like this is the right command:

env XZ_OPT="-9e" tar \
    --exclude=".git" \
    --exclude=".gitignore" \
    --exclude=".travis.yml" \
    --exclude="resvg-$VERSION/.github" \
    --exclude="resvg-$VERSION/version-bump.md" \
    --exclude="resvg-$VERSION/docs" \
    --exclude="resvg-$VERSION/benches" \
    --exclude="resvg-$VERSION/examples" \
    --exclude="resvg-$VERSION/testing-tools" \
    --exclude="resvg-$VERSION/capi/qtests" \
    -cJf resvg-"$VERSION".tar.xz resvg-"$VERSION"

If it works for you, please update the pull request and I will merge it.

@RazrFalcon
Copy link
Collaborator

I've reuploaded the archive. Please try it out.

@eszlari
Copy link
Author

eszlari commented Mar 4, 2020

It worked! (flathub/org.openshot.OpenShot#9)

@RazrFalcon RazrFalcon merged commit e207cc3 into linebender:master Mar 4, 2020
@RazrFalcon
Copy link
Collaborator

Glad to hear that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tarball not usable (vendor)
2 participants