Move sources to src/ subdirectory

ocaml · Apr 16, 2013 · 47f759e · 47f759e
1 parent b5763c3
commit 47f759e
Show file tree

Hide file tree

Showing 124 changed files with 19 additions and 21 deletions.
diff --git a/.merlin b/.merlin
@@ -1,10 +1,10 @@
-S .
-S parsing
-S typing
-S utils
-B _build
-B _build/parsing
-B _build/typing
-B _build/utils
+S src/.
+S src/parsing
+S src/typing
+S src/utils
+B _build/src
+B _build/src/parsing
+B _build/src/typing
+B _build/src/utils
 PKG findlib
 PKG yojson
diff --git a/Makefile b/Makefile
@@ -1,34 +1,32 @@
-include Makefile.config
+-include Makefile.config
 
 TARGET = ocamlmerlin.native
 
 DISTNAME = ocamlmerlin-0.1
 DISTFILES = configure Makefile README _tags vim emacs $(wildcard *.ml *.mli *.mly *.mll)
 
-OCAMLBUILD=ocamlbuild -Is .,typing,parsing,utils
+OCAMLBUILD=ocamlbuild -Is src,src/typing,src/parsing,src/utils
 OCAMLFIND=ocamlfind
 
 all: $(TARGET)
 
-$(TARGET):
+src/myocamlbuild_config.ml:
+	@echo "Please run ./configure"
+	@false
+
+$(TARGET): src/myocamlbuild_config.ml
 	$(OCAMLBUILD) -use-ocamlfind $@
 
-.PHONY: $(TARGET) all clean dist distclean install uninstall
+.PHONY: $(TARGET) all clean distclean install uninstall
 
 clean:
 	$(OCAMLBUILD) -clean
 
 check: $(TARGET)
 	./test.sh
 
-dist:
-	mkdir $(DISTNAME)
-	cp -r $(DISTFILES) $(DISTNAME)
-	tar cvzf $(DISTNAME).tar.gz $(DISTNAME)
-	rm -rf $(DISTNAME)
-
 distclean: clean
-	rm -f Makefile.config $(DISTNAME).tar.gz
+	rm -f Makefile.config src/myocamlbuild_config.ml
 
 install: $(TARGET)
 	install -dv $(BIN_DIR)

diff --git a/_tags b/_tags
@@ -2,4 +2,4 @@ true: use_menhir, use_menhir_table
 
 true: package(menhirLib), package(yojson), package(findlib)
 
-<outline_parser.*>: ext_tokens
+<src/outline_parser.*>: ext_tokens
diff --git a/configure b/configure
@@ -75,7 +75,7 @@ if [ -d "$STDLIB_DIR" ]; then
 BIN_DIR=$BIN_DIR
 SHARE_DIR=$SHARE_DIR
 END
-  cat >myocamlbuild_config.ml <<END
+  cat >src/myocamlbuild_config.ml <<END
 let libdir = "$STDLIB_DIR";;
 END
   if [ "$EXIT" -eq 0 ]; then

diff --git a/browse.ml → src/browse.ml b/browse.ml → src/browse.ml
diff --git a/browse.mli → src/browse.mli b/browse.mli → src/browse.mli
diff --git a/browse_misc.ml → src/browse_misc.ml b/browse_misc.ml → src/browse_misc.ml
diff --git a/chunk.ml → src/chunk.ml b/chunk.ml → src/chunk.ml
diff --git a/chunk.mli → src/chunk.mli b/chunk.mli → src/chunk.mli
diff --git a/chunk_parser.mly → src/chunk_parser.mly b/chunk_parser.mly → src/chunk_parser.mly
diff --git a/chunk_parser_utils.ml → src/chunk_parser_utils.ml b/chunk_parser_utils.ml → src/chunk_parser_utils.ml
diff --git a/chunk_parser_utils.mli → src/chunk_parser_utils.mli b/chunk_parser_utils.mli → src/chunk_parser_utils.mli
diff --git a/command.ml → src/command.ml b/command.ml → src/command.ml
diff --git a/command.mli → src/command.mli b/command.mli → src/command.mli
diff --git a/error_report.ml → src/error_report.ml b/error_report.ml → src/error_report.ml
diff --git a/error_report.mli → src/error_report.mli b/error_report.mli → src/error_report.mli
diff --git a/extensions.ml → src/extensions.ml b/extensions.ml → src/extensions.ml
diff --git a/extensions.mli → src/extensions.mli b/extensions.mli → src/extensions.mli
diff --git a/fake.ml → src/fake.ml b/fake.ml → src/fake.ml
diff --git a/fake.mli → src/fake.mli b/fake.mli → src/fake.mli
diff --git a/history.ml → src/history.ml b/history.ml → src/history.ml
diff --git a/history.mli → src/history.mli b/history.mli → src/history.mli
diff --git a/json.ml → src/json.ml b/json.ml → src/json.ml
diff --git a/json.mli → src/json.mli b/json.mli → src/json.mli
diff --git a/lexer.mli → src/lexer.mli b/lexer.mli → src/lexer.mli
diff --git a/lexer.mll → src/lexer.mll b/lexer.mll → src/lexer.mll
diff --git a/main_args.ml → src/main_args.ml b/main_args.ml → src/main_args.ml
diff --git a/main_args.mli → src/main_args.mli b/main_args.mli → src/main_args.mli
diff --git a/ocamlmerlin.ml → src/ocamlmerlin.ml b/ocamlmerlin.ml → src/ocamlmerlin.ml
diff --git a/outline.ml → src/outline.ml b/outline.ml → src/outline.ml
diff --git a/outline.mli → src/outline.mli b/outline.mli → src/outline.mli
diff --git a/outline_parser.mly → src/outline_parser.mly b/outline_parser.mly → src/outline_parser.mly
diff --git a/outline_utils.ml → src/outline_utils.ml b/outline_utils.ml → src/outline_utils.ml
diff --git a/outline_utils.mli → src/outline_utils.mli b/outline_utils.mli → src/outline_utils.mli
diff --git a/parsing/asttypes.mli → src/parsing/asttypes.mli b/parsing/asttypes.mli → src/parsing/asttypes.mli
diff --git a/parsing/location.ml → src/parsing/location.ml b/parsing/location.ml → src/parsing/location.ml
diff --git a/parsing/location.mli → src/parsing/location.mli b/parsing/location.mli → src/parsing/location.mli
diff --git a/parsing/longident.ml → src/parsing/longident.ml b/parsing/longident.ml → src/parsing/longident.ml
diff --git a/parsing/longident.mli → src/parsing/longident.mli b/parsing/longident.mli → src/parsing/longident.mli
diff --git a/parsing/parse.ml → src/parsing/parse.ml b/parsing/parse.ml → src/parsing/parse.ml
diff --git a/parsing/parse.mli → src/parsing/parse.mli b/parsing/parse.mli → src/parsing/parse.mli
diff --git a/parsing/parsetree.mli → src/parsing/parsetree.mli b/parsing/parsetree.mli → src/parsing/parsetree.mli
diff --git a/parsing/printast.ml → src/parsing/printast.ml b/parsing/printast.ml → src/parsing/printast.ml
diff --git a/parsing/printast.mli → src/parsing/printast.mli b/parsing/printast.mli → src/parsing/printast.mli
diff --git a/parsing/syntaxerr.ml → src/parsing/syntaxerr.ml b/parsing/syntaxerr.ml → src/parsing/syntaxerr.ml
diff --git a/parsing/syntaxerr.mli → src/parsing/syntaxerr.mli b/parsing/syntaxerr.mli → src/parsing/syntaxerr.mli
diff --git a/protocol.ml → src/protocol.ml b/protocol.ml → src/protocol.ml
diff --git a/protocol.mli → src/protocol.mli b/protocol.mli → src/protocol.mli
diff --git a/state.ml → src/state.ml b/state.ml → src/state.ml
diff --git a/state.mli → src/state.mli b/state.mli → src/state.mli
diff --git a/typer.ml → src/typer.ml b/typer.ml → src/typer.ml
diff --git a/typer.mli → src/typer.mli b/typer.mli → src/typer.mli
diff --git a/typing/annot.mli → src/typing/annot.mli b/typing/annot.mli → src/typing/annot.mli
diff --git a/typing/btype.ml → src/typing/btype.ml b/typing/btype.ml → src/typing/btype.ml
diff --git a/typing/btype.mli → src/typing/btype.mli b/typing/btype.mli → src/typing/btype.mli
diff --git a/typing/cmi_format.ml → src/typing/cmi_format.ml b/typing/cmi_format.ml → src/typing/cmi_format.ml
diff --git a/typing/cmi_format.mli → src/typing/cmi_format.mli b/typing/cmi_format.mli → src/typing/cmi_format.mli
diff --git a/typing/cmt_format.ml → src/typing/cmt_format.ml b/typing/cmt_format.ml → src/typing/cmt_format.ml
diff --git a/typing/cmt_format.mli → src/typing/cmt_format.mli b/typing/cmt_format.mli → src/typing/cmt_format.mli
diff --git a/typing/ctype.ml → src/typing/ctype.ml b/typing/ctype.ml → src/typing/ctype.ml
diff --git a/typing/ctype.mli → src/typing/ctype.mli b/typing/ctype.mli → src/typing/ctype.mli
diff --git a/typing/datarepr.ml → src/typing/datarepr.ml b/typing/datarepr.ml → src/typing/datarepr.ml
diff --git a/typing/datarepr.mli → src/typing/datarepr.mli b/typing/datarepr.mli → src/typing/datarepr.mli
diff --git a/typing/env.ml → src/typing/env.ml b/typing/env.ml → src/typing/env.ml
diff --git a/typing/env.mli → src/typing/env.mli b/typing/env.mli → src/typing/env.mli
diff --git a/typing/ident.ml → src/typing/ident.ml b/typing/ident.ml → src/typing/ident.ml
diff --git a/typing/ident.mli → src/typing/ident.mli b/typing/ident.mli → src/typing/ident.mli
diff --git a/typing/includeclass.ml → src/typing/includeclass.ml b/typing/includeclass.ml → src/typing/includeclass.ml
diff --git a/typing/includeclass.mli → src/typing/includeclass.mli b/typing/includeclass.mli → src/typing/includeclass.mli
diff --git a/typing/includecore.ml → src/typing/includecore.ml b/typing/includecore.ml → src/typing/includecore.ml
diff --git a/typing/includecore.mli → src/typing/includecore.mli b/typing/includecore.mli → src/typing/includecore.mli
diff --git a/typing/includemod.ml → src/typing/includemod.ml b/typing/includemod.ml → src/typing/includemod.ml
diff --git a/typing/includemod.mli → src/typing/includemod.mli b/typing/includemod.mli → src/typing/includemod.mli
diff --git a/typing/mtype.ml → src/typing/mtype.ml b/typing/mtype.ml → src/typing/mtype.ml
diff --git a/typing/mtype.mli → src/typing/mtype.mli b/typing/mtype.mli → src/typing/mtype.mli
diff --git a/typing/oprint.ml → src/typing/oprint.ml b/typing/oprint.ml → src/typing/oprint.ml
diff --git a/typing/oprint.mli → src/typing/oprint.mli b/typing/oprint.mli → src/typing/oprint.mli
diff --git a/typing/outcometree.mli → src/typing/outcometree.mli b/typing/outcometree.mli → src/typing/outcometree.mli
diff --git a/typing/parmatch.ml → src/typing/parmatch.ml b/typing/parmatch.ml → src/typing/parmatch.ml
diff --git a/typing/parmatch.mli → src/typing/parmatch.mli b/typing/parmatch.mli → src/typing/parmatch.mli
diff --git a/typing/path.ml → src/typing/path.ml b/typing/path.ml → src/typing/path.ml
diff --git a/typing/path.mli → src/typing/path.mli b/typing/path.mli → src/typing/path.mli
diff --git a/typing/predef.ml → src/typing/predef.ml b/typing/predef.ml → src/typing/predef.ml
diff --git a/typing/predef.mli → src/typing/predef.mli b/typing/predef.mli → src/typing/predef.mli
diff --git a/typing/primitive.ml → src/typing/primitive.ml b/typing/primitive.ml → src/typing/primitive.ml
diff --git a/typing/primitive.mli → src/typing/primitive.mli b/typing/primitive.mli → src/typing/primitive.mli
diff --git a/typing/printtyp.ml → src/typing/printtyp.ml b/typing/printtyp.ml → src/typing/printtyp.ml
diff --git a/typing/printtyp.mli → src/typing/printtyp.mli b/typing/printtyp.mli → src/typing/printtyp.mli
diff --git a/typing/printtyped.ml → src/typing/printtyped.ml b/typing/printtyped.ml → src/typing/printtyped.ml
diff --git a/typing/printtyped.mli → src/typing/printtyped.mli b/typing/printtyped.mli → src/typing/printtyped.mli
diff --git a/typing/stypes.ml → src/typing/stypes.ml b/typing/stypes.ml → src/typing/stypes.ml
diff --git a/typing/stypes.mli → src/typing/stypes.mli b/typing/stypes.mli → src/typing/stypes.mli
diff --git a/typing/subst.ml → src/typing/subst.ml b/typing/subst.ml → src/typing/subst.ml
diff --git a/typing/subst.mli → src/typing/subst.mli b/typing/subst.mli → src/typing/subst.mli
diff --git a/typing/typeclass.ml → src/typing/typeclass.ml b/typing/typeclass.ml → src/typing/typeclass.ml
diff --git a/typing/typeclass.mli → src/typing/typeclass.mli b/typing/typeclass.mli → src/typing/typeclass.mli
diff --git a/typing/typecore.ml → src/typing/typecore.ml b/typing/typecore.ml → src/typing/typecore.ml
diff --git a/typing/typecore.mli → src/typing/typecore.mli b/typing/typecore.mli → src/typing/typecore.mli
diff --git a/typing/typedecl.ml → src/typing/typedecl.ml b/typing/typedecl.ml → src/typing/typedecl.ml
diff --git a/typing/typedecl.mli → src/typing/typedecl.mli b/typing/typedecl.mli → src/typing/typedecl.mli
diff --git a/typing/typedtree.ml → src/typing/typedtree.ml b/typing/typedtree.ml → src/typing/typedtree.ml
diff --git a/typing/typedtree.mli → src/typing/typedtree.mli b/typing/typedtree.mli → src/typing/typedtree.mli
diff --git a/typing/typemod.ml → src/typing/typemod.ml b/typing/typemod.ml → src/typing/typemod.ml
diff --git a/typing/typemod.mli → src/typing/typemod.mli b/typing/typemod.mli → src/typing/typemod.mli
diff --git a/typing/types.ml → src/typing/types.ml b/typing/types.ml → src/typing/types.ml
diff --git a/typing/types.mli → src/typing/types.mli b/typing/types.mli → src/typing/types.mli
diff --git a/typing/typetexp.ml → src/typing/typetexp.ml b/typing/typetexp.ml → src/typing/typetexp.ml
diff --git a/typing/typetexp.mli → src/typing/typetexp.mli b/typing/typetexp.mli → src/typing/typetexp.mli
diff --git a/utils/ccomp.ml → src/utils/ccomp.ml b/utils/ccomp.ml → src/utils/ccomp.ml
diff --git a/utils/ccomp.mli → src/utils/ccomp.mli b/utils/ccomp.mli → src/utils/ccomp.mli
diff --git a/utils/clflags.ml → src/utils/clflags.ml b/utils/clflags.ml → src/utils/clflags.ml
diff --git a/utils/clflags.mli → src/utils/clflags.mli b/utils/clflags.mli → src/utils/clflags.mli
diff --git a/utils/config.ml → src/utils/config.ml b/utils/config.ml → src/utils/config.ml
diff --git a/utils/config.mli → src/utils/config.mli b/utils/config.mli → src/utils/config.mli
diff --git a/utils/consistbl.ml → src/utils/consistbl.ml b/utils/consistbl.ml → src/utils/consistbl.ml
diff --git a/utils/consistbl.mli → src/utils/consistbl.mli b/utils/consistbl.mli → src/utils/consistbl.mli
diff --git a/utils/misc.ml → src/utils/misc.ml b/utils/misc.ml → src/utils/misc.ml
diff --git a/utils/misc.mli → src/utils/misc.mli b/utils/misc.mli → src/utils/misc.mli
diff --git a/utils/tbl.ml → src/utils/tbl.ml b/utils/tbl.ml → src/utils/tbl.ml
diff --git a/utils/tbl.mli → src/utils/tbl.mli b/utils/tbl.mli → src/utils/tbl.mli
diff --git a/utils/terminfo.ml → src/utils/terminfo.ml b/utils/terminfo.ml → src/utils/terminfo.ml
diff --git a/utils/terminfo.mli → src/utils/terminfo.mli b/utils/terminfo.mli → src/utils/terminfo.mli
diff --git a/utils/warnings.ml → src/utils/warnings.ml b/utils/warnings.ml → src/utils/warnings.ml
diff --git a/utils/warnings.mli → src/utils/warnings.mli b/utils/warnings.mli → src/utils/warnings.mli