* docs/Makefile: Assemble documentation.

	* docs/cs-errors.config: Update to refer to correct directory.
	* docs/mono-tools.config: Man pages are in mono/man now...

svn path=/trunk/mcs/; revision=116283

3 files changed, 111 insertions, 17 deletions

diff --git a/mcs/docs/Makefile b/mcs/docs/Makefile
index 4145f13257e..45c2106e480 100644
--- a/mcs/docs/Makefile
+++ b/mcs/docs/Makefile
@@ -2,8 +2,102 @@ thisdir = docs
 SUBDIRS = 
 include ../build/rules.make
 
-DISTFILES = clr-abi.txt compiler.txt control-flow-analysis.txt order.txt new-anonymous-design.txt
+DISTFILES = \
+	clr-abi.txt                 \
+	compiler.txt                \
+	control-flow-analysis.txt   \
+	cs-errors.config            \
+	cs-errors.source            \
+	ecma334.source              \
+	mono-tools.config           \
+	mono-tools.source           \
+	Mono.source                 \
+	netdocs.source              \
+	new-anonymous-design.txt    \
+	Novell.source               \
+	nunit-docs.source           \
+	order.txt                   \
+	$(shell find ecma334 -name \*.xml)
 
-all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local:
+ASSEMBLED_DOCS = \
+	cs-errors.tree cs-errors.zip      \
+	ecma334.tree ecma334.zip          \
+	mono-tools.tree mono-tools.zip    \
+	Mono.tree Mono.zip                \
+	netdocs.tree netdocs.zip          \
+	Novell.tree Novell.zip            \
+	nunit-docs.tree nunit-docs.zip
+
+CLEAN_FILES += $(ASSEMBLED_DOCS)
+
+all-local: build-documentation
+
+all-local test-local run-test-local run-test-ondotnet-local doc-update:
+
+clean-local:
+	-rm $(CLEAN_FILES)
 
 dist-local: dist-default
+
+install-local:
+	@:
+
+uninstall-local:
+	@:
+
+NETDOCS_DIRS = \
+	$(topdir)/class/corlib/Documentation/en                       \
+	$(topdir)/class/System/Documentation/en                       \
+	$(topdir)/class/System.Core/Documentation/en                  \
+	$(topdir)/class/System.XML/Documentation/en                   \
+	$(topdir)/class/System.Web/Documentation/en                   \
+	$(topdir)/class/System.Web.Services/Documentation/en          \
+	$(topdir)/class/System.Data/Documentation/en                  \
+	$(topdir)/class/System.DirectoryServices/Documentation/en     \
+	$(topdir)/class/System.Drawing/Documentation/en               \
+	$(topdir)/class/System.Security/Documentation/en              \
+	$(topdir)/class/Microsoft.Build.Framework/Documentation/en    \
+	$(topdir)/class/Microsoft.Build.Engine/Documentation/en       \
+	$(topdir)/class/Microsoft.Build.Utilities/Documentation/en
+
+MONO_DIRS = \
+	$(topdir)/class/Commons.Xml.Relaxng/Documentation/en          \
+	$(topdir)/class/Mono.Cairo/Documentation/en                   \
+	$(topdir)/class/Mono.GetOptions/Documentation/en              \
+	$(topdir)/class/Mono.Options/Documentation/en                 \
+	$(topdir)/class/Mono.Posix/Documentation/en                   \
+	$(topdir)/class/Mono.Security.Win32/Documentation/en          \
+	$(topdir)/class/Mono.Security/Documentation/en
+
+NOVELL_DIRS = \
+	$(topdir)/class/Novell.Directory.Ldap/Documentation/en
+
+NUNIT_DIRS = \
+	$(topdir)/nunit20/core/Documentation/en       \
+	$(topdir)/nunit20/framework/Documentation/en  \
+	$(topdir)/nunit20/mocks/Documentation/en      \
+	$(topdir)/nunit20/util/Documentation/en
+
+build-documentation: $(ASSEMBLED_DOCS)
+
+netdocs.tree netdocs.zip:
+	$(MDOC) assemble -o netdocs $(NETDOCS_DIRS)
+
+Mono.tree Mono.zip:
+	$(MDOC) assemble -o Mono $(MONO_DIRS)
+
+Novell.tree Novell.zip:
+	$(MDOC) assemble -o Novell $(NOVELL_DIRS)
+
+nunit-docs.tree nunit-docs.zip:
+	$(MDOC) assemble -o nunit-docs $(NUNIT_DIRS)
+
+cs-errors.tree cs-errors.zip:
+	$(MDOC) assemble -o cs-errors -f error cs-errors.config
+
+ecma334.tree ecma334.zip:
+	$(MDOC) assemble -o ecma334 -f ecmaspec ecma334
+
+mono-tools.tree mono-tools.zip: mono-tools.config
+	$(MDOC) assemble -o mono-tools -f man mono-tools.config
+
diff --git a/mcs/docs/cs-errors.config b/mcs/docs/cs-errors.config
index c0eae6f5880..1ef3f1c50d9 100644
--- a/mcs/docs/cs-errors.config
+++ b/mcs/docs/cs-errors.config
@@ -1,7 +1,7 @@
 <ErrorProviderConfig>
-	<FilesPath>../../mcs/errors</FilesPath>
+	<FilesPath>../errors</FilesPath>
 	<Match>cs????*.cs</Match>
 	<ErrorNumSubstringStart>2</ErrorNumSubstringStart>
 	<ErrorNumSubstringLength>4</ErrorNumSubstringLength>
 	<FriendlyFormatString>CS{0:0###}</FriendlyFormatString>
-</ErrorProviderConfig>
\ No newline at end of file
+</ErrorProviderConfig>
diff --git a/mcs/docs/mono-tools.config b/mcs/docs/mono-tools.config
index 615dda83481..ed8784cd31b 100644
--- a/mcs/docs/mono-tools.config
+++ b/mcs/docs/mono-tools.config
@@ -16,24 +16,24 @@
   <manpage name="makecert(1)"           page="../../mono/man/makecert.1" />
   <manpage name="mconfig(1)"            page="../../mono/man/mconfig.1" />
   <manpage name="mcs(1)"                page="../../mono/man/mcs.1" />
-  <manpage name="mdassembler(1)"        page="../man/mdassembler.1" />
-  <manpage name="mdcs2ecma(1)"          page="../man/mdcs2ecma.1" />
-  <manpage name="mdnormalizer(1)"       page="../man/mdnormalizer.1" />
-  <manpage name="mdoc(1)"               page="../man/mdoc.1" />
-  <manpage name="mdoc(5)"               page="../man/mdoc.5" />
-  <manpage name="mdoc-assemble(1)"      page="../man/mdoc-assemble.1" />
-  <manpage name="mdoc-export-html(1)"   page="../man/mdoc-export-html.1" />
-  <manpage name="mdoc-export-msxdoc(1)" page="../man/mdoc-export-msxdoc.1" />
-  <manpage name="mdoc-update(1)"        page="../man/mdoc-update.1" />
-  <manpage name="mdoc-validate(1)"      page="../man/mdoc-validate.1" />
-  <manpage name="mdvalidator(1)"        page="../man/mdvalidator.1" />
+  <manpage name="mdassembler(1)"        page="../../mono/man/mdassembler.1" />
+  <manpage name="mdcs2ecma(1)"          page="../../mono/man/mdcs2ecma.1" />
+  <manpage name="mdnormalizer(1)"       page="../../mono/man/mdnormalizer.1" />
+  <manpage name="mdoc(1)"               page="../../mono/man/mdoc.1" />
+  <manpage name="mdoc(5)"               page="../../mono/man/mdoc.5" />
+  <manpage name="mdoc-assemble(1)"      page="../../mono/man/mdoc-assemble.1" />
+  <manpage name="mdoc-export-html(1)"   page="../../mono/man/mdoc-export-html.1" />
+  <manpage name="mdoc-export-msxdoc(1)" page="../../mono/man/mdoc-export-msxdoc.1" />
+  <manpage name="mdoc-update(1)"        page="../../mono/man/mdoc-update.1" />
+  <manpage name="mdoc-validate(1)"      page="../../mono/man/mdoc-validate.1" />
+  <manpage name="mdvalidator(1)"        page="../../mono/man/mdvalidator.1" />
   <manpage name="mkbundle(1)"           page="../../mono/man/mkbundle.1" />
   <manpage name="mono(1)"               page="../../mono/man/mono.1" />
   <manpage name="mono-config(5)"        page="../../mono/man/mono-config.5" />
   <manpage name="mono-service(1)"       page="../../mono/man/mono-service.1" />
   <manpage name="mono-shlib-cop(1)"     page="../../mono/man/mono-shlib-cop.1" />
-  <manpage name="monodocer(1)"          page="../man/monodocer.1" />
-  <manpage name="monodocs2html(1)"      page="../man/monodocs2html.1" />
+  <manpage name="monodocer(1)"          page="../../mono/man/monodocer.1" />
+  <manpage name="monodocs2html(1)"      page="../../mono/man/monodocs2html.1" />
   <manpage name="monolinker(1)"         page="../../mono/man/monolinker.1" />
   <manpage name="monop(1)"              page="../../mono/man/monop.1" />
   <manpage name="monostyle(1)"          page="../../mono/man/monostyle.1" />