From bd019a4037f59c0ab1db8a08c0d4a4aa23f52ad5 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Mon, 6 Nov 2017 19:26:37 +0100 Subject: [PATCH 1/2] Exclude version_git.jl from list of dependencies for HTML docs This file is modified by the light-source-dist target when preparing tarballs. Depending on it means that the docs will be rebuilt when calling 'make install' from the tarballs. This requires downloading files, which is problematic for replicable builds and may not be possible on build servers. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 15f3728c375a2..8e4b3dedcf4f3 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ julia_flisp.boot.inc.phony: julia-deps @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/src julia_flisp.boot.inc.phony # Build the HTML docs (skipped if already exists, notably in tarballs) -$(BUILDROOT)/doc/_build/html/en/index.html: $(shell find $(BUILDROOT)/base $(BUILDROOT)/doc \( -path $(BUILDROOT)/doc/_build -o -path $(BUILDROOT)/doc/deps -o -name *_constants.jl -o -name *_h.jl \) -prune -o -type f -print) +$(BUILDROOT)/doc/_build/html/en/index.html: $(shell find $(BUILDROOT)/base $(BUILDROOT)/doc \( -path $(BUILDROOT)/doc/_build -o -path $(BUILDROOT)/doc/deps -o -name *_constants.jl -o -name *_h.jl -o -name version_git.jl \) -prune -o -type f -print) @$(MAKE) docs # doc needs to live under $(build_docdir), not under $(build_datarootdir)/julia/ From 8cb370152f57b0c2578dffdde48da3925e08551a Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Mon, 6 Nov 2017 19:33:59 +0100 Subject: [PATCH 2/2] Add instruction to release-candidate target about testing builds without Internet It is generally a good idea to test that final tarballs build and pass the tests. Disabling Internet access allows ensuring that builds are reproducible, and is necessary for some build servers. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8e4b3dedcf4f3..8b0985511190d 100644 --- a/Makefile +++ b/Makefile @@ -146,11 +146,12 @@ release-candidate: release testall @echo 5. Create tag, push to github "\(git tag v\`cat VERSION\` && git push --tags\)" #"` # These comments deal with incompetent syntax highlighting rules @echo 6. Clean out old .tar.gz files living in deps/, "\`git clean -fdx\`" seems to work #"` @echo 7. Replace github release tarball with tarballs created from make light-source-dist and make full-source-dist - @echo 8. Follow packaging instructions in DISTRIBUTING.md to create binary packages for all platforms - @echo 9. Upload to AWS, update https://julialang.org/downloads and http://status.julialang.org/stable links - @echo 10. Update checksums on AWS for tarball and packaged binaries - @echo 11. Announce on mailing lists - @echo 12. Change master to release-0.X in base/version.jl and base/version_git.sh as in 4cb1e20 + @echo 8. Check that 'make && make install && make test' succeed with unpacked tarballs even without Internet access. + @echo 9. Follow packaging instructions in DISTRIBUTING.md to create binary packages for all platforms + @echo 10. Upload to AWS, update https://julialang.org/downloads and http://status.julialang.org/stable links + @echo 11. Update checksums on AWS for tarball and packaged binaries + @echo 12. Announce on mailing lists + @echo 13. Change master to release-0.X in base/version.jl and base/version_git.sh as in 4cb1e20 @echo $(build_man1dir)/julia.1: $(JULIAHOME)/doc/man/julia.1 | $(build_man1dir)