Skip to content

Commit

Permalink
Run doc/genstdlib.jl after bootstrap, take 2
Browse files Browse the repository at this point in the history 
this time with a JULIA_ENABLE_DOCBUILD flag to allow disabling this step on the buildbots
where #11727 causes trouble on windows

ref #13069
  • Loading branch information
@tkelman
tkelman committed Sep 22, 2015
1 parent 184c56b commit f778615
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,13 @@ julia-sysimg-release : julia-inference julia-ui-release
julia-sysimg-debug : julia-inference julia-ui-debug
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/sys-debug.$(SHLIB_EXT) JULIA_BUILD_MODE=debug

julia-debug julia-release : julia-% : julia-ui-% julia-sysimg-% julia-symlink julia-libccalltest
JULIA_ENABLE_DOCBUILD ?= 1
julia-genstdlib : julia-sysimg-$(JULIA_BUILD_MODE)
ifeq ($(JULIA_ENABLE_DOCBUILD), 1)
@$(call PRINT_JULIA, $(JULIA_EXECUTABLE) doc/genstdlib.jl)
endif

julia-debug julia-release : julia-% : julia-ui-% julia-sysimg-% julia-symlink julia-libccalltest julia-genstdlib

debug release : % : julia-%

Expand Down

8 comments on commit f778615

@StefanKarpinski
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to the effect that if any docs change we often end up rebuilding the Julia sysimage, which is unfortunate.

@tkelman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that the fault of this change? The sysimg should depend on helpdb whether or not you run gensdtlib, running it just ensures changes get written into the RST more immediately.

@StefanKarpinski
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. Haven't quite tracked down why it's happening.

@tkelman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm seeing sort of the reverse problem where genstdlib runs even if I just do make test or something without touching either the docs or anything in base, so the makefile rules here could use adjustment.

@JeffBezanson
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also seeing it rebuild this apparently unconditionally. Very annoying.

@tkelman
Copy link
Contributor Author

@tkelman tkelman commented on f778615 Oct 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this should probably depend on the timestamps of everything in base

@StefanKarpinski
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that this is a phony target, which means it gets rebuilt no matter what.

@StefanKarpinski
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just too annoying and our sea of phony makefile targets is impossible to work with, so I reverted.

Please sign in to comment.