[Pkg-ocaml-maint-commits] [SCM] ocamlviz packaging branch, ocamlbuild, updated. upstream/1.01-9-ga90f660

[Mehdi Dogguy]

The following commit has been merged in the ocamlbuild branch:
commit a90f660aa8d0fc7d4690d3acaeb2545000d642dd
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Mar 26 00:40:36 2010 +0100

    Keep (almost) same naming convention

diff --git a/Makefile.in b/Makefile.in
index fc226c4..033ce0c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,11 +45,11 @@ native:
 final:
 	$(OCAMLBUILD) $@
 
-test-%.native:
-test-%.byte:
-ascii-%.native:
-ascii-%.byte:
-tests/pa-%.ml:
+test-%:
+test-%-byte:
+ascii-%:
+ascii-%-byte:
+pa-%.ml:
 	$(OCAMLBUILD) $@
 
 
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index b781d4d..48c2e3e 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -150,13 +150,13 @@ let _ =
           )
         in
         let test = "tests/%.ml" in
-        let rule_native = "test-%.native" in
-        let rule_byte = "test-%.byte" in
+        let rule_native = "test-%" in
+        let rule_byte = "test-%-byte" in
         let bin_native = "tests/%.native" in
         let bin_byte = "tests/%.byte" in
-        let a_rule_native = "ascii-%.native" in
-        let a_rule_byte = "ascii-%.byte" in
-        let pa_test = "tests/pa-%.ml" in
+        let a_rule_native = "ascii-%" in
+        let a_rule_byte = "ascii-%-byte" in
+        let pa_test = "pa-%.ml" in
 
         rule rule_native ~stamp:rule_native ~deps:([cmxa; gui_native; bin_native])
           (test_cmd "native" gui_native);
@@ -169,7 +169,7 @@ let _ =
         rule pa_test ~stamp:pa_test ~deps:([ test; pa_ocamlviz ])
           (fun env _ ->
              let test = env "tests/%.ml" in
-             let pa_test = env "tests/pa-%.ml" in
+             let pa_test = env "pa-%.ml" in
              Cmd (Sh (__ "camlp4 pa_o.cmo str.cma camlp4/pa_ocamlviz.cmo pr_o.cmo %s -o %s" test pa_test))
           );
 

-- 
ocamlviz packaging