File tree Expand file tree Collapse file tree 2 files changed +11
-6
lines changed Expand file tree Collapse file tree 2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ depends: [
1212 "ocamlfind" {>= "1.8.0"}
1313 "ctypes" {>= "0.11.5"}
1414 "ctypes-foreign" {>= "0.4.0"}
15+ "opam-installer" {>= "2.0.0"}
1516 "conf-autoconf" {build}
1617# "conf-libtool" {build}
1718]
@@ -27,11 +28,12 @@ build: [
2728 [make]
2829 [make "install"] # into _build
2930 [make "-C" "ocaml" "all"]
31+ ["./mk_dot_install.sh"]
3032 ["./ldconfig.sh"] # fix up .so files if ldconfig didn't do it
3133 [make "-C" "ocaml" "test"] {with-test}
3234]
3335install: [
34- ["./libdash_install.sh"] # autotools borks if we call it install.sh, lol
36+ ["opam-installer" "--prefix=%{prefix}%" "libdash.install"]
3537 [make "-C" "test" "test"] {with-test}
3638]
3739dev-repo: "git+https:///github.com/mgree/libdash"
Original file line number Diff line number Diff line change 1- #! /bin/bash
1+ #! /bin/sh
22
3- set -ex
3+ set -e
44
55libdash_files=$( ls _build/lib)
66bindings_files=" META dash.cmxa dash.cma dash.a dash.mli dash.cmi dash.cmo dash.cmx ast.mli ast.cmi ast.cmo ast.cmx"
77
88files=
99for f in ${libdash_files}
1010do
11- files=" ${files} _build/lib/${f} "
11+ files=" ${files} \" _build/lib/${f} \" "
1212done
1313
1414for f in ${bindings_files}
1515do
16- files=" ${files} ocaml/${f} "
16+ files=" ${files} \" ocaml/${f} \" "
1717done
1818
19- ocamlfind install libdash -nodll $files
19+ cat > libdash.install << EOF
20+ lib: [${files} ]
21+ EOF
22+
You can’t perform that action at this time.
0 commit comments