X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftools%2Fmdoc%2FMakefile;h=e4ff1eed87c55e50b568f54284249beb82ce885b;hb=2cb5217d4852ff11f0acc0444729ab17ac5c597c;hp=bdb9c69277ee2eda41f57af1a3186bf850b83c9c;hpb=2d557adc183ed6160d0b56847629e5b2d80abde4;p=mono.git

diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile
index bdb9c69277e..e4ff1eed87c 100644
--- a/mcs/tools/mdoc/Makefile
+++ b/mcs/tools/mdoc/Makefile
@@ -2,19 +2,47 @@ thisdir = tools/mdoc
 SUBDIRS = 
 include ../../build/rules.make
 
-LOCAL_MCS_FLAGS = \
-	/resource:../monodoc/Resources/mdoc-html-utils.xsl,mdoc-html-utils.xsl      \
-	/resource:../monodoc/Resources/mdoc-sections-css.xsl,mdoc-sections-css.xsl  \
-	/resource:../monodoc/Resources/mono-ecma-css.xsl,mono-ecma-css.xsl          \
+MDOC_COMMON_FLAGS = \
+	/resource:../../class/monodoc/Resources/mdoc-html-format.xsl,mdoc-html-format.xsl    \
+	/resource:../../class/monodoc/Resources/mdoc-html-utils.xsl,mdoc-html-utils.xsl      \
+	/resource:../../class/monodoc/Resources/mdoc-sections-css.xsl,mdoc-sections-css.xsl  \
+	/resource:../../class/monodoc/Resources/mono-ecma-css.xsl,mono-ecma-css.xsl          \
 	/resource:Resources/defaulttemplate.xsl,defaulttemplate.xsl                 \
 	/resource:Resources/monodoc-ecma.xsd,monodoc-ecma.xsd                       \
+	/resource:Resources/msitomsx.xsl,msitomsx.xsl                               \
 	/resource:Resources/overview.xsl,overview.xsl                               \
 	/resource:Resources/stylesheet.xsl,stylesheet.xsl                           \
-	/r:$(topdir)/class/lib/$(PROFILE)/monodoc.dll
+	/r:System.Web.dll                                                           \
+	/r:System.Xml.Linq.dll                                                      \
+	/r:ICSharpCode.SharpZipLib.dll                                              \
+	/r:Mono.Cecil.dll
+
+LOCAL_MCS_FLAGS = $(MDOC_COMMON_FLAGS) \
+	/r:monodoc.dll
+PROGRAM = mdoc.exe
+PROGRAM_DEPS = $(topdir)/class/lib/$(PROFILE)/monodoc.dll
+
+ifdef NET
+all : copy-with-deps
+
+copy-with-deps:
+	-mkdir mdoc-net
+	cp $(PROGRAM) mdoc-net
+	cp $(topdir)/class/lib/$(PROFILE)/Commons.Xml.Relaxng.dll mdoc-net
+	cp $(topdir)/class/lib/$(PROFILE)/ICSharpCode.SharpZipLib.dll mdoc-net
+	cp $(topdir)/class/lib/$(PROFILE)/Mono.Cecil.dll mdoc-net
+	cp $(topdir)/class/lib/$(PROFILE)/monodoc.dll mdoc-net
+endif
+
+MONODOC_RESOURCES = \
+	../../class/monodoc/Resources/mdoc-html-utils.xsl    \
+	../../class/monodoc/Resources/mdoc-sections-css.xsl  \
+	../../class/monodoc/Resources/mono-ecma-css.xsl
 
 MDOC_RESOURCES = \
 	Resources/defaulttemplate.xsl     \
 	Resources/monodoc-ecma.xsd        \
+	Resources/msitomsx.xsl            \
 	Resources/overview.xsl            \
 	Resources/stylesheet.xsl
 
@@ -25,34 +53,34 @@ MDOC_TEST_FILES = \
 	Test/TestEcmaDocs.xml                                     \
 	Test/validate.check.monodocer                             \
 	Test/validate.check.monodocer.importslashdoc              \
-	Test/validate.check.monodocer.since                       \
-	$(shell find Test/Test/en.expected* -name \*.xml)      \
-	$(shell find Test/Test/html.expected* -name \*.html)
+	Test/validate.check.monodocer.since
 
 EXTRA_DISTFILES = \
 	$(MDOC_RESOURCES) \
 	$(MDOC_TEST_FILES)
 
-PROGRAM = mdoc.exe
+$(PROGRAM) : $(MDOC_RESOURCES) $(MONODOC_RESOURCES) $(PROGRAM_DEPS)
 
-EXTRA_DISTFILES = test.cs
+PROGRAM_COMPILE = $(CSCOMPILE) -platform:x86
 
 include ../../build/executable.make
 
-$(PROGRAM) : monodocer1.exe Makefile
-
-MCS1 = \
-	MONO_PATH="$(topdir)/class/lib/net_1_1$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" \
-	$(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_1_1/mcs.exe
+$(PROGRAM) : $(build_lib)
+	cp $< $@
 
-CSCOMPILE1 = $(Q_MCS) $(MCS1) $(USE_MCS_FLAGS)
+$(PROGRAM) : Makefile
 
 MONO = \
-	MONO_PATH="$(topdir)/class/lib/2.0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" \
+	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" \
 	$(RUNTIME) $(RUNTIME_FLAGS)
 
-monodocer1.exe : Mono.Documentation/monodocer.cs
-	$(CSCOMPILE1) -debug+ -d:NET_1_0 Mono.Documentation/monodocer.cs -out:$@ -r:Mono.GetOptions
+dist-local: dist-default dist-tests
+
+dist-tests:
+	find Test/en.expected* -name '*.xml'     > .files
+	find Test/html.expected* -name '*.html' >> .files
+	tar cTf .files - | (cd $(distdir); tar xf -)
+	rm .files ; \
 
 test-local: $(PROGRAM)
 
@@ -60,7 +88,7 @@ clean-local: cleanup
 
 cleanup:
 	-rm -Rf Test/en.actual Test/html.actual
-	-rm monodocer1.exe*
+	-rm -f monodocer1.exe*
 
 Test/DocTest.dll: 
 	$(CSCOMPILE) $(TEST_CSCFLAGS) -debug -unsafe -target:library -out:$@ Test/DocTest.cs
@@ -78,90 +106,144 @@ Test/DocTest.dll-v2:
 	-rm -f Test/DocTest.dll
 	$(MAKE) TEST_CSCFLAGS=$(TEST_CSCFLAGS) Test/DocTest.dll
 
-check-monodocer-update: mdoc.exe
-	find Test/Test/en.expected -name \*.xml -exec rm "{}" \;
+check-monodocer-update: $(PROGRAM)
+	find Test/en.expected -name \*.xml -exec rm "{}" \;
 	$(MAKE) Test/DocTest.dll-v1
-	$(MONO) mdoc.exe update -o Test/en.expected Test/DocTest.dll
+	$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected Test/DocTest.dll
 
-check-monodocer: mdoc.exe
+check-monodocer: $(PROGRAM)
 	-rm -Rf Test/en.actual
 	$(MAKE) Test/DocTest.dll-v1
-	$(MONO) mdoc.exe update -o Test/en.actual Test/DocTest.dll
+	$(MONO) $(PROGRAM) update --debug --exceptions=all -o Test/en.actual Test/DocTest.dll
 	diff --exclude=.svn -rup Test/en.expected Test/en.actual
-	$(MONO) mdoc.exe update -o Test/en.actual Test/DocTest.dll 
+	$(MONO) $(PROGRAM) update --debug --exceptions=all -o Test/en.actual Test/DocTest.dll 
 	diff --exclude=.svn -rup Test/en.expected Test/en.actual
 
-check-monodocer-since-update: mdoc.exe
+check-monodocer-since-update: $(PROGRAM)
 	find Test/en.expected.since -name \*.xml -exec rm "{}" \;
 	$(MAKE) Test/DocTest.dll-v1
-	$(MONO) mdoc.exe update -o Test/en.expected.since Test/DocTest.dll 
+	$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected.since Test/DocTest.dll 
 	$(MAKE) Test/DocTest.dll-v2
-	$(MONO) mdoc.exe update --since="Version 2.0" \
+	$(MONO) $(PROGRAM) update --exceptions=all --since="Version 2.0" \
 		-o Test/en.expected.since Test/DocTest.dll 
 
-check-monodocer-since: mdoc.exe
+check-monodocer-since: $(PROGRAM)
 	rm -Rf Test/en.actual
 	$(MAKE) Test/DocTest.dll-v1
-	$(MONO) mdoc.exe update -o Test/en.actual Test/DocTest.dll 
+	$(MONO) $(PROGRAM) --debug update --exceptions=all -o Test/en.actual Test/DocTest.dll 
 	$(MAKE) Test/DocTest.dll-v2
-	$(MONO) mdoc.exe update --since="Version 2.0" \
+	$(MONO) $(PROGRAM) --debug update --exceptions=all --since="Version 2.0" \
 		-o Test/en.actual Test/DocTest.dll 
 	diff --exclude=.svn -rup Test/en.expected.since Test/en.actual
 
-check-monodocer-importslashdoc-update: mdoc.exe
+check-monodocer-delete-update: $(PROGRAM)
+	find Test/en.expected.delete -type f -exec rm "{}" \;
+	$(MAKE) Test/DocTest.dll-v1
+	$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected.delete Test/DocTest.dll
+	$(MAKE) Test/DocTest.dll-v2
+	$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected.delete Test/DocTest.dll
+	$(MAKE) Test/DocTest.dll-v1
+	$(MONO) $(PROGRAM) update -fno-assembly-versions --delete --exceptions=all \
+		-o Test/en.expected.delete Test/DocTest.dll
+
+check-monodocer-delete: $(PROGRAM)
+	rm -Rf Test/en.actual
+	$(MAKE) Test/DocTest.dll-v1
+	$(MONO) $(PROGRAM) --debug update --exceptions=all -o Test/en.actual Test/DocTest.dll
+	$(MAKE) Test/DocTest.dll-v2
+	$(MONO) $(PROGRAM) --debug update --exceptions=all -o Test/en.actual Test/DocTest.dll
+	$(MAKE) Test/DocTest.dll-v1
+	$(MONO) $(PROGRAM) --debug update -fno-assembly-versions --delete --exceptions=all -o Test/en.actual Test/DocTest.dll
+	diff --exclude=.svn -rup Test/en.expected.delete Test/en.actual
+
+check-monodocer-importslashdoc-update: $(PROGRAM)
 	find Test/en.expected.importslashdoc -name \*.xml -exec rm "{}" \;
 	$(MAKE) Test/DocTest.dll-v1 TEST_CSCFLAGS=-doc:Test/DocTest.xml
-	$(MONO) mdoc.exe update -i Test/DocTest.xml \
+	$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/DocTest.xml \
 		-o Test/en.expected.importslashdoc Test/DocTest.dll 
 
-check-monodocer-importslashdoc: mdoc.exe
+check-monodocer-importslashdoc: $(PROGRAM)
 	rm -Rf Test/en.actual
 	$(MAKE) Test/DocTest.dll-v1 TEST_CSCFLAGS=-doc:Test/DocTest.xml
-	$(MONO) mdoc.exe update -i Test/DocTest.xml \
+	$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/DocTest.xml \
 		-o Test/en.actual Test/DocTest.dll 
 	diff --exclude=.svn -rup Test/en.expected.importslashdoc Test/en.actual
 
-check-monodocer-importecmadoc-update: mdoc.exe
+check-monodocer-importecmadoc-update: $(PROGRAM)
 	find Test/en.expected.importecmadoc -name \*.xml -exec rm "{}" \;
 	$(MAKE) Test/DocTest.dll-v1
-	$(MONO) mdoc.exe update -i Test/TestEcmaDocs.xml \
+	$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/TestEcmaDocs.xml \
 		'--type=System.Action`1' --type=System.AsyncCallback \
 		--type=System.Environment --type=System.Array \
 		-o Test/en.expected.importecmadoc Test/DocTest.dll 
 
-check-monodocer-importecmadoc: mdoc.exe
+check-monodocer-importecmadoc: $(PROGRAM)
 	rm -Rf Test/en.actual
 	$(MAKE) Test/DocTest.dll-v1
-	$(MONO) mdoc.exe update -i Test/TestEcmaDocs.xml \
+	$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/TestEcmaDocs.xml \
 		'--type=System.Action`1' --type=System.AsyncCallback \
 		--type=System.Environment --type=System.Array \
 		-o Test/en.actual Test/DocTest.dll 
 	diff --exclude=.svn -rup Test/en.expected.importecmadoc Test/en.actual
 
-check-mdoc-export-html-update: mdoc.exe
+check-mdoc-export-html-update: $(PROGRAM)
 	find Test/html.expected -name \*.html -exec rm "{}" \;
-	$(MONO) mdoc.exe export-html -o Test/html.expected \
+	$(MONO) $(PROGRAM) export-html -o Test/html.expected \
 		Test/en.expected.importslashdoc 
 
-check-mdoc-export-html: check-monodocer mdoc.exe
+check-mdoc-export-html: check-monodocer $(PROGRAM)
 	rm -Rf Test/html.actual
-	$(MONO) mdoc.exe export-html -o Test/html.actual \
+	$(MONO) $(PROGRAM) export-html -o Test/html.actual \
 		Test/en.expected.importslashdoc
 	diff --exclude=.svn -rup Test/html.expected Test/html.actual
 
-check-md-html-dir: mdoc.exe
+check-mdoc-export-html-with-version: $(PROGRAM)
+	rm -Rf Test/html.actual.v0 Test/html.actual.since-with-v0 .v0.txt .v2.txt
+	$(MONO) $(PROGRAM) export-html -o Test/html.actual.v0 \
+		Test/en.expected
+	$(MONO) $(PROGRAM) export-html -o Test/html.actual.since-with-v0 \
+		Test/en.expected.since -with-version 0.0.0.0
+	(cd Test/html.actual.v0            && find . -type f) | sort > .v0.txt
+	(cd Test/html.actual.since-with-v0 && find . -type f) | sort > .v2.txt
+	diff -rup .v0.txt .v2.txt   # assert no types added
+
+check-md-html-dir: $(PROGRAM)
 	rm -Rf Test/html.actual
-	$(MONO) mdoc.exe export-html -dest:Test/html.actual $(DIR) 
+	$(MONO) $(PROGRAM) export-html -dest:Test/html.actual $(DIR) 
 	diff --exclude=.svn -rup Test/html.expected Test/html.actual
 
 check-mdoc-export-msxdoc-update:
-	$(MONO) mdoc.exe export-msxdoc -o - Test/en.expected.importslashdoc \
+	$(MONO) $(PROGRAM) export-msxdoc -o - Test/en.expected.importslashdoc \
 		> Test/msxdoc-expected.importslashdoc.xml
 
 check-mdoc-export-msxdoc:
-	$(MONO) mdoc.exe export-msxdoc -o - Test/en.expected.importslashdoc \
+	$(MONO) $(PROGRAM) export-msxdoc -o - Test/en.expected.importslashdoc \
 		| diff --brief - Test/msxdoc-expected.importslashdoc.xml
 
+my_abs_top_srcdir = $(shell cd . && pwd)
+
+check-mdoc-validate-update: $(PROGRAM)
+	$(MONO) $(PROGRAM) validate -f ecma Test/en.expected 2>&1 | \
+		sed 's#file://$(my_abs_top_srcdir)/##g' > \
+		Test/validate.check.monodocer
+	$(MONO) $(PROGRAM) validate -f ecma Test/en.expected.importslashdoc 2>&1 | \
+		sed 's#file://$(my_abs_top_srcdir)/##g' > \
+		Test/validate.check.monodocer.importslashdoc
+	$(MONO) $(PROGRAM) validate -f ecma Test/en.expected.since 2>&1 | \
+		sed 's#file://$(my_abs_top_srcdir)/##g' > \
+		Test/validate.check.monodocer.since
+
+check-mdoc-validate: $(PROGRAM)
+	$(MONO) $(PROGRAM) validate -f ecma Test/en.expected 2>&1 | \
+		sed 's#file://$(my_abs_top_srcdir)/##g' | \
+		diff - Test/validate.check.monodocer
+	$(MONO) $(PROGRAM) validate -f ecma Test/en.expected.importslashdoc 2>&1 | \
+		sed 's#file://$(my_abs_top_srcdir)/##g' | \
+		diff --brief - Test/validate.check.monodocer.importslashdoc
+	$(MONO) $(PROGRAM) validate -f ecma Test/en.expected.since 2>&1 | \
+		sed 's#file://$(my_abs_top_srcdir)/##g' | \
+		diff --brief - Test/validate.check.monodocer.since
+
 run-test-local: check-doc-tools
 
 run-test-update : check-doc-tools-update
@@ -170,13 +252,18 @@ check-doc-tools: check-monodocer-since \
 	check-monodocer-importecmadoc \
 	check-monodocer-importslashdoc \
 	check-monodocer \
+	check-monodocer-delete \
 	check-mdoc-export-html \
-	check-mdoc-export-msxdoc
+	check-mdoc-export-html-with-version \
+	check-mdoc-export-msxdoc \
+	check-mdoc-validate
 
 check-doc-tools-update: check-monodocer-since-update \
 	check-monodocer-importecmadoc-update \
 	check-monodocer-importslashdoc-update \
 	check-monodocer-update \
+	check-monodocer-delete-update \
 	check-mdoc-export-html-update \
-	check-mdoc-export-msxdoc-update
+	check-mdoc-export-msxdoc-update \
+	check-mdoc-validate-update