Skip to content

Commit 3751fb9

Browse files
fredrikekreKristofferC
authored andcommitted
Include stdlib tarballs in light-source-dist. (#30000)
(cherry picked from commit 06fed56)
1 parent 8a8652d commit 3751fb9

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,11 +519,16 @@ endif
519519

520520
# Create file light-source-dist.tmp to hold all the filenames that go into the tarball
521521
echo "base/version_git.jl" > light-source-dist.tmp
522+
523+
# Download all stdlibs and include the tarball filenames in light-source-dist.tmp
524+
@$(MAKE) -C stdlib getall
525+
-ls stdlib/srccache/*.tar.gz >> light-source-dist.tmp
526+
522527
# Exclude git, github and CI config files
523528
git ls-files | sed -E -e '/^\..+/d' -e '/\/\..+/d' -e '/appveyor.yml/d' >> light-source-dist.tmp
524529
find doc/_build/html >> light-source-dist.tmp
525530

526-
# Make tarball with only Julia code
531+
# Make tarball with only Julia code + stdlib tarballs
527532
light-source-dist: light-source-dist.tmp
528533
# Prefix everything with the current directory name (usually "julia"), then create tarball
529534
DIRNAME=$$(basename $$(pwd)); \
@@ -537,11 +542,10 @@ source-dist:
537542
full-source-dist: light-source-dist.tmp
538543
# Get all the dependencies downloaded
539544
@$(MAKE) -C deps getall NO_GIT=1
540-
@$(MAKE) -C stdlib getall
541545

542546
# Create file full-source-dist.tmp to hold all the filenames that go into the tarball
543547
cp light-source-dist.tmp full-source-dist.tmp
544-
-ls deps/srccache/*.tar.gz deps/srccache/*.tar.bz2 deps/srccache/*.tar.xz deps/srccache/*.tgz deps/srccache/*.zip deps/srccache/*.pem stdlib/srccache/*.tar.gz >> full-source-dist.tmp
548+
-ls deps/srccache/*.tar.gz deps/srccache/*.tar.bz2 deps/srccache/*.tar.xz deps/srccache/*.tgz deps/srccache/*.zip deps/srccache/*.pem >> full-source-dist.tmp
545549

546550
# Prefix everything with the current directory name (usually "julia"), then create tarball
547551
DIRNAME=$$(basename $$(pwd)); \

0 commit comments

Comments
 (0)