Download Pkg from GitHub releases. #29615
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| a633a375be6e5649865d8feee23bc177 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 9a16e4932017d0d159bcf65750eeeda1a637a51b6a1a4ebff957a81bc31fadc6db4be69426d6e99118129db9607e8b4d77df894c5df4fa55f88c45ebbb12d7b1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /srccache | ||
| /Pkg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| default: install | ||
|
|
||
| .PHONY: default extract-pkg get-pkg clean-pkg getall install | ||
|
|
||
| SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) | ||
| JULIAHOME := $(abspath $(SRCDIR)/..) | ||
| SRCCACHE := $(abspath $(SRCDIR)/srccache) | ||
| BUILDDIR := $(SRCCACHE) | ||
|
|
||
| include $(JULIAHOME)/Make.inc | ||
| include $(JULIAHOME)/deps/tools/common.mk | ||
| include $(JULIAHOME)/deps/tools/git-external.mk | ||
|
|
||
| VERSDIR := v`cut -d. -f1-2 < $(JULIAHOME)/VERSION` | ||
|
|
||
| # Download and extract Pkg | ||
| PKG := https://github.com/JuliaLang/Pkg.jl | ||
| PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1 | ||
| $(eval $(call git-external,Pkg,PKG,,,$(BUILDDIR))) | ||
|
|
||
| extract-pkg: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted | ||
| Pkg: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted | ||
|
There was a problem hiding this comment. Shouldn't this check for There was a problem hiding this comment.
This tells |
||
| rm -rf $@ | ||
| cp -r $(BUILDDIR)/$(PKG_SRC_DIR) $@ | ||
| get-pkg: Pkg | ||
| clean-pkg: | ||
| -rm -rf Pkg | ||
| -rm -rf $(BUILDDIR)/$(PKG_SRC_DIR) | ||
|
|
||
| # Generate symlinks to all stdlibs from usr/share/julia/stdlib/vX.Y/ | ||
| STDLIBS = Base64 CRC32c Dates DelimitedFiles Distributed FileWatching \ | ||
| Future InteractiveUtils Libdl LibGit2 LinearAlgebra Logging \ | ||
| Markdown Mmap Printf Profile Random REPL Serialization SHA \ | ||
| SharedArrays Sockets SparseArrays Statistics SuiteSparse Test Unicode UUIDs | ||
|
|
||
| $(foreach pkg, $(STDLIBS), $(eval $(call symlink_target,$(JULIAHOME)/stdlib/$(pkg),$(build_datarootdir)/julia/stdlib/$(shell echo $(VERSDIR)),$(pkg)))) | ||
| $(eval $(call symlink_target,$(BUILDROOT)/stdlib/Pkg,$(build_datarootdir)/julia/stdlib/$(shell echo $(VERSDIR)),Pkg)) | ||
|
|
||
| $(build_datarootdir)/julia/stdlib/$(shell echo $(VERSDIR)): | ||
| mkdir -p $@ | ||
|
|
||
| STDLIBS_LINK_TARGETS = $(addprefix $(build_datarootdir)/julia/stdlib/$(shell echo $(VERSDIR))/, $(STDLIBS) Pkg) | ||
|
|
||
| install: Pkg $(STDLIBS_LINK_TARGETS) | ||
| getall: get-pkg | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| PKG_BRANCH = master | ||
| PKG_SHA1 = d305e82fd353cb67e8a064800b9972ee1cb7b5e0 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess this was supposed to include Pkg in the source tarballs? Apparently it didn't work: the 1.0.2 tarball doesn't contain it. That's annoying for building distribution packages without network access.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I'm 90% sure I tried this, but maybe I didn't do it from a clean repo. We should be able to re-upload the source tarballs with this included, @ararslan? I'll have a look at it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes we can re-create and re-upload the source tarballs, it's just a bit annoying since we can't go through the
full-source-distMake target; we'll have to do everything manually. Apologies for not catching this during the release preparation.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was talking about light-source-dist, but maybe full-source-dist has the same problem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should it be included there? I interpreted https://github.com/JuliaLang/julia/blob/master/Makefile#L516 as only including code from this repo, and thus Pkg is just an external dependency that should only be in the full variant, which it seems to be btw?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, all other external dependencies are libraries that could be installed separately from Julia, and which generally exist as distribution packages. OTC Pkg cannot be used without Julia. Also, in practical terms, if the plan is to move progressively all stdlib modules to separate repos, it would be quite painful for packagers to have to handle all of them manually (and update versions one by one for each new release).