Skip to content

Commit

Permalink
External stdlibs: Move *_URL stdlib definitions into .version files
Browse files Browse the repository at this point in the history
Co-authored-by: Elliot Saba <staticfloat@gmail.com>
(cherry picked from commit dfcd63f)
  • Loading branch information
DilumAluthge authored and KristofferC committed Mar 18, 2022
1 parent 74d6f07 commit 967fa9a
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
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 = release-1.4
DOWNLOADS_SHA1 = b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8
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 = 8310487053915d5c995513f569ad85ba65c3544f
LIBCURL_GIT_URL := git://github.com/JuliaWeb/LibCURL.jl.git
LIBCURL_TAR_URL = https://api.github.com/repos/JuliaWeb/LibCURL.jl/tarball/$1
14 changes: 0 additions & 14 deletions stdlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,6 @@ STDLIBS = Artifacts Base64 CRC32c Dates DelimitedFiles Distributed FileWatching
$(JLL_NAMES)

STDLIBS_EXT = Pkg Statistics LibCURL Downloads ArgTools Tar NetworkOptions
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

$(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 = a251de1e1c8ce4edc351d0f05233ba7fe7d2c27a
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 = release-1.6
PKG_SHA1 = 3d41ca188d72e1dc1862e780f31153d629d6a3dd
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/Statistics.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
STATISTICS_BRANCH = master
STATISTICS_SHA1 = 4b3ef9aaa79350510ca0be395458f66051c2f92d
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/Tar.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
TAR_BRANCH = release-1.9
TAR_SHA1 = 2c86131a240bf06b9d4fa4bd813d66ea4bb1d7ae
TAR_GIT_URL := git://github.com/JuliaIO/Tar.jl.git
TAR_TAR_URL = https://api.github.com/repos/JuliaIO/Tar.jl/tarball/$1

0 comments on commit 967fa9a

Please sign in to comment.