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.

Sign up for GitHub

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

Remove files before installing them. #2885

Merged
merged 3 commits into from
Nov 14, 2019
Merged

Remove files before installing them. #2885

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b08b4f
Remove files before installing them.
bschommer Nov 13, 2019
d6f41c4
Updated tests.
bschommer Nov 13, 2019
a0418df
Updated change entry.
bschommer Nov 14, 2019
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 bin/install_uninstall.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ let install_uninstall ~what =
in
let dir = Path.parent_exn dst in
if what = "install" then (
Ops.remove_if_exists dst;
Printf.eprintf "Installing %s\n%!"
(Path.to_string_maybe_quoted dst);
Ops.mkdir_p dir;
Expand Down
11 changes: 11 additions & 0 deletions test/blackbox-tests/test-cases/install-dry-run/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,37 @@
Installing OPAM_PREFIX/lib/mylib/mylib.cmxs
Installing OPAM_PREFIX/lib/mylib/mylib.ml
Installing OPAM_PREFIX/lib/mylib/opam
Removing (if it exists) OPAM_PREFIX/lib/mylib/META
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/META to OPAM_PREFIX/lib/mylib/META (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/dune-package
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/dune-package to OPAM_PREFIX/lib/mylib/dune-package (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib$ext_lib
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib$ext_lib to OPAM_PREFIX/lib/mylib/mylib$ext_lib (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cma
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib.cma to OPAM_PREFIX/lib/mylib/mylib.cma (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmi
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib.cmi to OPAM_PREFIX/lib/mylib/mylib.cmi (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmt
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib.cmt to OPAM_PREFIX/lib/mylib/mylib.cmt (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmx
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib.cmx to OPAM_PREFIX/lib/mylib/mylib.cmx (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxa
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib.cmxa to OPAM_PREFIX/lib/mylib/mylib.cmxa (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.cmxs
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib.cmxs to OPAM_PREFIX/lib/mylib/mylib.cmxs (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/mylib.ml
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/mylib.ml to OPAM_PREFIX/lib/mylib/mylib.ml (executable: false)
Removing (if it exists) OPAM_PREFIX/lib/mylib/opam
Creating directory OPAM_PREFIX/lib/mylib
Copying _build/install/default/lib/mylib/opam to OPAM_PREFIX/lib/mylib/opam (executable: false)

Expand Down
Loading