Skip to content

Update make dist components #12112

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

Closed
wants to merge 2 commits into from
Closed

Update make dist components #12112

wants to merge 2 commits into from

Conversation

lucab
Copy link
Contributor

@lucab lucab commented Feb 8, 2014

make dist or building from a generated tarball is currently not possible due to some files that have been renamed and the ongoing libextra split. This PR fixes all (current) issues in order to build rust from the .tar.gz source alone.

src/README.txt has been renamed in a30d61b, make dist is
thus failing as unable to find it.
This commit makes the dist target working again.

Signed-off-by: Luca Bruno <lucab@debian.org>
@alexcrichton
Copy link
Member

This is going to change rapidly over time, so I'd rather abstract this over the CRATES variable so we don't have to keep updating it in the future.

I believe that you can do that with:

PKG_FILES := \
    $(S)COPYRIGHT \
    $(S)LICENSE-APACHE \
    $(S)LICENSE-MIT \
    $(S)AUTHORS.txt \
    $(S)CONTRIBUTING.md \
    $(S)README.md \
    $(S)RELEASES.txt \
    $(S)configure $(S)Makefile.in \
    $(S)man \
    $(S)doc \
    $(addprefix $(S)src/, \
      README.md \
      compiletest \
      driver \
      etc \
      $(foreach crate,$(CRATES),lib$(crate)) \
      rt \
      rustllvm \
      snapshots.txt \
      test) \
    $(PKG_GITMODULES) \
    $(filter-out Makefile config.stamp config.mk, \
                 $(MKFILE_DEPS))

libextra is currently being split into several crates. This commit adds
them all to the dist target in order to have them in the final tarballs.

Signed-off-by: Luca Bruno <lucab@debian.org>
@lucab
Copy link
Contributor Author

lucab commented Feb 8, 2014

Makes a lot more sense. Tested and rebased.

bors added a commit that referenced this pull request Feb 8, 2014
`make dist` or building from a generated tarball is currently not possible due to some files that have been renamed and the ongoing libextra split. This PR fixes all (current) issues in order to build rust from the .tar.gz source alone.
@bors bors closed this Feb 9, 2014
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.

3 participants