--- messaging/manakai/t/Makefile	2006/01/07 12:30:57	1.8
+++ messaging/manakai/t/Makefile	2006/05/04 13:07:19	1.30
@@ -4,12 +4,15 @@
 MANAKAI_TEST_DIR = $(MANAKAI_ROOT_DIR)t/
 
 DIS_SUFFIX = .dis
-DAC_SUFFIX = .dae
-DAEM_SUFFIX = .daem
+DAEM_SUFFIX = .dafm
+DAFX_SUFFIX = .dafx
+PM_SUFFIX = .pm
+PT_SUFFIX = .t
 
 CD = cd
 MAKE = make
 MKDIR = mkdir -p
+ECHO = echo
 
 RM = rm
 RMALL = $(RM) -fv
@@ -18,22 +21,29 @@
 INST_ARCHLIB = $(MANAKAI_ROOT_DIR)blib/arch
 INST_LIB = $(MANAKAI_ROOT_DIR)blib/lib
 
-PERL_OPTIONS =
 PERL = perl
-PERL_ = $(PERL) $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR)
-PERLC = $(PERL) -c
-PERLC_ = $(PERLC) $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR)
-PERL_TEST_ = $(PERL) \
-             $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR) \
+PERL_OPTIONS =
+PERL_OPTIONS_ALL = $(PERL_OPTIONS) -I$(MANAKAI_LIB_DIR)
+PERL_ = $(PERL) $(PERL_OPTIONS_ALL)
+PERLC = $(PERL) -c -w
+PERLC_OPTIONS = 
+PERLC_OPTIONS_ALL = $(PERLC_OPTIONS) -I$(MANAKAI_LIB_DIR)
+PERL_CHK = $(PERLC) $(PERLC_OPTIONS_ALL)
+PERL_TEST_ = $(PERL) $(PERL_OPTIONS_ALL) \
              -MExtUtils::Command::MM \
              -e "test_harness ($(TEST_VERBOSE), '$(INST_LIB)', \
                                       '$(INST_ARCHLIB)')"
 
 DIS_OPTIONS = 
 DIS_OPTIONS_ALL = $(DIS_OPTIONS) \
-  --search-path-catalog-file-name="$(MANAKAI_LIB_DIR)manakai/dis-catalog" \
-  --dis-file-suffix="$(DIS_SUFFIX)" \
-  --daem-file-suffix="$(DAEM_SUFFIX)"
+      --search-path-catalog-file-name="$(MANAKAI_LIB_DIR)manakai/dis-catalog" \
+      --dis-file-suffix="$(DIS_SUFFIX)" \
+      --daem-file-suffix="$(DAEM_SUFFIX)" \
+      --dafx-file-suffix="$(DAFX_SUFFIX)"
+
+DAF_OPTIONS =
+DAF_PL = $(MANAKAI_BIN_DIR)daf.pl
+DAF = $(PERL_) $(DAF_PL) $(DAF_OPTIONS) $(DIS_OPTIONS_ALL)
 
 DOMTEST_TESTS_DIR = $(MANAKAI_ROOT_DIR)../domts/tests/
 DOMTEST_PERL_DIR = $(MANAKAI_TEST_DIR)dom/
@@ -43,26 +53,47 @@
 DOMTS2PERL = $(PERL_) -I$(MANAKAI_BIN_DIR) $(DOMTS2PERL_PL)
 DOMTEST2PERL_PL = $(MANAKAI_BIN_DIR)domtest2perl.pl
 
-DAC2TEST_OPTIONS = 
-DAC2TEST_PL = $(MANAKAI_BIN_DIR)dac2test.pl
-DAC2TEST = $(PERL_) $(DAC2TEST_PL) $(DAC2TEST_OPTIONS) $(DIS_OPTIONS_ALL)
-
-DOM_FEATURE_DAC = $(MANAKAI_LIB_DIR)Message/DOM/feature$(DAC_SUFFIX)
-DOM_CORE_DAC = $(MANAKAI_LIB_DIR)Message/DOM/core$(DAC_SUFFIX)
-DOM_LS_DAC = $(MANAKAI_LIB_DIR)Message/DOM/ls$(DAC_SUFFIX)
-DOM_DAC_FILES = $(DOM_FEATURE_DAC) $(DOM_CORE_DAC) $(DOM_LS_DAC)
-
-UTIL_PC_DAC = $(MANAKAI_LIB_DIR)Message/Util/pc$(DAC_SUFFIX)
-DIS_CORE_DAC = $(MANAKAI_LIB_DIR)Message/Util/discore$(DAC_SUFFIX)
-
+NS_CHARSET    = http://suika.fam.cx/~wakaba/archive/2005/manakai/Charset/
 NS_MDOM = http://suika.fam.cx/~wakaba/archive/2004/8/18/manakai-dom\#ManakaiDOM.
 NS_MANAKAIDOM = http://suika.fam.cx/~wakaba/archive/2004/8/18/manakai-dom\#
-NS_UTIL = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/
-NS_DIS  = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/DIS\#
+NS_MARKUP     = http://suika.fam.cx/~wakaba/archive/2005/manakai/Markup\#
+NS_URI        = http://suika.fam.cx/~wakaba/archive/2005/manakai/URI/
+NS_UTIL       = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/
+NS_UTIL_DIS   = http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/DIS\#
+
+TEST_PM_FILES = \
+  $(MANAKAI_LIB_DIR)Message/Util/DIS/Test$(PM_SUFFIX)
+
+NS_CHARSET_PT_FILES = \
+  charset-Encode$(PT_SUFFIX)
+NS_MARKUP_PT_FILES = \
+  markup-Atom$(PT_SUFFIX) markup-SuikaWiki$(PT_SUFFIX)
+NS_MDOM_PT_FILES = \
+  dom-DOMFeature$(PT_SUFFIX) dom-GenericLS$(PT_SUFFIX) \
+  dom-DOMCore$(PT_SUFFIX) \
+  dom-TreeCore$(PT_SUFFIX) dom-Document$(PT_SUFFIX) dom-Element$(PT_SUFFIX) \
+  dom-CharacterData$(PT_SUFFIX) dom-XML$(PT_SUFFIX) dom-XDoctype$(PT_SUFFIX) \
+  dom-DOMLS$(PT_SUFFIX) dom-XMLParser$(PT_SUFFIX) \
+  dom-TreeStore$(PT_SUFFIX) \
+  dom-Traversal$(PT_SUFFIX)
+NS_URI_PT_FILES = \
+  uri-Generic$(PT_SUFFIX)
+NS_UTIL_PT_FILES = \
+  util-PerlCode$(PT_SUFFIX) \
+  util-DIS$(PT_SUFFIX)
+NS_UTIL_DIS_PT_FILES = \
+  util-dis-DNLite$(PT_SUFFIX) \
+  util-dis-DPG$(PT_SUFFIX)
+
+UTIL_MNTEST_PM = $(MANAKAI_LIB_DIR)Message/Util/ManakaiNodeTest$(PM_SUFFIX)
+
+PT_FILES = \
+  $(NS_MARKUP_PT_FILES) \
+  $(NS_MDOM_PT_FILES) \
+  $(NS_URI_PT_FILES) \
+  $(NS_UTIL_PT_FILES) $(NS_UTIL_DIS_PT_FILES) util-ManakaiNodeTest$(PT_SUFFIX)
 
-GENERATED_FILES = util-perlcode.t dom-feature.t dom-tree.t dom-genericls.t \
-  dom-core.t dom-xdoctype.t \
-  dom-mdomls2003.t util-dis-dnlite.t
+GENERATED_FILES = $(PT_FILES)
 
 all: $(GENERATED_FILES)
 
@@ -76,50 +107,84 @@
 	MANAKAI_DOMTEST_FILE_DIR=$(DOMTEST_TESTS_DIR)level1/core/files/ \
 	  $(PERL_TEST_) $(DOMTEST_PERL_DIR)level1/core/$(DOMTEST_FILE).pl
 
-test-module-all: test-module-dom test-module-util
-
-test-module-dom: \
-  dom-feature.t \
-  dom-core.t dom-tree.t dom-xdoctype.t \
-  dom-genericls.t \
-  dom-mdomls2003.t
-	$(PERL_TEST_) dom-*.t
-
-dom-feature.t: $(DOM_FEATURE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)DOMFeature" > $@
-
-dom-genericls.t: $(DOM_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)GenericLS" > $@
-
-dom-tree.t: $(DOM_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)Tree" > $@
-
-dom-core.t: $(DOM_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)DOMCore" > $@
+test-module-all: \
+  test-module-charset \
+  test-module-dom \
+  test-module-markup \
+  test-module-uri \
+  test-module-util
+
+test-module-charset: $(NS_CHARSET_PT_FILES) $(TEST_PM_FILES)
+	$(PERL_TEST_) charset-*$(PT_SUFFIX)
+
+$(NS_CHARSET_PT_FILES): charset-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Charset/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_CHARSET)$* $@"
+	$(PERL_CHK) $@
+
+test-module-dom: $(NS_MDOM_PT_FILES) $(TEST_PM_FILES)
+	$(PERL_TEST_) dom-*$(PT_SUFFIX)
+
+$(NS_MDOM_PT_FILES): dom-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/DOM/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_MDOM)$* $@"
+	$(ECHO) "BEGIN {" >> $@
+	$(ECHO) "  require 'manakai/mndebug.pl';" >> $@
+	$(ECHO) "  manakai::mndebug::define_nodestem_destroy ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_nodestem_destroy_all ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_noderef_destroy_all ();" >> $@
+	$(ECHO) "}" >> $@
+	$(PERL_CHK) $@
+
+test-module-markup: $(NS_MARKUP_PT_FILES) $(TEST_PM_FILES)
+	$(PERL_TEST_) markup-*$(PT_SUFFIX)
+
+$(NS_MARKUP_PT_FILES): markup-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Markup/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_MARKUP)$* $@"
+	$(PERL_CHK) $@
+
+test-module-uri: $(NS_URI_PT_FILES) $(TEST_PM_FILES)
+	$(PERL_TEST_) uri-*$(PT_SUFFIX)
+
+$(NS_URI_PT_FILES): uri-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/URI/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_URI)$* $@"
+	$(PERL_CHK) $@
+
+test-module-util: $(NS_UTIL_PT_FILES) $(NS_UTIL_DIS_PT_FILES) \
+  util-ManakaiNodeTest$(PT_SUFFIX) $(TEST_PM_FILES)
+	$(PERL_TEST_) util-*$(PT_SUFFIX)
+
+$(NS_UTIL_PT_FILES): util-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Util/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_UTIL)$* $@"
+	$(PERL_CHK) $@
+
+util-ManakaiNodeTest$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Util/ManakaiNodeTest$(DIS_SUFFIX) \
+  $(UTIL_MNTEST_PM) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_UTIL)ManakaiNodeTest $@"
+	$(ECHO) "BEGIN {" >> $@
+	$(ECHO) "  require 'manakai/mndebug.pl';" >> $@
+	$(ECHO) "  manakai::mndebug::define_nodestem_destroy ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_nodestem_destroy_all ();" >> $@
+	#$(ECHO) "  manakai::mndebug::define_noderef_destroy_all ();" >> $@
+	$(ECHO) "}" >> $@
+	$(PERL_CHK) $@
+
+$(NS_UTIL_DIS_PT_FILES): util-dis-%$(PT_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Util/DIS/%$(DIS_SUFFIX) $(DAF_PL)
+	$(DAF) --create-perl-test="$(NS_UTIL_DIS)$* $@"
+	$(PERL_CHK) $@
 
-dom-xdoctype.t: $(DOM_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)XDoctype" > $@
-
-dom-mdomls2003.t: $(DOM_LS_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_MDOM)ManakaiDOMLS2003" > $@
-
-test-module-util: \
-  util-perlcode.t \
-  util-dis-dnlite.t
-	$(PERL_TEST_) util-*.t
-
-util-perlcode.t: $(UTIL_PC_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_UTIL)PerlCode" > $@
-
-util-dis-dnlite.t: $(DIS_CORE_DAC) $(DAC2TEST_PL)
-	$(DAC2TEST) $< --source-module="$(NS_DIS)DNLite" > $@
-
-$(DOM_DAC_FILES): $(MANAKAI_LIB_DIR)Message/DOM/%: always
-	$(CD) $(MANAKAI_LIB_DIR)Message/DOM/ && $(MAKE) $*
-
-$(UTIL_PC_DAC) $(DIS_CORE_DAC): $(MANAKAI_LIB_DIR)Message/Util/%: always
+$(UTIL_MNTEST_PM): $(MANAKAI_LIB_DIR)Message/Util/%: always
 	$(CD) $(MANAKAI_LIB_DIR)Message/Util/ && $(MAKE) $*
 
+$(MANAKAI_LIB_DIR)Message/Util/DIS/Test$(PM_SUFFIX): \
+  $(MANAKAI_LIB_DIR)Message/Util/DIS/Test$(DIS_SUFFIX)
+	$(CD) $(MANAKAI_LIB_DIR)Message/Util/ && $(MAKE) DIS/Test$(PM_SUFFIX)
+
 clean: clean-dom1core-perl
 	$(RMALL) $(GENERATED_FILES)
 
@@ -127,4 +192,6 @@
 	$(RMALL) $(DOMTEST_PERL_DIR)level1/core/*
 	$(RMALL) *~ .*~ *.BAK .*.BAK
 
+distclean: clean
+
 always: