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: [
12
12
"ocamlfind" {>= "1.8.0"}
13
13
"ctypes" {>= "0.11.5"}
14
14
"ctypes-foreign" {>= "0.4.0"}
15
+ "opam-installer" {>= "2.0.0"}
15
16
"conf-autoconf" {build}
16
17
# "conf-libtool" {build}
17
18
]
@@ -27,11 +28,12 @@ build: [
27
28
[make]
28
29
[make "install"] # into _build
29
30
[make "-C" "ocaml" "all"]
31
+ ["./mk_dot_install.sh"]
30
32
["./ldconfig.sh"] # fix up .so files if ldconfig didn't do it
31
33
[make "-C" "ocaml" "test"] {with-test}
32
34
]
33
35
install: [
34
- ["./libdash_install.sh"] # autotools borks if we call it install.sh, lol
36
+ ["opam-installer" "--prefix=%{prefix}%" "libdash.install"]
35
37
[make "-C" "test" "test"] {with-test}
36
38
]
37
39
dev-repo: "git+https:///github.com/mgree/libdash"
Original file line number Diff line number Diff line change 1
- #! /bin/bash
1
+ #! /bin/sh
2
2
3
- set -ex
3
+ set -e
4
4
5
5
libdash_files=$( ls _build/lib)
6
6
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"
7
7
8
8
files=
9
9
for f in ${libdash_files}
10
10
do
11
- files=" ${files} _build/lib/${f} "
11
+ files=" ${files} \" _build/lib/${f} \" "
12
12
done
13
13
14
14
for f in ${bindings_files}
15
15
do
16
- files=" ${files} ocaml/${f} "
16
+ files=" ${files} \" ocaml/${f} \" "
17
17
done
18
18
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