From c619942033c23398a83907b298779793294be137 Mon Sep 17 00:00:00 2001 From: mzp Date: Fri, 4 Sep 2009 17:35:49 +0900 Subject: [PATCH] merge src/ and test/ at driver/ --- driver/OMakefile | 40 +++++++++++++++++++++++++++++++--------- driver/{src => }/cmdOpt.ml | 0 driver/{src => }/cmdOpt.mli | 0 driver/{src => }/color.ml | 0 driver/{src => }/color.mli | 0 driver/{test => }/colorTest.ml | 0 driver/{test => }/hello.ml | 0 driver/{src => }/main.ml | 0 driver/{src => }/rule.ml | 0 driver/{src => }/rule.mli | 0 driver/{test => }/ruleTest.ml | 0 driver/src/.ocamlinit | 9 --------- driver/src/OMakefile | 23 ----------------------- driver/test/.ocamlinit | 11 ----------- driver/test/OMakefile | 16 ---------------- 15 files changed, 31 insertions(+), 68 deletions(-) rename driver/{src => }/cmdOpt.ml (100%) rename driver/{src => }/cmdOpt.mli (100%) rename driver/{src => }/color.ml (100%) rename driver/{src => }/color.mli (100%) rename driver/{test => }/colorTest.ml (100%) rename driver/{test => }/hello.ml (100%) rename driver/{src => }/main.ml (100%) rename driver/{src => }/rule.ml (100%) rename driver/{src => }/rule.mli (100%) rename driver/{test => }/ruleTest.ml (100%) delete mode 100644 driver/src/.ocamlinit delete mode 100644 driver/src/OMakefile delete mode 100644 driver/test/.ocamlinit delete mode 100644 driver/test/OMakefile diff --git a/driver/OMakefile b/driver/OMakefile index 1923a8d..6c843c7 100644 --- a/driver/OMakefile +++ b/driver/OMakefile @@ -1,14 +1,36 @@ -# Build -OCAMLINCLUDES += $(ROOT)/base/src -OCAML_LIBS += $(ROOT)/base/src/base +# ------------------------------ +# BUILD +# ------------------------------ +OCAMLPACKS[] = + extlib + str + unix + oUnit -.SUBDIRS: test src +OCAMLINCLUDES += $(ROOT)/base +OCAML_LIBS += $(ROOT)/base/base -habc$(EXE): src/habc$(EXE) - ln-or-cp $^ $@ +FILES[] = + rule + cmdOpt + color + $(ROOT)/config +PROGRAM = habc -# PHONY -.DEFAULT: habc$(EXE) +OCamlProgram($(PROGRAM), main $(FILES)) + +# ------------------------------ +# Test +# ------------------------------ +OUnitTest(color,color) +OUnitTest(rule ,rule) + + +# ------------------------------ +# phony target +# ------------------------------ .PHONY: clean + +.DEFAULT: $(PROGRAM)$(EXE) clean: - ocaml-clean habc$(EXE) + ocaml-clean $(PROGRAM) diff --git a/driver/src/cmdOpt.ml b/driver/cmdOpt.ml similarity index 100% rename from driver/src/cmdOpt.ml rename to driver/cmdOpt.ml diff --git a/driver/src/cmdOpt.mli b/driver/cmdOpt.mli similarity index 100% rename from driver/src/cmdOpt.mli rename to driver/cmdOpt.mli diff --git a/driver/src/color.ml b/driver/color.ml similarity index 100% rename from driver/src/color.ml rename to driver/color.ml diff --git a/driver/src/color.mli b/driver/color.mli similarity index 100% rename from driver/src/color.mli rename to driver/color.mli diff --git a/driver/test/colorTest.ml b/driver/colorTest.ml similarity index 100% rename from driver/test/colorTest.ml rename to driver/colorTest.ml diff --git a/driver/test/hello.ml b/driver/hello.ml similarity index 100% rename from driver/test/hello.ml rename to driver/hello.ml diff --git a/driver/src/main.ml b/driver/main.ml similarity index 100% rename from driver/src/main.ml rename to driver/main.ml diff --git a/driver/src/rule.ml b/driver/rule.ml similarity index 100% rename from driver/src/rule.ml rename to driver/rule.ml diff --git a/driver/src/rule.mli b/driver/rule.mli similarity index 100% rename from driver/src/rule.mli rename to driver/rule.mli diff --git a/driver/test/ruleTest.ml b/driver/ruleTest.ml similarity index 100% rename from driver/test/ruleTest.ml rename to driver/ruleTest.ml diff --git a/driver/src/.ocamlinit b/driver/src/.ocamlinit deleted file mode 100644 index 00a8b19..0000000 --- a/driver/src/.ocamlinit +++ /dev/null @@ -1,9 +0,0 @@ -#use "topfind";; -#directory "../../base";; -#load "base.cma";; -#require "extlib";; -#require "unix";; -#require "str";; -#load "rule.cmo";; -#load "cmdOpt.cmo";; -#camlp4o;; \ No newline at end of file diff --git a/driver/src/OMakefile b/driver/src/OMakefile deleted file mode 100644 index 0ccf4e0..0000000 --- a/driver/src/OMakefile +++ /dev/null @@ -1,23 +0,0 @@ -# package -OCAMLPACKS[] = - extlib - str - unix - -# Build an OCaml program -FILES[] = - rule - cmdOpt - color - $(ROOT)/config -PROGRAM = habc - -OCamlProgram($(PROGRAM), main $(FILES)) -OCamlLibrary($(PROGRAM), $(FILES)) - -# phony target -.PHONY: clean - -.DEFAULT: $(PROGRAM)$(EXE) -clean: - ocaml-clean $(PROGRAM) diff --git a/driver/test/.ocamlinit b/driver/test/.ocamlinit deleted file mode 100644 index 25b3b6f..0000000 --- a/driver/test/.ocamlinit +++ /dev/null @@ -1,11 +0,0 @@ -#use "topfind";; -#directory "../../base";; -#load "base.cma";; - -#require "extlib";; -#require "unix";; -#require "str";; -#require "oUnit";; - -#directory "../src";; -#load "habc.cma";; diff --git a/driver/test/OMakefile b/driver/test/OMakefile deleted file mode 100644 index ea2ed03..0000000 --- a/driver/test/OMakefile +++ /dev/null @@ -1,16 +0,0 @@ -# package -OCAMLPACKS[] = - extlib - str - oUnit - -# build -OCAMLINCLUDES += ../src -OUnitTest(color,color) -OUnitTest(rule ,rule) - -# PHONY TARGET -.PHONY: check clean -clean: - ocaml-clean - -- 2.11.0