Skip to content

Commit

Permalink
Rename: jl/ => base/ [closes JuliaLang#591].
Browse files Browse the repository at this point in the history
There are shockingly few places where this directory is hardcoded.
I feel like I must have missed something, but doing make cleanall
and then make testall works.
  • Loading branch information
StefanKarpinski committed Mar 20, 2012
1 parent 5285d68 commit d76a658
Show file tree
Hide file tree
Showing 71 changed files with 7 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ debug release:
julia-debug julia-release:
@$(MAKE) -sC external
@$(MAKE) $(jPARALLEL_BUILD_JOBS) -sC src lib$@
@$(MAKE) $(jPARALLEL_BUILD_JOBS) -sC base
@$(MAKE) $(jPARALLEL_BUILD_JOBS) -sC ui $@
@$(MAKE) $(jPARALLEL_BUILD_JOBS) -sC jl
@ln -f $@-$(DEFAULT_REPL) julia

sys0.ji: src/boot.jl src/dump.c jl/stage0.jl
$(QUIET_JULIA) ./julia -b jl/stage0.jl
sys0.ji: src/boot.jl src/dump.c base/stage0.jl
$(QUIET_JULIA) ./julia -b base/stage0.jl
@rm -f sys.ji

# if sys.ji exists, use it to rebuild, otherwise use sys0.ji
sys.ji: VERSION sys0.ji jl/*.jl
$(QUIET_JULIA) ./julia `test -f sys.ji && echo jl/stage1.jl || echo -J sys0.ji jl/stage1.jl`
sys.ji: VERSION sys0.ji base/*.jl
$(QUIET_JULIA) ./julia `test -f sys.ji && echo base/stage1.jl || echo -J sys0.ji base/stage1.jl`

install: release
install -d $(DESTDIR)$(PREFIX)/share/julia/lib
Expand All @@ -32,7 +32,7 @@ install: release
install -v julia-release-basic $(DESTDIR)$(PREFIX)/share/julia
install -v julia-release-webserver $(DESTDIR)$(PREFIX)/share/julia
install -v sys.ji $(DESTDIR)$(PREFIX)/share/julia
install -v jl/* $(DESTDIR)$(PREFIX)/share/julia/jl
install -v base/* $(DESTDIR)$(PREFIX)/share/julia/jl
install -v extras/* $(DESTDIR)$(PREFIX)/share/julia/extras
install -v examples/*.jl $(DESTDIR)$(PREFIX)/share/julia/examples
-install -v lib/*.$(SHLIB_EXT) $(DESTDIR)$(PREFIX)/share/julia/lib
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions examples/bigfib.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

load ("jl/bigint.jl") #Assume running from julia base dir
load ("base/bigint.jl") #Assume running from julia base dir

#Large Fibonacci to exercise BigInt
#from Bill Hart, https://groups.google.com/group/julia-dev/browse_frm/thread/798e2d1322daf633?hl=en
Expand Down

0 comments on commit d76a658

Please sign in to comment.