Skip to content

Commit

Permalink
Remove windows specific juliarc.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
musm committed Jul 13, 2017
1 parent 9c1d1b8 commit 675f497
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 22 deletions.
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ $(build_man1dir)/julia.1: $(JULIAHOME)/doc/man/julia.1 | $(build_man1dir)
$(build_sysconfdir)/julia/juliarc.jl: $(JULIAHOME)/etc/juliarc.jl | $(build_sysconfdir)/julia
@echo Creating usr/etc/julia/juliarc.jl
@cp $< $@
ifeq ($(OS), WINNT)
@cat $(JULIAHOME)/contrib/windows/juliarc.jl >> $(build_sysconfdir)/julia/juliarc.jl
$(build_sysconfdir)/julia/juliarc.jl: $(JULIAHOME)/contrib/windows/juliarc.jl
endif

$(build_datarootdir)/julia/julia-config.jl : $(JULIAHOME)/contrib/julia-config.jl | $(build_datarootdir)/julia
$(INSTALL_M) $< $(dir $@)
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ Deprecated or removed
* The forms of `read`, `readstring`, and `eachline` that accepted both a `Cmd` object and an
input stream are deprecated. Use e.g. `read(pipeline(stdin, cmd))` instead ([#22762]).

* The default `juliarc.jl` file on Windows has been removed. Now must explicitly include the
fullpath if you need access to executables or libraries in the `JULIA_HOME` directory, e.g.
`joinpath(JULIA_HOME, "7z.exe")` for `7z.exe` ([#21540]).

Julia v0.6.0 Release Notes
==========================
Expand Down
1 change: 0 additions & 1 deletion contrib/add_license_to_files.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const excludedirs = [

const skipfiles = [
"../contrib/add_license_to_files.jl",
"../contrib/windows/juliarc.jl",
# files to check - already copyright
# see: https://github.com/JuliaLang/julia/pull/11073#issuecomment-98099389
"../base/special/trig.jl",
Expand Down
2 changes: 0 additions & 2 deletions contrib/windows/juliarc.jl

This file was deleted.

5 changes: 5 additions & 0 deletions examples/embedding/embedding-test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
# tests the output of the embedding example is correct
using Base.Test

if Sys.iswindows()
# libjulia needs to be in the same directory as the embedding executable or in path
ENV["PATH"] = string(JULIA_HOME, ";", ENV["PATH"])
end

@test length(ARGS) == 1
let
stdout = Pipe()
Expand Down
5 changes: 3 additions & 2 deletions test/cmdlineargs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

catcmd = `cat`
if Sys.iswindows()
busybox = joinpath(JULIA_HOME, "busybox.exe")
try # use busybox-w32 on windows
success(`busybox`)
catcmd = `busybox cat`
success(`$busybox`)
catcmd = `$busybox cat`
end
end

Expand Down
28 changes: 15 additions & 13 deletions test/spawn.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ shcmd = `sh`
sleepcmd = `sleep`
lscmd = `ls`
if Sys.iswindows()
busybox = joinpath(JULIA_HOME, "busybox.exe")
try # use busybox-w32 on windows
success(`busybox`)
yescmd = `busybox yes`
echocmd = `busybox echo`
sortcmd = `busybox sort`
printfcmd = `busybox printf`
truecmd = `busybox true`
falsecmd = `busybox false`
catcmd = `busybox cat`
shcmd = `busybox sh`
sleepcmd = `busybox sleep`
lscmd = `busybox ls`
success(`$busybox`)
yescmd = `$busybox yes`
echocmd = `$busybox echo`
sortcmd = `$busybox sort`
printfcmd = `$busybox printf`
truecmd = `$busybox true`
falsecmd = `$busybox false`
catcmd = `$busybox cat`
shcmd = `$busybox sh`
sleepcmd = `$busybox sleep`
lscmd = `$busybox ls`
end
end

Expand Down Expand Up @@ -343,8 +344,9 @@ let fname = tempname()
cmd = pipeline(`echo asdf`,`cat`)
if Sys.iswindows()
try
success(`busybox`)
cmd = pipeline(`busybox echo asdf`,`busybox cat`)
busybox = joinpath(JULIA_HOME, "busybox.exe")
success(`\$busybox`)
cmd = pipeline(`\$busybox echo asdf`,`\$busybox cat`)
end
end
for line in eachline(STDIN)
Expand Down

0 comments on commit 675f497

Please sign in to comment.