Skip to content

Commit 4ff74e8

Browse files
committed
do not create a separate app environment for devved apps (#4465)
1 parent 92a5e82 commit 4ff74e8

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/Apps/Apps.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,10 @@ function develop(pkg::PackageSpec)
254254
manifest = ctx.env.manifest
255255
manifest.deps[pkg.uuid] = entry
256256

257-
_resolve(manifest, pkg.name)
258-
precompile(pkg.name)
257+
# For dev, we don't create an app environment - just point shims directly to the dev'd project
258+
write_manifest(manifest, app_manifest_file())
259+
generate_shims_for_apps(pkg.name, project.apps, sourcepath, joinpath(Sys.BINDIR, "julia"))
260+
259261
@info "For package: $(pkg.name) installed apps: $(join(keys(project.apps), ","))"
260262
check_apps_in_path(project.apps)
261263
end

test/apps.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ using Test
9797
# https://github.com/JuliaLang/Pkg.jl/issues/4258
9898
Pkg.Apps.add(path = path)
9999
Pkg.Apps.develop(path = path)
100+
101+
# Verify that dev does not create an app environment directory
102+
app_env_dir = joinpath(first(DEPOT_PATH), "environments", "apps", "Rot13")
103+
@test !isdir(app_env_dir)
104+
105+
# Verify that changes to the dev'd package are immediately reflected
100106
mv(joinpath(path, "src", "Rot13_edited.jl"), joinpath(path, "src", "Rot13.jl"); force = true)
101107
withenv("PATH" => string(joinpath(first(DEPOT_PATH), "bin"), sep, current_path)) do
102108
@test read(`$exename test`, String) == "Updated!\n"

0 commit comments

Comments
 (0)