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

External stdlibs: Move *_URL stdlib definitions into .version files #42474

Merged
merged 1 commit into from
Oct 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/new-stdlib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ UNAME=$(echo "$NAME" | tr [a-z] [A-Z])

sed -e "/^STDLIBS_EXT =/,/^\$/s!^\$!\\
STDLIBS_EXT += $NAME\\
${UNAME}_GIT_URL := git://github.com/$USER/$NAME.jl.git\\
${UNAME}_TAR_URL = https://api.github.com/repos/$USER/$NAME.jl/tarball/\$1\\
!" "$ROOT/Makefile" >"$ROOT/Makefile.tmp"
mv "$ROOT/Makefile.tmp" "$ROOT/Makefile"

cat >"$ROOT/$NAME.version" <<EOF
${UNAME}_BRANCH = master
${UNAME}_SHA1 = $SHA1
${UNAME}_GIT_URL := git://github.com/$USER/$NAME.jl.git
${UNAME}_TAR_URL = https://api.github.com/repos/$USER/$NAME.jl/tarball/\$1
EOF

git add "$ROOT/$NAME.version"
Expand Down
2 changes: 2 additions & 0 deletions stdlib/ArgTools.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ARGTOOLS_BRANCH = master
ARGTOOLS_SHA1 = fa878696ff2ae4ba7ca9942bf9544556c0d86ce4
ARGTOOLS_GIT_URL := git://github.com/JuliaIO/ArgTools.jl.git
ARGTOOLS_TAR_URL = https://api.github.com/repos/JuliaIO/ArgTools.jl/tarball/$1
2 changes: 2 additions & 0 deletions stdlib/Downloads.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
DOWNLOADS_BRANCH = master
DOWNLOADS_SHA1 = 5f1509da10cf22bb4fc59de707cb3455b6807d99
DOWNLOADS_GIT_URL := git://github.com/JuliaLang/Downloads.jl.git
DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1
2 changes: 2 additions & 0 deletions stdlib/LibCURL.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
LIBCURL_BRANCH = master
LIBCURL_SHA1 = cddeb7f4a7d5718a4a1be602ffcbe68299a1a37e
LIBCURL_GIT_URL := git://github.com/JuliaWeb/LibCURL.jl.git
LIBCURL_TAR_URL = https://api.github.com/repos/JuliaWeb/LibCURL.jl/tarball/$1
18 changes: 0 additions & 18 deletions stdlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,6 @@ STDLIBS = Artifacts Base64 CRC32c Dates DelimitedFiles Distributed FileWatching
$(JLL_NAMES)

STDLIBS_EXT = Pkg Statistics LibCURL Downloads ArgTools Tar NetworkOptions SuiteSparse SHA
PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
STATISTICS_GIT_URL := git://github.com/JuliaLang/Statistics.jl.git
STATISTICS_TAR_URL = https://api.github.com/repos/JuliaLang/Statistics.jl/tarball/$1
LIBCURL_GIT_URL := git://github.com/JuliaWeb/LibCURL.jl.git
LIBCURL_TAR_URL = https://api.github.com/repos/JuliaWeb/LibCURL.jl/tarball/$1
DOWNLOADS_GIT_URL := git://github.com/JuliaLang/Downloads.jl.git
DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1
ARGTOOLS_GIT_URL := git://github.com/JuliaIO/ArgTools.jl.git
ARGTOOLS_TAR_URL = https://api.github.com/repos/JuliaIO/ArgTools.jl/tarball/$1
TAR_GIT_URL := git://github.com/JuliaIO/Tar.jl.git
TAR_TAR_URL = https://api.github.com/repos/JuliaIO/Tar.jl/tarball/$1
NETWORKOPTIONS_GIT_URL := git://github.com/JuliaLang/NetworkOptions.jl.git
NETWORKOPTIONS_TAR_URL = https://api.github.com/repos/JuliaLang/NetworkOptions.jl/tarball/$1
SUITESPARSE_GIT_URL := git://github.com/JuliaLang/SuiteSparse.jl.git
SUITESPARSE_TAR_URL = https://api.github.com/repos/JuliaLang/SuiteSparse.jl/tarball/$1
SHA_GIT_URL := git://github.com/JuliaCrypto/SHA.jl.git
SHA_TAR_URL = https://api.github.com/repos/JuliaCrypto/SHA.jl/tarball/$1

$(foreach module, $(STDLIBS_EXT), $(eval $(call stdlib-external,$(module),$(shell echo $(module) | tr a-z A-Z))))

Expand Down
2 changes: 2 additions & 0 deletions stdlib/NetworkOptions.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
NETWORKOPTIONS_BRANCH = master
NETWORKOPTIONS_SHA1 = 42a0b5fcb7edb8ed5b0ae699f15ca6aedc0098ca
NETWORKOPTIONS_GIT_URL := git://github.com/JuliaLang/NetworkOptions.jl.git
NETWORKOPTIONS_TAR_URL = https://api.github.com/repos/JuliaLang/NetworkOptions.jl/tarball/$1
2 changes: 2 additions & 0 deletions stdlib/Pkg.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
PKG_BRANCH = master
PKG_SHA1 = 13b7861518dcfceebfc01566c329a2b2faa62623
PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
2 changes: 2 additions & 0 deletions stdlib/SHA.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
SHA_BRANCH = master
SHA_SHA1 = c5dd533520393b9dea34ad25287f222dc28fe07a
SHA_GIT_URL := git://github.com/JuliaCrypto/SHA.jl.git
SHA_TAR_URL = https://api.github.com/repos/JuliaCrypto/SHA.jl/tarball/$1
2 changes: 2 additions & 0 deletions stdlib/Statistics.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
STATISTICS_BRANCH = master
STATISTICS_SHA1 = 74897fed33700dba92578aa0fefef5b99ba16086
STATISTICS_GIT_URL := git://github.com/JuliaLang/Statistics.jl.git
STATISTICS_TAR_URL = https://api.github.com/repos/JuliaLang/Statistics.jl/tarball/$1
2 changes: 2 additions & 0 deletions stdlib/SuiteSparse.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
SUITESPARSE_BRANCH = master
SUITESPARSE_SHA1 = b15c39be53f7823c721c1f8a7c036105e2baa04a
SUITESPARSE_GIT_URL := git://github.com/JuliaLang/SuiteSparse.jl.git
SUITESPARSE_TAR_URL = https://api.github.com/repos/JuliaLang/SuiteSparse.jl/tarball/$1
2 changes: 2 additions & 0 deletions stdlib/Tar.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
TAR_BRANCH = master
TAR_SHA1 = 67f004d2af9570c7c19e679e4469bb77e918f0fc
TAR_GIT_URL := git://github.com/JuliaIO/Tar.jl.git
TAR_TAR_URL = https://api.github.com/repos/JuliaIO/Tar.jl/tarball/$1