Set the obj_dir for executables
This commit is contained in:
parent
0f0c0c2997
commit
b17b476048
|
@ -728,7 +728,9 @@ Add it to your jbuild file to remove this warning.
|
||||||
let executables_rules (exes : Executables.t) ~dir ~all_modules
|
let executables_rules (exes : Executables.t) ~dir ~all_modules
|
||||||
~(scope : Lib_db.Scope.t With_required_by.t) =
|
~(scope : Lib_db.Scope.t With_required_by.t) =
|
||||||
let item = List.hd exes.names in
|
let item = List.hd exes.names in
|
||||||
let obj_dir = dir in
|
(* Use "eobjs" rather than "objs" to avoid a potential conflict with a library of the
|
||||||
|
same name *)
|
||||||
|
let obj_dir = Path.relative dir ("." ^ item ^ ".eobjs") in
|
||||||
let dep_kind = Build.Required in
|
let dep_kind = Build.Required in
|
||||||
let flags = Ocaml_flags.make exes.buildable sctx ~scope:scope.data ~dir in
|
let flags = Ocaml_flags.make exes.buildable sctx ~scope:scope.data ~dir in
|
||||||
let modules =
|
let modules =
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
ocamldep q/q.mli.d
|
ocamldep q/q.mli.d
|
||||||
ocamlmklib q/dllq_stubs.so,q/libq_stubs.a
|
ocamlmklib q/dllq_stubs.so,q/libq_stubs.a
|
||||||
ocamlc q/.q.objs/q.{cmi,cmti}
|
ocamlc q/.q.objs/q.{cmi,cmti}
|
||||||
ocamlc qnativerun/run.{cmi,cmo,cmt}
|
ocamlc qnativerun/.run.eobjs/run.{cmi,cmo,cmt}
|
||||||
ocamlopt q/.q.objs/q.{cmx,o}
|
ocamlopt q/.q.objs/q.{cmx,o}
|
||||||
ocamlopt qnativerun/run.{cmx,o}
|
ocamlopt qnativerun/.run.eobjs/run.{cmx,o}
|
||||||
ocamlopt q/q.{a,cmxa}
|
ocamlopt q/q.{a,cmxa}
|
||||||
ocamlopt qnativerun/run.exe
|
ocamlopt qnativerun/run.exe
|
||||||
42
|
42
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
ocamlc bar.o
|
ocamlc bar.o
|
||||||
ocamlc .foo.objs/dummy.{cmi,cmo,cmt}
|
ocamlc .foo.objs/dummy.{cmi,cmo,cmt}
|
||||||
ocamlmklib dllfoo_stubs.so,libfoo_stubs.a
|
ocamlmklib dllfoo_stubs.so,libfoo_stubs.a
|
||||||
ocamlc lexer1.{cmi,cmo,cmt}
|
ocamlc .test.eobjs/lexer1.{cmi,cmo,cmt}
|
||||||
ocamlopt .foo.objs/dummy.{cmx,o}
|
ocamlopt .foo.objs/dummy.{cmx,o}
|
||||||
ocamlc test.{cmi,cmo,cmt}
|
ocamlc .test.eobjs/test.{cmi,cmo,cmt}
|
||||||
ocamlopt lexer1.{cmx,o}
|
ocamlopt .test.eobjs/lexer1.{cmx,o}
|
||||||
ocamlopt foo.{a,cmxa}
|
ocamlopt foo.{a,cmxa}
|
||||||
ocamlopt test.{cmx,o}
|
ocamlopt .test.eobjs/test.{cmx,o}
|
||||||
ocamlopt test.exe
|
ocamlopt test.exe
|
||||||
$ $JBUILDER build -j1 @bar-source --display short --root .
|
$ $JBUILDER build -j1 @bar-source --display short --root .
|
||||||
#line 1 "include/bar.h"
|
#line 1 "include/bar.h"
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
ocamlc lib/.p.objs/p.{cmi,cmo,cmt} [default.foo]
|
ocamlc lib/.p.objs/p.{cmi,cmo,cmt} [default.foo]
|
||||||
ocamldep lib/p.ml.d
|
ocamldep lib/p.ml.d
|
||||||
ocamlopt lib/.p.objs/p.{cmx,o} [default.foo]
|
ocamlopt lib/.p.objs/p.{cmx,o} [default.foo]
|
||||||
ocamlc bin/blah.{cmi,cmo,cmt} [default.foo]
|
ocamlc bin/.blah.eobjs/blah.{cmi,cmo,cmt} [default.foo]
|
||||||
ocamlc lib/p.cma [default.foo]
|
ocamlc lib/p.cma [default.foo]
|
||||||
ocamlc lib/.p.objs/p.{cmi,cmo,cmt}
|
ocamlc lib/.p.objs/p.{cmi,cmo,cmt}
|
||||||
ocamlopt lib/p.{a,cmxa} [default.foo]
|
ocamlopt lib/p.{a,cmxa} [default.foo]
|
||||||
ocamlopt bin/blah.{cmx,o} [default.foo]
|
ocamlopt bin/.blah.eobjs/blah.{cmx,o} [default.foo]
|
||||||
ocamlc bin/blah.{cmi,cmo,cmt}
|
ocamlc bin/.blah.eobjs/blah.{cmi,cmo,cmt}
|
||||||
ocamlopt lib/.p.objs/p.{cmx,o}
|
ocamlopt lib/.p.objs/p.{cmx,o}
|
||||||
ocamlopt lib/p.cmxs [default.foo]
|
ocamlopt lib/p.cmxs [default.foo]
|
||||||
ocamlopt bin/blah.exe [default.foo]
|
ocamlopt bin/blah.exe [default.foo]
|
||||||
ocamlopt bin/blah.{cmx,o}
|
ocamlopt bin/.blah.eobjs/blah.{cmx,o}
|
||||||
ocamlopt lib/p.{a,cmxa}
|
ocamlopt lib/p.{a,cmxa}
|
||||||
ocamlopt bin/blah.exe
|
ocamlopt bin/blah.exe
|
||||||
blah file [default.foo]
|
blah file [default.foo]
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
[1]
|
[1]
|
||||||
$ $JBUILDER exec ./foo.exe -j1 --display short --root .
|
$ $JBUILDER exec ./foo.exe -j1 --display short --root .
|
||||||
ocamldep foo.ml.d
|
ocamldep foo.ml.d
|
||||||
ocamlc foo.{cmi,cmo,cmt}
|
ocamlc .foo.eobjs/foo.{cmi,cmo,cmt}
|
||||||
ocamlopt foo.{cmx,o}
|
ocamlopt .foo.eobjs/foo.{cmx,o}
|
||||||
ocamlopt foo.exe
|
ocamlopt foo.exe
|
||||||
Foo
|
Foo
|
||||||
$ $JBUILDER exec --dev ./foo.exe -j1 --display short --root .
|
$ $JBUILDER exec --dev ./foo.exe -j1 --display short --root .
|
||||||
ocamlc foo.{cmi,cmo,cmt}
|
ocamlc .foo.eobjs/foo.{cmi,cmo,cmt}
|
||||||
ocamlopt foo.{cmx,o}
|
ocamlopt .foo.eobjs/foo.{cmx,o}
|
||||||
ocamlopt foo.exe
|
ocamlopt foo.exe
|
||||||
Foo
|
Foo
|
||||||
$ $JBUILDER exec bar --no-build -j1 --display short --root .
|
$ $JBUILDER exec bar --no-build -j1 --display short --root .
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
[1]
|
[1]
|
||||||
$ $JBUILDER exec bar -j1 --display short --root .
|
$ $JBUILDER exec bar -j1 --display short --root .
|
||||||
ocamldep bar.ml.d
|
ocamldep bar.ml.d
|
||||||
ocamlc bar.{cmi,cmo,cmt}
|
ocamlc .bar.eobjs/bar.{cmi,cmo,cmt}
|
||||||
ocamlopt bar.{cmx,o}
|
ocamlopt .bar.eobjs/bar.{cmx,o}
|
||||||
ocamlopt bar.exe
|
ocamlopt bar.exe
|
||||||
Bar
|
Bar
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
$ $JBUILDER clean -j1 --display short --root .
|
$ $JBUILDER clean -j1 --display short --root .
|
||||||
$ $JBUILDER runtest -j1 --display short --root .
|
$ $JBUILDER runtest -j1 --display short --root .
|
||||||
ocamldep f.ml.d
|
ocamldep f.ml.d
|
||||||
ocamlc f.{cmi,cmo,cmt}
|
ocamlc .f.eobjs/f.{cmi,cmo,cmt}
|
||||||
ocamlopt f.{cmx,o}
|
ocamlopt .f.eobjs/f.{cmx,o}
|
||||||
ocamlopt f.exe
|
ocamlopt f.exe
|
||||||
f alias runtest
|
f alias runtest
|
||||||
Foo Bar
|
Foo Bar
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
ocamlc .foo.objs/foo.{cmi,cmo,cmt}
|
ocamlc .foo.objs/foo.{cmi,cmo,cmt}
|
||||||
ocamlc foo_byte.cma
|
ocamlc foo_byte.cma
|
||||||
ocamlopt .foo.objs/foo.{cmx,o}
|
ocamlopt .foo.objs/foo.{cmx,o}
|
||||||
ocamlc bar.{cmi,cmo,cmt}
|
ocamlc .bar.eobjs/bar.{cmi,cmo,cmt}
|
||||||
ocamlc foo.cma
|
ocamlc foo.cma
|
||||||
ocamlopt foo.{a,cmxa}
|
ocamlopt foo.{a,cmxa}
|
||||||
ocamlopt bar.{cmx,o}
|
ocamlopt .bar.eobjs/bar.{cmx,o}
|
||||||
ocamlopt foo.cmxs
|
ocamlopt foo.cmxs
|
||||||
ocamlopt bar.exe
|
ocamlopt bar.exe
|
||||||
lib: [
|
lib: [
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
ocamldep src/test_menhir1.ml.d
|
ocamldep src/test_menhir1.ml.d
|
||||||
ocamldep src/test_menhir1.mli.d
|
ocamldep src/test_menhir1.mli.d
|
||||||
ocamldep src/test_base.mli.d
|
ocamldep src/test_base.mli.d
|
||||||
ocamlc src/test_menhir1.{cmi,cmti}
|
ocamlc src/.test.eobjs/test_menhir1.{cmi,cmti}
|
||||||
ocamlc src/test_base.{cmi,cmti}
|
ocamlc src/.test.eobjs/test_base.{cmi,cmti}
|
||||||
ocamlc src/lexer1.{cmi,cmo,cmt}
|
ocamlc src/.test.eobjs/lexer1.{cmi,cmo,cmt}
|
||||||
ocamlopt src/test_menhir1.{cmx,o}
|
ocamlopt src/.test.eobjs/test_menhir1.{cmx,o}
|
||||||
ocamlc src/lexer2.{cmi,cmo,cmt}
|
ocamlc src/.test.eobjs/lexer2.{cmi,cmo,cmt}
|
||||||
ocamlopt src/test_base.{cmx,o}
|
ocamlopt src/.test.eobjs/test_base.{cmx,o}
|
||||||
ocamlopt src/lexer1.{cmx,o}
|
ocamlopt src/.test.eobjs/lexer1.{cmx,o}
|
||||||
ocamlc src/test.{cmi,cmo,cmt}
|
ocamlc src/.test.eobjs/test.{cmi,cmo,cmt}
|
||||||
ocamlopt src/lexer2.{cmx,o}
|
ocamlopt src/.test.eobjs/lexer2.{cmx,o}
|
||||||
ocamlopt src/test.{cmx,o}
|
ocamlopt src/.test.eobjs/test.{cmx,o}
|
||||||
ocamlopt src/test.exe
|
ocamlopt src/test.exe
|
||||||
|
|
|
@ -6,15 +6,15 @@
|
||||||
ocamlopt .ppx/fooppx@/ppx.exe
|
ocamlopt .ppx/fooppx@/ppx.exe
|
||||||
ppx w_omp_driver.pp.ml
|
ppx w_omp_driver.pp.ml
|
||||||
ocamldep w_omp_driver.pp.ml.d
|
ocamldep w_omp_driver.pp.ml.d
|
||||||
ocamlc w_omp_driver.{cmi,cmo,cmt}
|
ocamlc .w_omp_driver.eobjs/w_omp_driver.{cmi,cmo,cmt}
|
||||||
ocamlopt w_omp_driver.{cmx,o}
|
ocamlopt .w_omp_driver.eobjs/w_omp_driver.{cmx,o}
|
||||||
ocamlopt w_omp_driver.exe
|
ocamlopt w_omp_driver.exe
|
||||||
$ $JBUILDER build ./w_ppx_driver.exe -j1 --display short --root .
|
$ $JBUILDER build ./w_ppx_driver.exe -j1 --display short --root .
|
||||||
ocamlopt .ppx/ppx_driver.runner/ppx.exe
|
ocamlopt .ppx/ppx_driver.runner/ppx.exe
|
||||||
ppx w_ppx_driver.pp.ml
|
ppx w_ppx_driver.pp.ml
|
||||||
ocamldep w_ppx_driver.pp.ml.d
|
ocamldep w_ppx_driver.pp.ml.d
|
||||||
ocamlc w_ppx_driver.{cmi,cmo,cmt}
|
ocamlc .w_ppx_driver.eobjs/w_ppx_driver.{cmi,cmo,cmt}
|
||||||
ocamlopt w_ppx_driver.{cmx,o}
|
ocamlopt .w_ppx_driver.eobjs/w_ppx_driver.{cmx,o}
|
||||||
ocamlopt w_ppx_driver.exe
|
ocamlopt w_ppx_driver.exe
|
||||||
This test is broken because ppx_driver doesn't support migrate custom arguments
|
This test is broken because ppx_driver doesn't support migrate custom arguments
|
||||||
# $ $JBUILDER build ./w_ppx_driver_flags.exe -j1 --display short --root .
|
# $ $JBUILDER build ./w_ppx_driver_flags.exe -j1 --display short --root .
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
ocamldep foo_fake.ml.d
|
ocamldep foo_fake.ml.d
|
||||||
ocamldep foo_no_fake.ml.d
|
ocamldep foo_no_fake.ml.d
|
||||||
ocamldep main.ml.d
|
ocamldep main.ml.d
|
||||||
ocamlc bar.{cmi,cmo,cmt}
|
ocamlc .main.eobjs/bar.{cmi,cmo,cmt}
|
||||||
ocamlc foo.{cmi,cmo,cmt}
|
ocamlc .main.eobjs/foo.{cmi,cmo,cmt}
|
||||||
ocamlopt bar.{cmx,o}
|
ocamlopt .main.eobjs/bar.{cmx,o}
|
||||||
ocamlopt foo.{cmx,o}
|
ocamlopt .main.eobjs/foo.{cmx,o}
|
||||||
ocamlc main.{cmi,cmo,cmt}
|
ocamlc .main.eobjs/main.{cmi,cmo,cmt}
|
||||||
ocamlopt main.{cmx,o}
|
ocamlopt .main.eobjs/main.{cmx,o}
|
||||||
ocamlopt main.exe
|
ocamlopt main.exe
|
||||||
main alias runtest
|
main alias runtest
|
||||||
bar has unix
|
bar has unix
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
ocamldep forutop/.utop/utop.ml.d
|
ocamldep forutop/.utop/utop.ml.d
|
||||||
ocamldep forutop/forutop.ml.d
|
ocamldep forutop/forutop.ml.d
|
||||||
ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}
|
ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}
|
||||||
ocamlc forutop/.utop/utop.{cmi,cmo,cmt}
|
ocamlc forutop/.utop/.utop.eobjs/utop.{cmi,cmo,cmt}
|
||||||
ocamlc forutop/forutop.cma
|
ocamlc forutop/forutop.cma
|
||||||
ocamlc forutop/.utop/utop.exe
|
ocamlc forutop/.utop/utop.exe
|
||||||
hello in utop
|
hello in utop
|
||||||
|
|
Loading…
Reference in New Issue