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 source-dist + git version info separation #5528

Merged
merged 4 commits into from
Jan 26, 2014

Conversation

ivarne
Copy link
Sponsor Member

@ivarne ivarne commented Jan 25, 2014

This is a rebase and combination of #5266 and #5095

I am not sure if @staticfloat has already based some of his nightly release effort on the previous work, so do not merge before he says this is still needed.

Unfortunately this might be a breaking change for code that depends on the Base.BUILD_INFO struct, because it has been renamed to Base.GIT_VERSION_INFO. Base.BUILD_INFO.version_string and Base.BUILD_INFO.TAGGED_RELEASE_BANNER has been put into a constant Base.VERSION_STRING and Base.TAGGED_RELEASE_BANNER.

I do not know how we might add a deprecation for these properties, but it would be possible to make a alias, so that packages who cares about compatibility can postpone their update until most users have this change.

source-dist is a make target for creating a standalone tarball that can
be compilled on a system with the requisit external dependencies without
internet access to download the internal dependencies.
@ivarne
Copy link
Sponsor Member Author

ivarne commented Jan 25, 2014

Unfortunately there is still a problem with readline patches that gets downloaded instead of being checked into our repository. As they do not match the pattern *.tar.gz or the other archive formats, they are currently not included, and the build fails.

@staticfloat
Copy link
Sponsor Member

Unfortunately there is still a problem with readline patches that gets downloaded instead of being checked into our repository.

These get downloaded via make -C deps getall, so they're already downloaded. Just change this line:

ls deps/*.tar.gz deps/*.tar.bz2 deps/*.tgz deps/random/*.tar.gz >> source-dist.tmp

To this:

ls deps/*.tar.gz deps/*.tar.bz2 deps/*.tgz deps/random/*.tar.gz deps/readline-* >> source-dist.tmp

And you should be good to go. Once you do that, I'll test this and merge it.

@ivarne
Copy link
Sponsor Member Author

ivarne commented Jan 26, 2014

Sorry, but that does not fix it. On my system the files are called readline62-00X.

This pattern matching files to include thing seems so funky. Nobody will know when they can remove anything, and it will not be discovered before someone tries build on a machine without internet (or if someone have a broken make rule that does not depend on the files downloaded). The *tar* rules seems fine, but I think the patches does not have unique enough names to be safe.

I can not see why we download the readline patches, and it requires
somewhat  ugly code in the make rule for the source-dist target.
@staticfloat
Copy link
Sponsor Member

Whoops, yep. Meant to say readline62-, not readline-. In any case, adding the files to the repo seems just fine to me. This also works just fine, so I'ma merge it.

staticfloat added a commit that referenced this pull request Jan 26, 2014
make source-dist + git version info separation
@staticfloat staticfloat merged commit c19a8e9 into JuliaLang:master Jan 26, 2014
@ivarne ivarne deleted the distributing branch January 26, 2014 23:05
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.

2 participants