Skip to content

Commit

Permalink
Merge pull request #26 from djs55/uninstall
Browse files Browse the repository at this point in the history
Fix uninstall
  • Loading branch information
djs55 committed Mar 20, 2015
2 parents fbb23ce + 2616ecc commit 26da928
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
@@ -0,0 +1,5 @@
language: c
install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
env:
- OCAML_VERSION=4.02 PACKAGE=xapi-storage
5 changes: 5 additions & 0 deletions Makefile
Expand Up @@ -18,6 +18,11 @@ install:
make -C ocaml install
make -C python install

.PHONY: uninstall
uninstall:
make -C ocaml uninstall
make -C python uninstall

.PHONY: reinstall
reinstall:
make -C ocaml reinstall
Expand Down
4 changes: 4 additions & 0 deletions ocaml/Makefile
Expand Up @@ -19,6 +19,10 @@ doc: setup.data setup.bin
install: setup.bin
./setup.bin -install

.PHONY: uninstall
uninstall:
ocamlfind remove $(NAME) || true

test: setup.bin build
./setup.bin -test

Expand Down
15 changes: 15 additions & 0 deletions opam
@@ -0,0 +1,15 @@
opam-version: "1"
maintainer: "dave.scott@citrix.com"
build: [
[make]
[make "install" "PREFIX=%{prefix}%"]
]
remove: ["make" "uninstall"]
depends: [
"cow"
"rpc"
"caml2html"
"xmlm"
"cmdliner"
"ocamlfind"
]
4 changes: 4 additions & 0 deletions python/Makefile
Expand Up @@ -12,3 +12,7 @@ clean:
.PHONY: install
install: build
python setup.py install --prefix $(PREFIX)

.PHONY: uninstall
uninstall:
echo "I don't know how to uninstall python code"

0 comments on commit 26da928

Please sign in to comment.