From: mzp Date: Fri, 4 Sep 2009 08:38:29 +0000 (+0900) Subject: merge src/ and test/ at xml/ X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d540e5465af37ad607c3e940721ceef83547f035;p=happyabc%2Fhappyabc.git merge src/ and test/ at xml/ --- diff --git a/xml/OMakefile b/xml/OMakefile index 7687810..4b03df8 100644 --- a/xml/OMakefile +++ b/xml/OMakefile @@ -1,11 +1,45 @@ -.PHONY: check clean +# ------------------------------ +# BUILD +# ------------------------------ +# package +OCAMLPACKS[] = + extlib + xml-light + oUnit +UseCamlp4(pa_oo) -OCAMLINCLUDES += $(ROOT)/base/src -OCAML_LIBS += $(ROOT)/base/src/base +FILES[] = + abc + byte + code + disasm + easyXml + swfmill + parsec + code -.SUBDIRS: test src +OCAMLINCLUDES += $(ROOT)/base +OCAML_LIBS += $(ROOT)/base/base -.DEFAULT: src/habc-xml$(EXE) +PROGRAM = habc-xml + +OCamlProgram($(PROGRAM), main $(FILES)) + + +# ------------------------------ +# Test +# ------------------------------ +OUnitTest(byte ,byte parsec) +OUnitTest(abc ,abc parsec disasm byte) +OUnitTest(swfmill,swfmill easyXml abc code byte disasm parsec) +OUnitTest(code ,code easyXml) + + +# ------------------------------ +# PHONY target +# ------------------------------ +.PHONY: clean clean: - ocaml-clean habc-xml$(EXE) + ocaml-clean + diff --git a/xml/src/abc.ml b/xml/abc.ml similarity index 100% rename from xml/src/abc.ml rename to xml/abc.ml diff --git a/xml/test/abcTest.ml b/xml/abcTest.ml similarity index 97% rename from xml/test/abcTest.ml rename to xml/abcTest.ml index 50c48d9..e47b05b 100644 --- a/xml/test/abcTest.ml +++ b/xml/abcTest.ml @@ -6,7 +6,7 @@ let ok x y = let example name = let ch = - open_in_bin @@ Printf.sprintf "../example/%s.abc" name in + open_in_bin @@ Printf.sprintf "example/%s.abc" name in Abc.of_stream @@ Byte.of_channel ch let abc = diff --git a/xml/src/byte.ml b/xml/byte.ml similarity index 100% rename from xml/src/byte.ml rename to xml/byte.ml diff --git a/xml/test/byteTest.ml b/xml/byteTest.ml similarity index 100% rename from xml/test/byteTest.ml rename to xml/byteTest.ml diff --git a/xml/src/code.ml b/xml/code.ml similarity index 100% rename from xml/src/code.ml rename to xml/code.ml diff --git a/xml/test/codeTest.ml b/xml/codeTest.ml similarity index 100% rename from xml/test/codeTest.ml rename to xml/codeTest.ml diff --git a/xml/src/disasm.ml b/xml/disasm.ml similarity index 100% rename from xml/src/disasm.ml rename to xml/disasm.ml diff --git a/xml/src/easyXml.ml b/xml/easyXml.ml similarity index 100% rename from xml/src/easyXml.ml rename to xml/easyXml.ml diff --git a/xml/src/main.ml b/xml/main.ml similarity index 100% rename from xml/src/main.ml rename to xml/main.ml diff --git a/xml/src/parsec.ml b/xml/parsec.ml similarity index 100% rename from xml/src/parsec.ml rename to xml/parsec.ml diff --git a/xml/src/swfmill.ml b/xml/swfmill.ml similarity index 100% rename from xml/src/swfmill.ml rename to xml/swfmill.ml diff --git a/xml/test/swfmillTest.ml b/xml/swfmillTest.ml similarity index 97% rename from xml/test/swfmillTest.ml rename to xml/swfmillTest.ml index c8cd1a1..28166ac 100644 --- a/xml/test/swfmillTest.ml +++ b/xml/swfmillTest.ml @@ -5,7 +5,7 @@ open EasyXml let example name = let ch = - open_in_bin @@ Printf.sprintf "../example/%s.abc" name in + open_in_bin @@ Printf.sprintf "example/%s.abc" name in Abc.of_stream @@ Byte.of_channel ch let ok x y = diff --git a/xml/test/testSupport.ml b/xml/testSupport.ml similarity index 100% rename from xml/test/testSupport.ml rename to xml/testSupport.ml