Skip to content

Commit 967fa9a

Browse files
DilumAluthgestaticfloat
authored andcommitted
External stdlibs: Move *_URL stdlib definitions into .version files
Co-authored-by: Elliot Saba <staticfloat@gmail.com> (cherry picked from commit dfcd63f)
1 parent 74d6f07 commit 967fa9a

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

contrib/new-stdlib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ UNAME=$(echo "$NAME" | tr [a-z] [A-Z])
5050

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

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

6363
git add "$ROOT/$NAME.version"

stdlib/ArgTools.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
ARGTOOLS_BRANCH = master
22
ARGTOOLS_SHA1 = fa878696ff2ae4ba7ca9942bf9544556c0d86ce4
3+
ARGTOOLS_GIT_URL := git://github.com/JuliaIO/ArgTools.jl.git
4+
ARGTOOLS_TAR_URL = https://api.github.com/repos/JuliaIO/ArgTools.jl/tarball/$1

stdlib/Downloads.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
DOWNLOADS_BRANCH = release-1.4
22
DOWNLOADS_SHA1 = b07b4cf3b20b77faa7efbe29c0adfa8b4b7ee8d8
3+
DOWNLOADS_GIT_URL := git://github.com/JuliaLang/Downloads.jl.git
4+
DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1

stdlib/LibCURL.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
LIBCURL_BRANCH = master
22
LIBCURL_SHA1 = 8310487053915d5c995513f569ad85ba65c3544f
3+
LIBCURL_GIT_URL := git://github.com/JuliaWeb/LibCURL.jl.git
4+
LIBCURL_TAR_URL = https://api.github.com/repos/JuliaWeb/LibCURL.jl/tarball/$1

stdlib/Makefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,6 @@ STDLIBS = Artifacts Base64 CRC32c Dates DelimitedFiles Distributed FileWatching
4545
$(JLL_NAMES)
4646

4747
STDLIBS_EXT = Pkg Statistics LibCURL Downloads ArgTools Tar NetworkOptions
48-
PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
49-
PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
50-
STATISTICS_GIT_URL := git://github.com/JuliaLang/Statistics.jl.git
51-
STATISTICS_TAR_URL = https://api.github.com/repos/JuliaLang/Statistics.jl/tarball/$1
52-
LIBCURL_GIT_URL := git://github.com/JuliaWeb/LibCURL.jl.git
53-
LIBCURL_TAR_URL = https://api.github.com/repos/JuliaWeb/LibCURL.jl/tarball/$1
54-
DOWNLOADS_GIT_URL := git://github.com/JuliaLang/Downloads.jl.git
55-
DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1
56-
ARGTOOLS_GIT_URL := git://github.com/JuliaIO/ArgTools.jl.git
57-
ARGTOOLS_TAR_URL = https://api.github.com/repos/JuliaIO/ArgTools.jl/tarball/$1
58-
TAR_GIT_URL := git://github.com/JuliaIO/Tar.jl.git
59-
TAR_TAR_URL = https://api.github.com/repos/JuliaIO/Tar.jl/tarball/$1
60-
NETWORKOPTIONS_GIT_URL := git://github.com/JuliaLang/NetworkOptions.jl.git
61-
NETWORKOPTIONS_TAR_URL = https://api.github.com/repos/JuliaLang/NetworkOptions.jl/tarball/$1
6248

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

stdlib/NetworkOptions.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
NETWORKOPTIONS_BRANCH = master
22
NETWORKOPTIONS_SHA1 = a251de1e1c8ce4edc351d0f05233ba7fe7d2c27a
3+
NETWORKOPTIONS_GIT_URL := git://github.com/JuliaLang/NetworkOptions.jl.git
4+
NETWORKOPTIONS_TAR_URL = https://api.github.com/repos/JuliaLang/NetworkOptions.jl/tarball/$1

stdlib/Pkg.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
PKG_BRANCH = release-1.6
22
PKG_SHA1 = 3d41ca188d72e1dc1862e780f31153d629d6a3dd
3+
PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
4+
PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1

stdlib/Statistics.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
STATISTICS_BRANCH = master
22
STATISTICS_SHA1 = 4b3ef9aaa79350510ca0be395458f66051c2f92d
3+
STATISTICS_GIT_URL := git://github.com/JuliaLang/Statistics.jl.git
4+
STATISTICS_TAR_URL = https://api.github.com/repos/JuliaLang/Statistics.jl/tarball/$1

stdlib/Tar.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
TAR_BRANCH = release-1.9
22
TAR_SHA1 = 2c86131a240bf06b9d4fa4bd813d66ea4bb1d7ae
3+
TAR_GIT_URL := git://github.com/JuliaIO/Tar.jl.git
4+
TAR_TAR_URL = https://api.github.com/repos/JuliaIO/Tar.jl/tarball/$1

0 commit comments

Comments
 (0)