Merge pull request #95 from WebAssembly/directories

Move the contents of ml-proto/src into ml-proto.
WebAssembly · Oct 1, 2015 · 2ef91ef · 2ef91ef
2 parents be2b6ea + 4aecd07
commit 2ef91ef
Show file tree

Hide file tree

Showing 55 changed files with 12 additions and 13 deletions.
diff --git a/ml-proto/src/.gitignore → ml-proto/.gitignore b/ml-proto/src/.gitignore → ml-proto/.gitignore
diff --git a/ml-proto/src/Makefile → ml-proto/Makefile b/ml-proto/src/Makefile → ml-proto/Makefile
diff --git a/ml-proto/README.md b/ml-proto/README.md
@@ -17,21 +17,21 @@ The interpreter can also be run as a REPL, allowing to enter pieces of scripts i
 
 You'll need OCaml 4.02. The best way to get this is to download the source tarball from the ocaml website ( http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02.2.tar.gz ) and do the configure / make dance.  On OSX, with [Homebrew](http://brew.sh/) installed, simply `brew install ocaml`.
 
-Once you have ocaml, go to the `src` directory and simply do
+Once you have ocaml, simply do
 
 ```
 make
 ```
 
-You'll get an executable named `src/wasm`.
+You'll get an executable named `./wasm`.
 
-Alternatively, you can also say (in `src`):
+Alternatively, you can also say:
 
 ```
 ocamlbuild -Is "given, spec, host" -libs "bigarray, str" main.native
 ```
 
-and get an executable named `src/main.native`.
+and get an executable named `./main.native`.
 
 
 ### Building on Windows

diff --git a/ml-proto/src/_tags → ml-proto/_tags b/ml-proto/src/_tags → ml-proto/_tags
diff --git a/ml-proto/src/given/lib.ml → ml-proto/given/lib.ml b/ml-proto/src/given/lib.ml → ml-proto/given/lib.ml
diff --git a/ml-proto/src/given/lib.mli → ml-proto/given/lib.mli b/ml-proto/src/given/lib.mli → ml-proto/given/lib.mli
diff --git a/ml-proto/src/given/source.ml → ml-proto/given/source.ml b/ml-proto/src/given/source.ml → ml-proto/given/source.ml
diff --git a/ml-proto/src/given/source.mli → ml-proto/given/source.mli b/ml-proto/src/given/source.mli → ml-proto/given/source.mli
diff --git a/ml-proto/src/host/builtins.ml → ml-proto/host/builtins.ml b/ml-proto/src/host/builtins.ml → ml-proto/host/builtins.ml
diff --git a/ml-proto/src/host/builtins.mli → ml-proto/host/builtins.mli b/ml-proto/src/host/builtins.mli → ml-proto/host/builtins.mli
diff --git a/ml-proto/src/host/flags.ml → ml-proto/host/flags.ml b/ml-proto/src/host/flags.ml → ml-proto/host/flags.ml
diff --git a/ml-proto/src/host/lexer.mli → ml-proto/host/lexer.mli b/ml-proto/src/host/lexer.mli → ml-proto/host/lexer.mli
diff --git a/ml-proto/src/host/lexer.mll → ml-proto/host/lexer.mll b/ml-proto/src/host/lexer.mll → ml-proto/host/lexer.mll
diff --git a/ml-proto/src/host/load.ml → ml-proto/host/load.ml b/ml-proto/src/host/load.ml → ml-proto/host/load.ml
diff --git a/ml-proto/src/host/main.ml → ml-proto/host/main.ml b/ml-proto/src/host/main.ml → ml-proto/host/main.ml
diff --git a/ml-proto/src/host/params.ml → ml-proto/host/params.ml b/ml-proto/src/host/params.ml → ml-proto/host/params.ml
diff --git a/ml-proto/src/host/parser.mly → ml-proto/host/parser.mly b/ml-proto/src/host/parser.mly → ml-proto/host/parser.mly
diff --git a/ml-proto/src/host/print.ml → ml-proto/host/print.ml b/ml-proto/src/host/print.ml → ml-proto/host/print.ml
diff --git a/ml-proto/src/host/print.mli → ml-proto/host/print.mli b/ml-proto/src/host/print.mli → ml-proto/host/print.mli
diff --git a/ml-proto/src/host/script.ml → ml-proto/host/script.ml b/ml-proto/src/host/script.ml → ml-proto/host/script.ml
diff --git a/ml-proto/src/host/script.mli → ml-proto/host/script.mli b/ml-proto/src/host/script.mli → ml-proto/host/script.mli
diff --git a/ml-proto/runtests.py b/ml-proto/runtests.py
@@ -51,14 +51,14 @@ def find_interpreter(path):
 def rebuild_interpreter(path):
   print("// building %s" % path)
   sys.stdout.flush()
-  exitCode = subprocess.call(["ocamlbuild", "-libs", "bigarray, str", "-Is", "given, spec, host", "-cflags", "-g", "host/main.native"], cwd=os.path.abspath("src"))
+  exitCode = subprocess.call(["ocamlbuild", "-libs", "bigarray, str", "-Is", "given, spec, host", "-cflags", "-g", "host/main.native"])
   if (exitCode != 0):
     raise Exception("ocamlbuild failed with exit code %i" % exitCode)
   if not os.path.exists(path):
     raise Exception("Interpreter has not been built. Looked for %s" % path)
 
 if __name__ == "__main__":
-  interpreterPath = os.path.abspath("src/main.native")
+  interpreterPath = os.path.abspath("./main.native")
 
   try:
     os.makedirs("test/output/")

diff --git a/ml-proto/src/spec/arithmetic.ml → ml-proto/spec/arithmetic.ml b/ml-proto/src/spec/arithmetic.ml → ml-proto/spec/arithmetic.ml
diff --git a/ml-proto/src/spec/arithmetic.mli → ml-proto/spec/arithmetic.mli b/ml-proto/src/spec/arithmetic.mli → ml-proto/spec/arithmetic.mli
diff --git a/ml-proto/src/spec/ast.ml → ml-proto/spec/ast.ml b/ml-proto/src/spec/ast.ml → ml-proto/spec/ast.ml
diff --git a/ml-proto/src/spec/check.ml → ml-proto/spec/check.ml b/ml-proto/src/spec/check.ml → ml-proto/spec/check.ml
diff --git a/ml-proto/src/spec/check.mli → ml-proto/spec/check.mli b/ml-proto/src/spec/check.mli → ml-proto/spec/check.mli
diff --git a/ml-proto/src/spec/error.ml → ml-proto/spec/error.ml b/ml-proto/src/spec/error.ml → ml-proto/spec/error.ml
diff --git a/ml-proto/src/spec/error.mli → ml-proto/spec/error.mli b/ml-proto/src/spec/error.mli → ml-proto/spec/error.mli
diff --git a/ml-proto/src/spec/eval.ml → ml-proto/spec/eval.ml b/ml-proto/src/spec/eval.ml → ml-proto/spec/eval.ml
diff --git a/ml-proto/src/spec/eval.mli → ml-proto/spec/eval.mli b/ml-proto/src/spec/eval.mli → ml-proto/spec/eval.mli
diff --git a/ml-proto/src/spec/f32.ml → ml-proto/spec/f32.ml b/ml-proto/src/spec/f32.ml → ml-proto/spec/f32.ml
diff --git a/ml-proto/src/spec/f32.mli → ml-proto/spec/f32.mli b/ml-proto/src/spec/f32.mli → ml-proto/spec/f32.mli
diff --git a/ml-proto/src/spec/f32_convert.ml → ml-proto/spec/f32_convert.ml b/ml-proto/src/spec/f32_convert.ml → ml-proto/spec/f32_convert.ml
diff --git a/ml-proto/src/spec/f32_convert.mli → ml-proto/spec/f32_convert.mli b/ml-proto/src/spec/f32_convert.mli → ml-proto/spec/f32_convert.mli
diff --git a/ml-proto/src/spec/f64.ml → ml-proto/spec/f64.ml b/ml-proto/src/spec/f64.ml → ml-proto/spec/f64.ml
diff --git a/ml-proto/src/spec/f64.mli → ml-proto/spec/f64.mli b/ml-proto/src/spec/f64.mli → ml-proto/spec/f64.mli
diff --git a/ml-proto/src/spec/f64_convert.ml → ml-proto/spec/f64_convert.ml b/ml-proto/src/spec/f64_convert.ml → ml-proto/spec/f64_convert.ml
diff --git a/ml-proto/src/spec/f64_convert.mli → ml-proto/spec/f64_convert.mli b/ml-proto/src/spec/f64_convert.mli → ml-proto/spec/f64_convert.mli
diff --git a/ml-proto/src/spec/i32.ml → ml-proto/spec/i32.ml b/ml-proto/src/spec/i32.ml → ml-proto/spec/i32.ml
diff --git a/ml-proto/src/spec/i32.mli → ml-proto/spec/i32.mli b/ml-proto/src/spec/i32.mli → ml-proto/spec/i32.mli
diff --git a/ml-proto/src/spec/i32_convert.ml → ml-proto/spec/i32_convert.ml b/ml-proto/src/spec/i32_convert.ml → ml-proto/spec/i32_convert.ml
diff --git a/ml-proto/src/spec/i32_convert.mli → ml-proto/spec/i32_convert.mli b/ml-proto/src/spec/i32_convert.mli → ml-proto/spec/i32_convert.mli
diff --git a/ml-proto/src/spec/i64.ml → ml-proto/spec/i64.ml b/ml-proto/src/spec/i64.ml → ml-proto/spec/i64.ml
diff --git a/ml-proto/src/spec/i64.mli → ml-proto/spec/i64.mli b/ml-proto/src/spec/i64.mli → ml-proto/spec/i64.mli
diff --git a/ml-proto/src/spec/i64_convert.ml → ml-proto/spec/i64_convert.ml b/ml-proto/src/spec/i64_convert.ml → ml-proto/spec/i64_convert.ml
diff --git a/ml-proto/src/spec/i64_convert.mli → ml-proto/spec/i64_convert.mli b/ml-proto/src/spec/i64_convert.mli → ml-proto/spec/i64_convert.mli
diff --git a/ml-proto/src/spec/memory.ml → ml-proto/spec/memory.ml b/ml-proto/src/spec/memory.ml → ml-proto/spec/memory.ml
diff --git a/ml-proto/src/spec/memory.mli → ml-proto/spec/memory.mli b/ml-proto/src/spec/memory.mli → ml-proto/spec/memory.mli
diff --git a/ml-proto/src/spec/numerics.ml → ml-proto/spec/numerics.ml b/ml-proto/src/spec/numerics.ml → ml-proto/spec/numerics.ml
diff --git a/ml-proto/src/spec/numerics.mli → ml-proto/spec/numerics.mli b/ml-proto/src/spec/numerics.mli → ml-proto/spec/numerics.mli
diff --git a/ml-proto/src/spec/types.ml → ml-proto/spec/types.ml b/ml-proto/src/spec/types.ml → ml-proto/spec/types.ml
diff --git a/ml-proto/src/spec/values.ml → ml-proto/spec/values.ml b/ml-proto/src/spec/values.ml → ml-proto/spec/values.ml
diff --git a/ml-proto/travis/build-test.sh b/ml-proto/travis/build-test.sh
@@ -7,12 +7,8 @@ set -x
 # from anywhere.
 cd $(dirname ${BASH_SOURCE[0]})/..
 
-export PATH=$PWD/ocaml/install/bin:$PATH
-
-cd src
+export PATH=$PWD/../ocaml/install/bin:$PATH
 
 ocamlbuild -libs "bigarray, str" -Is "given, spec, host" main.native
 
-cd ..
-
 ./runtests.py
diff --git a/ml-proto/travis/install-ocaml.sh b/ml-proto/travis/install-ocaml.sh
@@ -3,8 +3,11 @@
 set -e
 
 # Move to a location relative to the script so it runs
-# from anywhere.
-cd $(dirname ${BASH_SOURCE[0]})/..
+# from anywhere. Go two levels down to get out of ml-proto
+# and into the top-level dir, since we'll run ocamlbuild
+# inside of ml-proto and it goes pear-shaped if it
+# encounters ocaml's own build directory.
+cd $(dirname ${BASH_SOURCE[0]})/../..
 
 rm -rf ocaml
 mkdir ocaml