Skip to content

Commit d384c3b

Browse files
committed
go back to libdash.install approach
1 parent 448724b commit d384c3b

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

libdash.opam

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff 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
]
3335
install: [
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
]
3739
dev-repo: "git+https:///github.com/mgree/libdash"
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
set -ex
3+
set -e
44

55
libdash_files=$(ls _build/lib)
66
bindings_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

88
files=
99
for f in ${libdash_files}
1010
do
11-
files="${files} _build/lib/${f}"
11+
files="${files} \"_build/lib/${f}\""
1212
done
1313

1414
for f in ${bindings_files}
1515
do
16-
files="${files} ocaml/${f}"
16+
files="${files} \"ocaml/${f}\""
1717
done
1818

19-
ocamlfind install libdash -nodll $files
19+
cat >libdash.install <<EOF
20+
lib: [${files} ]
21+
EOF
22+

0 commit comments

Comments
 (0)