Remove windows specific juliarc.jl (#21540)

Author: musm

Makefile

@@ -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 $@)

NEWS.md

@@ -249,6 +249,9 @@ Deprecated or removed
   * Calling `write` on non-isbits arrays is deprecated in favor of explicit loops or
     `serialize` ([#6466]).
 
+  * The default `juliarc.jl` file on Windows has been removed. Now must explicitly include the
+    full path 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
 ==========================

contrib/add_license_to_files.jl

@@ -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",

contrib/windows/juliarc.jl

@@ -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
 @testset "embedding example" begin
     stdout = Pipe()

examples/embedding/embedding-test.jl

@@ -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
 

test/cmdlineargs.jl

@@ -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
 
@@ -353,8 +354,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)