summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNo author <no_author@ocaml.org>2008-02-29 12:17:35 +0000
committerNo author <no_author@ocaml.org>2008-02-29 12:17:35 +0000
commitda32992e295c8caf5f51c1620d64f42e66957c18 (patch)
tree51822cf98db6cc26414a0a7ac433f7148817c77a
parent995023e573b6c610b9fa3b5110d0c496cd29d494 (diff)
downloadocaml-da32992e295c8caf5f51c1620d64f42e66957c18.tar.gz
This commit was manufactured by cvs2svn to create tag 'ocaml3102'.3.10.2
git-svn-id: http://caml.inria.fr/svn/ocaml/release/3.10.2@8818 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--ocamlbuild/examples/example_with_C/_tags1
-rw-r--r--ocamlbuild/examples/example_with_C/fib.ml5
-rw-r--r--ocamlbuild/examples/example_with_C/fibwrap.c7
-rw-r--r--ocamlbuild/examples/example_with_C/main.c10
-rw-r--r--ocamlbuild/examples/example_with_C/myocamlbuild.ml35
-rw-r--r--ocamlbuild/examples/example_with_C/x.ml1
-rw-r--r--ocamlbuild/test/test_virtual/foo.itarget1
-rw-r--r--ocamlbuild/test/test_virtual/foo11
-rw-r--r--ocamlbuild/test/test_virtual/foo21
-rw-r--r--ocamlbuild/test/test_virtual/myocamlbuild.ml11
-rw-r--r--ocamlbuild/test/test_virtual/test.sh16
11 files changed, 0 insertions, 89 deletions
diff --git a/ocamlbuild/examples/example_with_C/_tags b/ocamlbuild/examples/example_with_C/_tags
deleted file mode 100644
index 769cb463b2..0000000000
--- a/ocamlbuild/examples/example_with_C/_tags
+++ /dev/null
@@ -1 +0,0 @@
-<*caml.o>: output_obj
diff --git a/ocamlbuild/examples/example_with_C/fib.ml b/ocamlbuild/examples/example_with_C/fib.ml
deleted file mode 100644
index ef6dbd438c..0000000000
--- a/ocamlbuild/examples/example_with_C/fib.ml
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = X.x
-
-let rec fib n = if n <= 1 then 1 else fib (n - 1) + fib (n - 2)
-
-let () = Callback.register "fib" fib
diff --git a/ocamlbuild/examples/example_with_C/fibwrap.c b/ocamlbuild/examples/example_with_C/fibwrap.c
deleted file mode 100644
index cc2104b67b..0000000000
--- a/ocamlbuild/examples/example_with_C/fibwrap.c
+++ /dev/null
@@ -1,7 +0,0 @@
- /* -*- C -*- */
-#include <caml/mlvalues.h>
-#include <caml/callback.h>
-int fib(int n)
-{
- return Int_val(caml_callback(*caml_named_value("fib"), Val_int(n)));
-}
diff --git a/ocamlbuild/examples/example_with_C/main.c b/ocamlbuild/examples/example_with_C/main.c
deleted file mode 100644
index c7f6bb5d2a..0000000000
--- a/ocamlbuild/examples/example_with_C/main.c
+++ /dev/null
@@ -1,10 +0,0 @@
- /* -*- C -*- */
-#include <stdio.h>
-#include <caml/callback.h>
-extern int fib(int);
-int main(int argc, char** argv)
-{
- caml_startup(argv);
- printf("fib(12) = %d\n", fib(12));
- return 0;
-}
diff --git a/ocamlbuild/examples/example_with_C/myocamlbuild.ml b/ocamlbuild/examples/example_with_C/myocamlbuild.ml
deleted file mode 100644
index f53df7e102..0000000000
--- a/ocamlbuild/examples/example_with_C/myocamlbuild.ml
+++ /dev/null
@@ -1,35 +0,0 @@
-open Ocamlbuild_plugin;;
-open Command;;
-
-let cc = A"cc";;
-let ar = A"ar";;
-
-dispatch begin function
-| After_rules ->
- let libasmrun = !*Ocamlbuild_pack.Ocaml_utils.stdlib_dir/"libasmrun.a" in
-
- flag ["ocaml"; "link"; "output_obj"] (A"-output-obj");
-
- rule "output C obj"
- ~deps:["%.cmx"; "%.o"]
- ~prod:"%caml.o"
- (Ocamlbuild_pack.Ocaml_compiler.native_link "%.cmx" "%caml.o");
-
- rule "build C lib"
- ~deps:["%wrap.o"; "%caml.o"]
- ~prod:"lib%.a"
- begin fun env _ ->
- let wrap_o = env "%wrap.o" and caml_o = env "%caml.o"
- and lib_a = env "lib%.a" in
- Seq[cp libasmrun lib_a;
- Cmd(S[ar; A"r"; Px lib_a; P caml_o; P wrap_o])]
- end;
- rule "build main"
- ~deps:["libfib.a"; "main.o"]
- ~prod:"main"
- begin fun _ _ ->
- Cmd(S[cc; P"main.o"; P"libfib.a"; A"-o"; Px"main"])
- end;
-| _ -> ()
-end
-
diff --git a/ocamlbuild/examples/example_with_C/x.ml b/ocamlbuild/examples/example_with_C/x.ml
deleted file mode 100644
index 7fecab12d4..0000000000
--- a/ocamlbuild/examples/example_with_C/x.ml
+++ /dev/null
@@ -1 +0,0 @@
-let x = 42
diff --git a/ocamlbuild/test/test_virtual/foo.itarget b/ocamlbuild/test/test_virtual/foo.itarget
deleted file mode 100644
index 257cc5642c..0000000000
--- a/ocamlbuild/test/test_virtual/foo.itarget
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/ocamlbuild/test/test_virtual/foo1 b/ocamlbuild/test/test_virtual/foo1
deleted file mode 100644
index 1715acd6a5..0000000000
--- a/ocamlbuild/test/test_virtual/foo1
+++ /dev/null
@@ -1 +0,0 @@
-foo1
diff --git a/ocamlbuild/test/test_virtual/foo2 b/ocamlbuild/test/test_virtual/foo2
deleted file mode 100644
index 54b060eee9..0000000000
--- a/ocamlbuild/test/test_virtual/foo2
+++ /dev/null
@@ -1 +0,0 @@
-foo2
diff --git a/ocamlbuild/test/test_virtual/myocamlbuild.ml b/ocamlbuild/test/test_virtual/myocamlbuild.ml
deleted file mode 100644
index 0c43d4ce48..0000000000
--- a/ocamlbuild/test/test_virtual/myocamlbuild.ml
+++ /dev/null
@@ -1,11 +0,0 @@
-open Ocamlbuild_plugin;;
-dispatch begin function
- | After_rules ->
- rule "copy foo"
- ~prod:"bar"
- ~dep:"foo.otarget"
- begin fun _env _build ->
- cp "foo" "bar"
- end
- | _ -> ()
-end
diff --git a/ocamlbuild/test/test_virtual/test.sh b/ocamlbuild/test/test_virtual/test.sh
deleted file mode 100644
index dbb2be7514..0000000000
--- a/ocamlbuild/test/test_virtual/test.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-set -e
-set -x
-CMDOPTS="" # -- command args
-BUILD="../../_build/ocamlbuild.native bar -no-skip -classic-display $@"
-BUILD1="$BUILD $CMDOPTS"
-BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
-rm -rf _build
-cp foo1 foo
-$BUILD1
-$BUILD2
-cp foo2 foo
-$BUILD1 -verbose 0
-$BUILD2
-rm foo