Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't load startup.jl when building docs #34795

Merged
merged 1 commit into from
Feb 20, 2020
Merged

Don't load startup.jl when building docs #34795

merged 1 commit into from
Feb 20, 2020

Conversation

mortenpi
Copy link
Contributor

@mortenpi mortenpi commented Feb 18, 2020 •
edited
Loading

Currently, when you run make docs, it will also load your startup.jl. doc/Makefile actually already sets --startup-file=no:

julia/doc/Makefile

Line 10 in e36fe95

JULIA_EXECUTABLE := $(call spawn,$(build_bindir)/julia) --startup-file=no

But this gets lost when we pass JULIA_EXECUTABLE in the main `Makefile. Hence this change.

Alternatively, we could also solve this in doc/Makefile by always explicitly setting --startup-file=no there, even if JULIA_EXECUTABLE is overridden. E.g.:

JULIA_EXECUTABLE := $(call spawn,$(build_bindir)/julia)
JULIA_COMMAND := $(JULIA_EXECUTABLE) --startup-file=no --color=yes

# ...

html: deps
	$(JULIA_COMMAND) $(call cygpath_w,$(SRCDIR)/make.jl) $(DOCUMENTER_OPTIONS)

# ...

Happy to update the PR if you think the alternative would be better.

vtjnash
vtjnash approved these changes Feb 20, 2020
View reviewed changes
Copy link
Sponsor Member

@vtjnash vtjnash left a comment

Choose a reason for hiding this comment

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

I think the alternative is a bit better, but this is good too.

@fredrikekre fredrikekre added the docsystem The documentation building system label Feb 20, 2020
@StefanKarpinski StefanKarpinski merged commit 8009429 into JuliaLang:master Feb 20, 2020
@mortenpi mortenpi deleted the patch-3 branch February 20, 2020 22:30
birm pushed a commit to birm/julia that referenced this pull request Feb 22, 2020
@mortenpi @birm
Don't use startup.jl when building docs (JuliaLang#34795)
3b54e80
KristofferC pushed a commit that referenced this pull request Apr 11, 2020
@mortenpi @KristofferC
Don't use startup.jl when building docs (#34795)
5c42404
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vtjnash vtjnash vtjnash approved these changes

Assignees
No one assigned
Labels
docsystem The documentation building system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mortenpi @vtjnash @StefanKarpinski @fredrikekre