matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #1132 (#1137) 

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
Jérémie Dimino 2018-08-15 09:20:00 +01:00 committed by GitHub
parent a08dcc043e
commit cdb2342e41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/dune
View File

@ -5,11 +5,15 @@
(deps (package dune) (source_tree sample-projects/hello_world))
(action
(chdir sample-projects/hello_world
(run %{exe:../test/blackbox-tests/cram.exe} -test run.t))))
(progn
(run %{exe:../test/blackbox-tests/cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))
(alias
(name runtest)
(deps (package dune) (source_tree sample-projects/with-configure-step))
(action
(chdir sample-projects/with-configure-step
(run %{exe:../test/blackbox-tests/cram.exe} -test run.t))))
(progn
(run %{exe:../test/blackbox-tests/cram.exe} -test run.t)
(diff? run.t run.t.corrected)))))

8
example/sample-projects/hello_world/bin/dune
View File

@ -1,7 +1,7 @@
(executables
((names (main))
(libraries (hello_world))))
(names main)
(libraries hello_world))
(install
((section bin)
(files ((main.exe as hello_world)))))
(section bin)
(files (main.exe as hello_world)))

2
example/sample-projects/hello_world/dune-project Normal file
View File

@ -0,0 +1,2 @@
(lang dune 1.1)
(name hello_world)

3
example/sample-projects/hello_world/lib/dune
View File

@ -1,3 +1,2 @@
(library
((name hello_world)
(public_name hello_world)))
(public_name hello_world))

23
example/sample-projects/hello_world/run.t
View File

@ -1,13 +1,16 @@
$ jbuilder build @install @runtest
ocamldep bin/main.depends.ocamldep-output
ocamldep lib/hello_world.depends.ocamldep-output
ocamlc lib/hello_world.{cmi,cmo,cmt}
ocamlopt lib/hello_world.{cmx,o}
ocamlc bin/main.{cmi,cmo,cmt}
ocamlc lib/hello_world.cma
$ dune build @install @runtest --display short
ocamldep bin/.main.eobjs/main.ml.d
ocamldep lib/.hello_world.objs/hello_world.ml.d
ocamlc lib/.hello_world.objs/hello_world.{cmi,cmo,cmt}
ocamlopt lib/.hello_world.objs/hello_world.{cmx,o}
ocamlopt lib/hello_world.{a,cmxa}
ocamlopt bin/main.{cmx,o}
ocamlopt lib/hello_world.cmxs
ocamldep test/.test.eobjs/test.ml.d
ocamlc test/.test.eobjs/test.{cmi,cmo,cmt}
ocamlopt test/.test.eobjs/test.{cmx,o}
ocamlopt test/test.exe
test test/test.output
ocamlc lib/hello_world.cma
ocamlc bin/.main.eobjs/main.{cmi,cmo,cmt}
ocamlopt bin/.main.eobjs/main.{cmx,o}
ocamlopt bin/main.exe
hello_world test/hello_world.output
diff alias test/runtest

10
example/sample-projects/hello_world/test/dune
View File

@ -1,7 +1,3 @@
(rule
((targets (hello_world.output))
(action (with-stdout-to %{targets} (run %{bin:hello_world})))))
(alias
((name runtest)
(action (run diff -uw %{dep:hello_world.expected} %{dep:hello_world.output}))))
(test
(name test)
(libraries hello_world))

0
example/sample-projects/hello_world/test/hello_world.expected → example/sample-projects/hello_world/test/test.expected
View File

1
example/sample-projects/hello_world/test/test.ml Normal file
View File

@ -0,0 +1 @@
print_endline Hello_world.message

13
example/sample-projects/with-configure-step/dune
View File

@ -1,10 +1,9 @@
(rule
((fallback)
(targets (config))
(deps (config.defaults))
(action (copy %{first-dep} %{targets}))))
(mode fallback)
(targets config)
(action (copy config.defaults %{targets})))
(rule
((targets (config.full))
(deps (config_common.ml config))
(action (run %{OCAML} %{dep:real_configure.ml}))))
(targets config.full)
(deps config_common.ml config)
(action (run ocaml %{dep:real_configure.ml})))

2
example/sample-projects/with-configure-step/dune-project Normal file
View File

@ -0,0 +1,2 @@
(lang dune 1.1)
(name myproject)

13
example/sample-projects/with-configure-step/run.t
View File

@ -1,8 +1,9 @@
$ jbuilder build @install @runtest
$ dune build @install @runtest --display short
ocaml config.full
ocamldep src/plop.depends.ocamldep-output
ocamlc src/config.{cmi,cmo,cmt}
ocamlopt src/config.{cmx,o}
ocamlc src/plop.{cmi,cmo,cmt}
ocamlopt src/plop.{cmx,o}
ocamldep src/.plop.eobjs/config.ml.d
ocamldep src/.plop.eobjs/plop.ml.d
ocamlc src/.plop.eobjs/config.{cmi,cmo,cmt}
ocamlopt src/.plop.eobjs/config.{cmx,o}
ocamlc src/.plop.eobjs/plop.{cmi,cmo,cmt}
ocamlopt src/.plop.eobjs/plop.{cmx,o}
ocamlopt src/plop.exe

12
example/sample-projects/with-configure-step/src/dune
View File

@ -1,12 +1,10 @@
(executables
((names (plop))))
(names plop))
(install
((section bin)
(files ((plop.exe as plop)))))
(section bin)
(files (plop.exe as plop)))
(rule
((targets (config.ml))
(deps (../config.full))
(action (copy %{first-dep} %{targets}))))
(targets config.ml)
(action (copy ../config.full %{targets})))