diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.build | 7 | ||||
| -rw-r--r-- | ide/coqidetop.mllib | 6 | ||||
| -rw-r--r-- | ide/ide.mllib | 7 | ||||
| -rw-r--r-- | ide/richprinter.ml (renamed from printing/richprinter.ml) | 0 | ||||
| -rw-r--r-- | ide/richprinter.mli (renamed from printing/richprinter.mli) | 0 | ||||
| -rw-r--r-- | ide/serialize.ml (renamed from lib/serialize.ml) | 0 | ||||
| -rw-r--r-- | ide/serialize.mli (renamed from lib/serialize.mli) | 0 | ||||
| -rw-r--r-- | ide/xml_lexer.mli (renamed from lib/xml_lexer.mli) | 0 | ||||
| -rw-r--r-- | ide/xml_lexer.mll (renamed from lib/xml_lexer.mll) | 0 | ||||
| -rw-r--r-- | ide/xml_parser.ml (renamed from lib/xml_parser.ml) | 0 | ||||
| -rw-r--r-- | ide/xml_parser.mli (renamed from lib/xml_parser.mli) | 0 | ||||
| -rw-r--r-- | ide/xml_printer.ml (renamed from lib/xml_printer.ml) | 0 | ||||
| -rw-r--r-- | ide/xml_printer.mli (renamed from lib/xml_printer.mli) | 0 | ||||
| -rw-r--r-- | lib/clib.mllib | 4 | ||||
| -rw-r--r-- | printing/printing.mllib | 1 |
16 files changed, 19 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 4f8c019f4..06cac2fee 100644 --- a/.gitignore +++ b/.gitignore @@ -112,7 +112,7 @@ tools/coqwc.ml tools/coqdep_lexer.ml tools/ocamllibdep.ml tools/coqdoc/cpretty.ml -lib/xml_lexer.ml +ide/xml_lexer.ml # .ml4 files diff --git a/Makefile.build b/Makefile.build index 10926daa1..4fac65df7 100644 --- a/Makefile.build +++ b/Makefile.build @@ -729,7 +729,12 @@ $(COQWORKMGR): $(addsuffix $(BESTOBJ), stm/coqworkmgrApi tools/coqworkmgr) \ # fake_ide : for debugging or test-suite purpose, a fake ide simulating # a connection to coqtop -ideslave -$(FAKEIDE): lib/clib$(BESTLIB) lib/xml_lexer$(BESTOBJ) lib/xml_parser$(BESTOBJ) lib/xml_printer$(BESTOBJ) lib/errors$(BESTOBJ) lib/spawn$(BESTOBJ) ide/document$(BESTOBJ) ide/xmlprotocol$(BESTOBJ) tools/fake_ide$(BESTOBJ) | $(IDETOPLOOPCMA:.cma=$(BESTDYN)) +$(FAKEIDE): lib/clib$(BESTLIB) lib/errors$(BESTOBJ) \ + lib/spawn$(BESTOBJ) ide/document$(BESTOBJ) \ + ide/serialize$(BESTOBJ) ide/xml_lexer$(BESTOBJ) \ + ide/xml_parser$(BESTOBJ) ide/xml_printer$(BESTOBJ) \ + ide/xmlprotocol$(BESTOBJ) tools/fake_ide$(BESTOBJ) | \ + $(IDETOPLOOPCMA:.cma=$(BESTDYN)) $(SHOW)'OCAMLBEST -o $@' $(HIDE)$(call bestocaml,-I ide,str unix threads) diff --git a/ide/coqidetop.mllib b/ide/coqidetop.mllib index c97c6d1cd..ed1fa465d 100644 --- a/ide/coqidetop.mllib +++ b/ide/coqidetop.mllib @@ -1,3 +1,9 @@ +Xml_lexer +Xml_parser +Xml_printer +Serialize +Richprinter Xmlprotocol Texmacspp +Document Ide_slave diff --git a/ide/ide.mllib b/ide/ide.mllib index 83b314283..b2f32fcf7 100644 --- a/ide/ide.mllib +++ b/ide/ide.mllib @@ -14,8 +14,13 @@ Config_lexer Utf8_convert Preferences Project_file -Ideutils +Serialize +Richprinter +Xml_lexer +Xml_parser +Xml_printer Xmlprotocol +Ideutils Coq Coq_lex Sentence diff --git a/printing/richprinter.ml b/ide/richprinter.ml index 5f39f36ea..5f39f36ea 100644 --- a/printing/richprinter.ml +++ b/ide/richprinter.ml diff --git a/printing/richprinter.mli b/ide/richprinter.mli index c9e84e3eb..c9e84e3eb 100644 --- a/printing/richprinter.mli +++ b/ide/richprinter.mli diff --git a/lib/serialize.ml b/ide/serialize.ml index 685ec6049..685ec6049 100644 --- a/lib/serialize.ml +++ b/ide/serialize.ml diff --git a/lib/serialize.mli b/ide/serialize.mli index d7c14e7e7..d7c14e7e7 100644 --- a/lib/serialize.mli +++ b/ide/serialize.mli diff --git a/lib/xml_lexer.mli b/ide/xml_lexer.mli index e61cb055f..e61cb055f 100644 --- a/lib/xml_lexer.mli +++ b/ide/xml_lexer.mli diff --git a/lib/xml_lexer.mll b/ide/xml_lexer.mll index 290f2c89a..290f2c89a 100644 --- a/lib/xml_lexer.mll +++ b/ide/xml_lexer.mll diff --git a/lib/xml_parser.ml b/ide/xml_parser.ml index 8db3f9e8b..8db3f9e8b 100644 --- a/lib/xml_parser.ml +++ b/ide/xml_parser.ml diff --git a/lib/xml_parser.mli b/ide/xml_parser.mli index ac2eab352..ac2eab352 100644 --- a/lib/xml_parser.mli +++ b/ide/xml_parser.mli diff --git a/lib/xml_printer.ml b/ide/xml_printer.ml index e7e4d0ceb..e7e4d0ceb 100644 --- a/lib/xml_printer.ml +++ b/ide/xml_printer.ml diff --git a/lib/xml_printer.mli b/ide/xml_printer.mli index f24f51fff..f24f51fff 100644 --- a/lib/xml_printer.mli +++ b/ide/xml_printer.mli diff --git a/lib/clib.mllib b/lib/clib.mllib index c3ec4a696..95007c52a 100644 --- a/lib/clib.mllib +++ b/lib/clib.mllib @@ -21,7 +21,6 @@ Control Loc CList CString -Serialize Deque CObj CArray @@ -33,9 +32,6 @@ Ppstyle Xml_datatype Richpp Feedback -Xml_lexer -Xml_parser -Xml_printer CUnix Envars Aux_file diff --git a/printing/printing.mllib b/printing/printing.mllib index 652a34fa1..52102e1d3 100644 --- a/printing/printing.mllib +++ b/printing/printing.mllib @@ -10,4 +10,3 @@ Printmod Prettyp Ppvernac Ppvernacsig -Richprinter |