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

Added source-dist makefile target #5266

Closed
wants to merge 3 commits into from
Closed

Conversation

ivarne
Copy link
Member

@ivarne ivarne commented Dec 30, 2013

This is an alternative to #5264 @staticfloat

This approach has less hardcoded paths and does not make a copy before compressing.

@ivarne
Copy link
Member Author

ivarne commented Dec 30, 2013

oops.. It seems like I did not include tar.bz files

@staticfloat
Copy link
Member

This approach looks generally better than mine; I thought about using git to get the list of files but decided not to so I could omit files such as .travis.yml, etc... which don't really need to be included. In the end though, this approach is much simpler and including those files doesn't matter at all. :)

@staticfloat
Copy link
Member

I'll test on OSX in the next day or so.

@ivarne
Copy link
Member Author

ivarne commented Dec 30, 2013

Now it does not download anything when try make -C deps getall, but I still have not tested this enough.


# Create tarball
tar -cz -T source-dist.tmp -f julia-$(JULIA_VERSION)_$(JULIA_COMMIT).tar.gz
rm source-dist.tmp
Copy link
Member

Choose a reason for hiding this comment

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

sed -i".bak" creates source-dist.tmp.bak which you need to clean up as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

I noticed, but wanted to push the other updates before going to sleep.

@staticfloat
Copy link
Member

For some reason, tar is still including the .git directories for the submodules:

$ tar -tvf ./julia-0.3.0-prerelease_cad6390270.tar.gz  | grep "\.git"
-rw-r--r--  0 sabae  staff      38 Oct 25 20:59 deps/Rmath/.git
-rw-r--r--  0 sabae  staff     139 Oct 25 20:59 deps/Rmath/.gitignore
-rw-r--r--  0 sabae  staff      17 Oct 25 20:59 deps/Rmath/src/.gitignore
-rw-r--r--  0 sabae  staff      38 Oct 25 20:59 deps/libuv/.git
-rw-r--r--  0 sabae  staff     523 Oct 25 20:59 deps/libuv/.gitignore
-rw-r--r--  0 sabae  staff       7 Oct 25 20:59 deps/libuv/src/.gitignore
-rw-r--r--  0 sabae  staff       7 Oct 25 20:59 deps/libuv/src/win/.gitignore
-rw-r--r--  0 sabae  staff      41 Oct 25 20:59 deps/openlibm/.git
-rw-r--r--  0 sabae  staff      30 Oct 25 20:59 deps/openlibm/.gitignore
-rw-r--r--  0 sabae  staff     106 Oct 25 20:59 deps/openlibm/test/.gitignore
-rw-r--r--  0 sabae  staff      44 Dec 27 16:50 deps/openspecfun/.git
-rw-r--r--  0 sabae  staff     144 Dec 27 16:50 deps/openspecfun/.gitignore
-rw-r--r--  0 sabae  staff      40 Oct 25 20:59 doc/juliadoc/.git
-rw-r--r--  0 sabae  staff     303 Oct 25 20:59 doc/juliadoc/.gitignore

@ivarne
Copy link
Member Author

ivarne commented Dec 31, 2013

Do you think the naming of the tarball is fine? Users who doesn't use tab completion (scripts?) will have problem typing 10 characters of the sha.

I would also like to have the tarball extract to a folder, but have not figured out how to do that when giving a file list with -T.

@staticfloat
Copy link
Member

I think it's pretty standard to have the tarball not extract to a subdirectory, especially when dealing with source packages. Similarly, the name is fine I think. I think the biggest user of source-dist is going to be distributors and packagers, and dealing with long filenames is not an issue. make source-dist is probably going to be run by scripts more often than it's going to be run manually.

@ivarne
Copy link
Member Author

ivarne commented Dec 31, 2013

The problem is that ls-files lists the directories for submodules. Adding --no-recursion to the tar command is the simplest fix.

@ivarne
Copy link
Member Author

ivarne commented Dec 31, 2013

I would want to update DISTRIBUTING.md also, but that will conflict with #5095

@staticfloat
Copy link
Member

Hmmm, it seems that you need to special-case in the deps/readline62-00X files. Perhaps a better solution is to just include those in our git repo? I'm not sure why those are downloaded from ftp.gnu.org instead of being saved in our git repo.

@staticfloat
Copy link
Member

The good news is that with those files included, the generated .tar.gz builds cleanly and passes all tests!

@staticfloat
Copy link
Member

I would want to update DISTRIBUTING.md also, but that will conflict with #5095

That PR is going to need a rebase anyway, now that we've messed around with base/version.jl, so go ahead and make your changes here.

@ivarne
Copy link
Member Author

ivarne commented Jan 3, 2014

Good point, the two PRs depend on each other anyway, so I might submit a new PR that does both.

@ivarne
Copy link
Member Author

ivarne commented Jan 26, 2014

Obsoleted by #5528

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