This commit is mostly dedicated to build pains

fxfactorial · May 28, 2015 · b429ac8 · b429ac8
1 parent 5a6ccd2
commit b429ac8
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 17 deletions.
diff --git a/META b/META
@@ -2,5 +2,5 @@ name = "ocaml-libgit2"
 version = "0.01"
 description = "Convenient OCaml C bindings to libgit2, along with helper functions"
 requires ="ctypes,ctypes.foreign,uri"
-# archive(byte) = "git.cmo"
-archive(native) ="git.cmx"
+archive(byte) = "git.cmo"
+archive(native) ="git.cmx"
diff --git a/Makefile b/Makefile
@@ -1,19 +1,33 @@
+ROOT := $(shell pwd)
 PACKAGES := ctypes.foreign,uri
 CCLIB := libgit2.0.22.0.dylib
 SRC := git.ml
 
-.PHONY:clean git_test build_libgit
+.PHONY: clean
 
-git_test:
-	ocamlfind ocamlopt -package $(PACKAGES) -cclib $(CCLIB) \
-	-linkpkg $(SRC) -o $@
-	./$@
+native:libgit set_meta
+	ocamlfind ocamlopt -package $(PACKAGES) \
+	-cclib `ocamlfind query ocaml-libgit2`/$(CCLIB) -linkpkg $(SRC) -o Git_test
 
-build_libgit:
+libgit:
 	@echo "Updating libgit2 itself"
 	git submodule update --remote
-	mkdir libgit2/build
-	cmake libgit2
-	cmake --build libgit2/build/
+	ocamlfind install ocaml-libgit2 META
+# The trick is the ; since cd is done in a separate shell
+	cd `ocamlfind query ocaml-libgit2`; \
+	cmake $(ROOT)/libgit2 -DBUILD_CLAR=OFF; \
+	cmake --build .; \
+	find . -not -name "*.dylib" -not -name "META" -delete
+
+set_meta:
+#Need something better
+	echo "linkopts = \"-cclib" `ocamlfind query ocaml-libgit2`/$(CCLIB)"\"" >> \
+	`ocamlfind query ocaml-libgit2`/META
+
+install:
+	ocamlfind install ocaml-libgit2 -add git.cmo git.cmi git.cmt git.o git.cmx
+
+uninstall:
+	ocamlfind remove ocaml-libgit2
 clean:
-	rm -rf *.cmi *.cmt *.cmx *.cmo *.o git_test libgit_gen_*
+	rm -rf *.cmi *.cmt *.cmx *.cmo *.o git_test libgit_gen_* a.out
diff --git a/README.md b/README.md
@@ -2,16 +2,21 @@
 
 This package provides bindings to [libgit2](https://libgit2.github.com). The modules are organized
 all under the `Git` module where the submodules correspond to all the
-headers in the [include](https://github.com/libgit2/libgit2/tree/master/include/git2) directory of libgit2.
+headers in the [include](https://github.com/libgit2/libgit2/tree/master/include/git2) of libgit2. 
 
 # Helpers
 
 The root `Git` module also contains helper functions for common
 tasks. These let you deal with OCaml values rather than dealing with
-the `Ctypes` library. 
+the `Ctypes` library.
+
+# Installation
+
+Since I work on OS X primarily, my first goal is to have this working
+transparently and cleanly on that platform first.
 
 # Documentation
 
 I'm trying to expose as much of the API as I can and the naming is 1-1
-between the OCaml side and C. 
-If lost, the best documentation is libgit2's [docs](https://libgit2.github.com/libgit2/#HEAD)
+between the OCaml side and C. If lost then look at libgit2's own
+[docs](https://libgit2.github.com/libgit2/#HEAD).
diff --git a/git.ml b/git.ml
@@ -1,6 +1,7 @@
 open Ctypes
 open Foreign
 
+
 module Common = struct
 
     let git_feature_t = typedef int64_t "git_feature_t"

diff --git a/libgit2 b/libgit2
diff --git a/libgit2.0.22.0.dylib b/libgit2.0.22.0.dylib
+29 −3		CHANGELOG.md
+1 −1		examples/network/fetch.c
+1 −1		examples/network/ls-remote.c
+12 −10		include/git2/diff.h
+11 −1		include/git2/index.h
+6 −32		include/git2/remote.h
+1 −0		include/git2/status.h
+6 −3		src/branch.c
+200 −74		src/diff.c
+36 −3		src/index.c
+11 −7		src/iterator.c
+2 −0		src/iterator.h
+2 −2		src/merge.c
+6 −0		src/refspec.c
+49 −33		src/remote.c
+1 −0		src/reset.c
+6 −0		src/status.c
+1 −1		tests/checkout/conflict.c
+3 −3		tests/checkout/index.c
+3 −3		tests/checkout/tree.c
+8 −0		tests/clar_libgit2.c
+1 −0		tests/clar_libgit2.h
+1 −1		tests/diff/diff_helpers.c
+1 −1		tests/diff/diff_helpers.h
+76 −0		tests/diff/index.c
+45 −0		tests/diff/workdir.c
+104 −49		tests/index/addall.c
+5 −5		tests/index/collision.c
+66 −9		tests/index/conflicts.c
+1 −1		tests/merge/trees/trivial.c
+1 −1		tests/merge/workdir/trivial.c
+10 −0		tests/network/refspecs.c
+5 −5		tests/network/remote/local.c
+3 −11		tests/network/remote/remotes.c
+3 −3		tests/object/tree/duplicateentries.c
+13 −10		tests/online/remotes.c
+32 −0		tests/refs/branches/upstream.c
+1 −1		tests/reset/hard.c
+54 −2		tests/status/worktree.c