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.

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

MacOS app: make julia directory read only #38235

Merged
merged 5 commits into from
Nov 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contrib/mac/app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ dmg/$(APP_NAME): startup.applescript julia.icns
-mkdir -p $@/Contents/Resources/julia
make -C $(JULIAHOME) binary-dist
tar zxf $(JULIAHOME)/$(JULIA_BINARYDIST_FILENAME).tar.gz -C $@/Contents/Resources/julia --strip-components 1
chmod -R -w $@/Contents/Resources/julia
if [ -n "$$MACOS_CODESIGN_IDENTITY" ]; then \
echo "Codesigning with identity $$MACOS_CODESIGN_IDENTITY"; \
MACHO_FILES=$$(find "$@" -type f -perm -755 | cut -d: -f1); \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
60d7c2d916e4fb6bf50f73355f0a0b02
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7bb8521129fdfda64d8b54d15de8da7ab1e465f33593fdb36977fa97e2f2a774ee466d3775f1502b9ce9ba4292a698e8ceb67fad7e5f691b840b88a96eed9e68

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion stdlib/LibCURL.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LIBCURL_BRANCH = master
LIBCURL_SHA1 = 685a4697178415726f1f73d5ccedbc4ed1b5c2ac
LIBCURL_SHA1 = 547e9177cf85ba06f7bfe7eea271be3ba0b5c615
3 changes: 2 additions & 1 deletion test/cmdlineargs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ let exename = `$(Base.julia_cmd()) --startup-file=no`
@test readchomp(`$exename -E "Base.JLOptions().malloc_log != 0" --track-allocation=user`) == "true"
mktempdir() do dir
helperdir = joinpath(@__DIR__, "testhelpers")
inputfile = joinpath(helperdir, "allocation_file.jl")
inputfile = joinpath(dir, "allocation_file.jl")
cp(joinpath(helperdir,"allocation_file.jl"), inputfile)
pid = readchomp(`$exename -E "getpid()" -L $inputfile --track-allocation=user`)
memfile = "$inputfile.$pid.mem"
got = readlines(memfile)
Expand Down
2 changes: 1 addition & 1 deletion test/file.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ else
end
using Downloads: download
@test_throws ArgumentError download("good", "ba\0d")
@test_throws ArgumentError download("ba\0d", "good")
@test_throws ArgumentError download("ba\0d", tempname())

###################
# walkdir #
Expand Down
2 changes: 1 addition & 1 deletion test/loading.jl
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ saved_depot_path = copy(DEPOT_PATH)
saved_active_project = Base.ACTIVE_PROJECT[]

push!(empty!(LOAD_PATH), "project")
push!(empty!(DEPOT_PATH), "depot")
append!(empty!(DEPOT_PATH), [mktempdir(), "depot"])
Base.ACTIVE_PROJECT[] = nothing

@test load_path() == [abspath("project","Project.toml")]
Expand Down