Get rid of uses of %{first-dep}
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
parent
fd27e371bc
commit
04f62ecc03
|
@ -1307,7 +1307,7 @@ module Rule = struct
|
||||||
[ S.virt_text __POS__ "-q"
|
[ S.virt_text __POS__ "-q"
|
||||||
; S.virt_text __POS__ "-o"
|
; S.virt_text __POS__ "-o"
|
||||||
; S.virt_var __POS__ "targets"
|
; S.virt_var __POS__ "targets"
|
||||||
; S.virt_var __POS__"first-dep"
|
; S.virt_var __POS__"first-dep-tmp"
|
||||||
])))
|
])))
|
||||||
; mode
|
; mode
|
||||||
; locks = []
|
; locks = []
|
||||||
|
@ -1328,7 +1328,7 @@ module Rule = struct
|
||||||
Chdir
|
Chdir
|
||||||
(S.virt_var __POS__ "root",
|
(S.virt_var __POS__ "root",
|
||||||
Run (S.virt_text __POS__ "ocamlyacc",
|
Run (S.virt_text __POS__ "ocamlyacc",
|
||||||
[S.virt_var __POS__ "first-dep"])))
|
[S.virt_var __POS__ "first-dep-tmp"])))
|
||||||
; mode
|
; mode
|
||||||
; locks = []
|
; locks = []
|
||||||
; loc
|
; loc
|
||||||
|
|
|
@ -1,7 +1 @@
|
||||||
(executable
|
(test (name f))
|
||||||
(name f))
|
|
||||||
|
|
||||||
(alias
|
|
||||||
(name runtest)
|
|
||||||
(deps f.exe)
|
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(package lib1)
|
(package lib1)
|
||||||
(deps test1.exe)
|
(action (run ./test1.exe)))
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
(name test1)
|
(name test1)
|
||||||
|
@ -24,8 +23,7 @@
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(package lib2)
|
(package lib2)
|
||||||
(deps test2.exe)
|
(action (run ./test2.exe)))
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
(name test2)
|
(name test2)
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps main.exe)
|
(action (run ./main.exe)))
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
||||||
(executable (name main))
|
(executable (name main))
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps main.exe)
|
(action (run ./main.exe)))
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
||||||
(executable (name main))
|
(executable (name main))
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
diff alias runtest
|
diff alias runtest
|
||||||
diff alias runtest (exit 1)
|
diff alias runtest (exit 1)
|
||||||
(cd _build/default && /usr/bin/diff -u result expected)
|
(cd _build/default && /usr/bin/diff -u result expected)
|
||||||
--- result 2018-07-09 21:13:11.000000000 +0700
|
--- result 2018-07-09 16:03:03.123914026 +0100
|
||||||
+++ expected 2018-07-09 21:13:11.000000000 +0700
|
+++ expected 2018-07-09 16:03:03.124914029 +0100
|
||||||
@@ -1 +1 @@
|
@@ -1 +1 @@
|
||||||
-c.txt b.txt a.txt dune
|
-c.txt b.txt a.txt dune
|
||||||
\ No newline at end of file
|
\ No newline at end of file
|
||||||
|
@ -13,8 +13,8 @@
|
||||||
\ No newline at end of file
|
\ No newline at end of file
|
||||||
diff alias runtest (exit 1)
|
diff alias runtest (exit 1)
|
||||||
(cd _build/default && /usr/bin/diff -u result2 expected2)
|
(cd _build/default && /usr/bin/diff -u result2 expected2)
|
||||||
--- result2 2018-07-09 21:13:11.000000000 +0700
|
--- result2 2018-07-09 16:03:03.124914029 +0100
|
||||||
+++ expected2 2018-07-09 21:13:11.000000000 +0700
|
+++ expected2 2018-07-09 16:03:03.124914029 +0100
|
||||||
@@ -1 +1 @@
|
@@ -1 +1 @@
|
||||||
-sub-tree/dir/b sub-tree/a
|
-sub-tree/dir/b sub-tree/a
|
||||||
\ No newline at end of file
|
\ No newline at end of file
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
(rule
|
(rule
|
||||||
(targets dynamic.exe)
|
(targets dynamic.exe)
|
||||||
(deps dynamic.c)
|
(deps dynamic.c)
|
||||||
(action (run %{cc} -o %{targets} %{first-dep} %{ocaml-config:native_c_libraries})))
|
(action (run %{cc} -o %{targets} %{deps} %{ocaml-config:native_c_libraries})))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
|
@ -48,9 +48,9 @@
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps test.bc%{ext_dll})
|
(deps test.bc%{ext_dll})
|
||||||
(action (run ./dynamic.exe ./%{first-dep})))
|
(action (run ./dynamic.exe ./%{deps})))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps test%{ext_dll})
|
(deps test%{ext_dll})
|
||||||
(action (run ./dynamic.exe ./%{first-dep})))
|
(action (run ./dynamic.exe ./%{deps})))
|
||||||
|
|
|
@ -10,5 +10,4 @@
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps main.exe)
|
(action (run ./main.exe)))
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
(executable
|
(test
|
||||||
(name test_configurator)
|
(name test_configurator)
|
||||||
(libraries configurator))
|
(libraries configurator))
|
||||||
|
|
||||||
(alias
|
|
||||||
(name runtest)
|
|
||||||
(deps ./test_configurator.exe)
|
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
|
@ -18,72 +18,72 @@
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps tests.mlt
|
(deps (:t tests.mlt)
|
||||||
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
||||||
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)
|
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)
|
||||||
(source_tree toolchain.d)
|
(source_tree toolchain.d)
|
||||||
(source_tree findlib-db))
|
(source_tree findlib-db))
|
||||||
(action (chdir %{project_root}
|
(action (chdir %{project_root}
|
||||||
(progn
|
(progn
|
||||||
(run %{exe:expect_test.exe} %{first-dep})
|
(run %{exe:expect_test.exe} %{t})
|
||||||
(diff? %{first-dep} %{first-dep}.corrected)))))
|
(diff? %{t} %{t}.corrected)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps filename.mlt
|
(deps (:t filename.mlt)
|
||||||
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
||||||
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
||||||
(action (chdir %{project_root}
|
(action (chdir %{project_root}
|
||||||
(progn
|
(progn
|
||||||
(run %{exe:expect_test.exe} %{first-dep})
|
(run %{exe:expect_test.exe} %{t})
|
||||||
(diff? %{first-dep} %{first-dep}.corrected)))))
|
(diff? %{t} %{t}.corrected)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps import_dot_map.mlt
|
(deps (:t import_dot_map.mlt)
|
||||||
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
||||||
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
||||||
(action (chdir %{project_root}
|
(action (chdir %{project_root}
|
||||||
(progn
|
(progn
|
||||||
(run %{exe:expect_test.exe} %{first-dep})
|
(run %{exe:expect_test.exe} %{t})
|
||||||
(diff? %{first-dep} %{first-dep}.corrected)))))
|
(diff? %{t} %{t}.corrected)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps action.mlt
|
(deps (:t action.mlt)
|
||||||
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
||||||
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
||||||
(action (chdir %{project_root}
|
(action (chdir %{project_root}
|
||||||
(progn
|
(progn
|
||||||
(run %{exe:expect_test.exe} %{first-dep})
|
(run %{exe:expect_test.exe} %{t})
|
||||||
(diff? %{first-dep} %{first-dep}.corrected)))))
|
(diff? %{t} %{t}.corrected)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps path.mlt
|
(deps (:t path.mlt)
|
||||||
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
||||||
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
||||||
(action (chdir %{project_root}
|
(action (chdir %{project_root}
|
||||||
(progn
|
(progn
|
||||||
(run %{exe:expect_test.exe} %{first-dep})
|
(run %{exe:expect_test.exe} %{t})
|
||||||
(diff? %{first-dep} %{first-dep}.corrected)))))
|
(diff? %{t} %{t}.corrected)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps sexp.mlt
|
(deps (:t sexp.mlt)
|
||||||
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
||||||
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
||||||
(action (chdir %{project_root}
|
(action (chdir %{project_root}
|
||||||
(progn
|
(progn
|
||||||
(run %{exe:expect_test.exe} %{first-dep})
|
(run %{exe:expect_test.exe} %{t})
|
||||||
(diff? %{first-dep} %{first-dep}.corrected)))))
|
(diff? %{t} %{t}.corrected)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name runtest)
|
(name runtest)
|
||||||
(deps jbuild.mlt
|
(deps (:t jbuild.mlt)
|
||||||
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
(glob_files %{project_root}/src/.dune.objs/*.cmi)
|
||||||
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
|
||||||
(action (chdir %{project_root}
|
(action (chdir %{project_root}
|
||||||
(progn
|
(progn
|
||||||
(run %{exe:expect_test.exe} %{first-dep})
|
(run %{exe:expect_test.exe} %{t})
|
||||||
(diff? %{first-dep} %{first-dep}.corrected)))))
|
(diff? %{t} %{t}.corrected)))))
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
(executable
|
(test
|
||||||
(name gh637)
|
(name gh637)
|
||||||
(libraries ocaml_config))
|
(libraries ocaml_config))
|
||||||
|
|
||||||
(alias
|
|
||||||
(name runtest)
|
|
||||||
(deps ./gh637.exe)
|
|
||||||
(action (run %{first-dep})))
|
|
||||||
|
|
Loading…
Reference in New Issue