Skip to content

Commit 675f497

Browse files
committed
Remove windows specific juliarc.jl
1 parent 9c1d1b8 commit 675f497

File tree

7 files changed

+26
-22
lines changed

7 files changed

+26
-22
lines changed

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,6 @@ $(build_man1dir)/julia.1: $(JULIAHOME)/doc/man/julia.1 | $(build_man1dir)
169169
$(build_sysconfdir)/julia/juliarc.jl: $(JULIAHOME)/etc/juliarc.jl | $(build_sysconfdir)/julia
170170
@echo Creating usr/etc/julia/juliarc.jl
171171
@cp $< $@
172-
ifeq ($(OS), WINNT)
173-
@cat $(JULIAHOME)/contrib/windows/juliarc.jl >> $(build_sysconfdir)/julia/juliarc.jl
174-
$(build_sysconfdir)/julia/juliarc.jl: $(JULIAHOME)/contrib/windows/juliarc.jl
175-
endif
176172

177173
$(build_datarootdir)/julia/julia-config.jl : $(JULIAHOME)/contrib/julia-config.jl | $(build_datarootdir)/julia
178174
$(INSTALL_M) $< $(dir $@)

NEWS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ Deprecated or removed
175175
* The forms of `read`, `readstring`, and `eachline` that accepted both a `Cmd` object and an
176176
input stream are deprecated. Use e.g. `read(pipeline(stdin, cmd))` instead ([#22762]).
177177

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

179182
Julia v0.6.0 Release Notes
180183
==========================

contrib/add_license_to_files.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const excludedirs = [
3030

3131
const skipfiles = [
3232
"../contrib/add_license_to_files.jl",
33-
"../contrib/windows/juliarc.jl",
3433
# files to check - already copyright
3534
# see: https://github.com/JuliaLang/julia/pull/11073#issuecomment-98099389
3635
"../base/special/trig.jl",

contrib/windows/juliarc.jl

Lines changed: 0 additions & 2 deletions
This file was deleted.

examples/embedding/embedding-test.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
# tests the output of the embedding example is correct
44
using Base.Test
55

6+
if Sys.iswindows()
7+
# libjulia needs to be in the same directory as the embedding executable or in path
8+
ENV["PATH"] = string(JULIA_HOME, ";", ENV["PATH"])
9+
end
10+
611
@test length(ARGS) == 1
712
let
813
stdout = Pipe()

test/cmdlineargs.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
catcmd = `cat`
44
if Sys.iswindows()
5+
busybox = joinpath(JULIA_HOME, "busybox.exe")
56
try # use busybox-w32 on windows
6-
success(`busybox`)
7-
catcmd = `busybox cat`
7+
success(`$busybox`)
8+
catcmd = `$busybox cat`
89
end
910
end
1011

test/spawn.jl

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@ shcmd = `sh`
1717
sleepcmd = `sleep`
1818
lscmd = `ls`
1919
if Sys.iswindows()
20+
busybox = joinpath(JULIA_HOME, "busybox.exe")
2021
try # use busybox-w32 on windows
21-
success(`busybox`)
22-
yescmd = `busybox yes`
23-
echocmd = `busybox echo`
24-
sortcmd = `busybox sort`
25-
printfcmd = `busybox printf`
26-
truecmd = `busybox true`
27-
falsecmd = `busybox false`
28-
catcmd = `busybox cat`
29-
shcmd = `busybox sh`
30-
sleepcmd = `busybox sleep`
31-
lscmd = `busybox ls`
22+
success(`$busybox`)
23+
yescmd = `$busybox yes`
24+
echocmd = `$busybox echo`
25+
sortcmd = `$busybox sort`
26+
printfcmd = `$busybox printf`
27+
truecmd = `$busybox true`
28+
falsecmd = `$busybox false`
29+
catcmd = `$busybox cat`
30+
shcmd = `$busybox sh`
31+
sleepcmd = `$busybox sleep`
32+
lscmd = `$busybox ls`
3233
end
3334
end
3435

@@ -343,8 +344,9 @@ let fname = tempname()
343344
cmd = pipeline(`echo asdf`,`cat`)
344345
if Sys.iswindows()
345346
try
346-
success(`busybox`)
347-
cmd = pipeline(`busybox echo asdf`,`busybox cat`)
347+
busybox = joinpath(JULIA_HOME, "busybox.exe")
348+
success(`\$busybox`)
349+
cmd = pipeline(`\$busybox echo asdf`,`\$busybox cat`)
348350
end
349351
end
350352
for line in eachline(STDIN)

0 commit comments

Comments
 (0)