* docs.make, Makefile.am: Build mono-file-formats{.tree,.zip},
authorJonathan Pryor <jpryor@novell.com>
Wed, 19 Nov 2008 02:18:40 +0000 (02:18 -0000)
committerJonathan Pryor <jpryor@novell.com>
Wed, 19 Nov 2008 02:18:40 +0000 (02:18 -0000)
  mono-tool{.tree,.zip} files.
* mono-file-formats.config, mono-tools.config: Alter paths to man
  pages so that they're valid for building from mono/docs.
* monoapi.make: Rename to docs.make.

svn path=/trunk/mono/; revision=119255

1  2 
docs/ChangeLog
docs/Makefile.am
docs/docs.make
docs/mono-file-formats.config
docs/mono-tools.config
docs/monoapi.make

diff --cc docs/ChangeLog
index 95ad3448ab5d7cdb4442ce4b1b5aff731c753e6e,e5460ca3a3756f93be23191af2b54e388febf8e6..fb9f7a133e08c81afb7d426735b371f826f81a13
@@@ -1,20 -1,3 +1,28 @@@
++2008-11-18  Jonathan Pryor  <jpryor@novell.com>
++
++      * docs.make, Makefile.am: Build mono-file-formats{.tree,.zip},
++        mono-tool{.tree,.zip} files.
++      * mono-file-formats.config, mono-tools.config: Alter paths to man
++        pages so that they're valid for building from mono/docs.
++      * monoapi.make: Rename to docs.make.
++
 +2008-11-01  Raja R Harinath  <harinath@hurrynot.org>
 +
 +      * Makefile.am: Clean up for srcdir != builddir.
 +      (deploy/.stamp): Compute location of 'mono-wrapper' and pass to exdoc.
 +      * exdoc (mono-wrapper): Use $runtimedir to look for 'mono-wrapper'.
 +
 +2008-10-31  Jonathan Pryor  <jpryor@novell.com>
 +
 +      * check, Makefile.am (EXTRA_DIST): Rename to check-exports.  This was
 +        needed to fix `make distdir...`, because (1) with a file named
 +        `check` which (2) was listed in $(EXTRA_DIST), while (3) `check` is
 +        ALSO a .PHONY target, this caused make to look for the `check` file,
 +        not find it due to (3), and then proceed to try to build convert.exe
 +        from convert.cs...for reasons I don't care about.  This obviously
 +        can't work during `make distdir`, as mcs hasn't been built yet, thus
 +        leading to pain, suffering, and a broken build.
 +
  2008-10-30  Jonathan Pryor  <jpryor@novell.com>
  
        * . (svn:ignore), deploy (svn:ignore): Ignore generated files.
index 247dfc4e4ef07d35c522b5bb198958b26408ccd6,40796e411683c0f6381cdc95da3b304c7827618d..07f15168b56ff3d17fe942151cd8f1e599d2a464
@@@ -5,6 -5,6 +5,8 @@@ sources_DATA = 
        $(ASSEMBLED_DOCS)
  
  ASSEMBLED_DOCS = \
++      mono-file-formats.tree mono-file-formats.zip  \
++      mono-tools.tree mono-tools.zip                \
        monoapi.tree monoapi.zip
  
  EXTRA_DIST = \
@@@ -18,6 -18,6 +20,7 @@@
        convert.cs              \
        current-api             \
        deploy                  \
++      docs.make               \
        documented              \
        embedded-api            \
        exception-handling.txt  \
@@@ -40,7 -40,7 +43,6 @@@
        mini-porting.txt        \
        mono-api-metadata.html  \
        mono_handle_d           \
--      monoapi.make            \
        monoapi.source          \
        new-regalloc            \
        object-layout           \
@@@ -68,23 -68,26 +70,32 @@@ dist-hook
        cp sources/*  $(distdir)/sources
        cp svgs/*     $(distdir)/svgs
  
 -CLEANFILES = \
 -      convert.exe* \
 -      deploy/.stamp \
 -      $(wildcard deploy/*) \
 -      $(ASSEMBLED_DOCS)
 -
  clean-local:
 -      -rm -Rf html
 +      -rm -Rf $(srcdir)/html
 +      -rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe*
 +      -cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
  
- monoapi.tree monoapi.zip: monoapi.make Makefile.am toc.xml $(srcdir)/deploy/.stamp
-       cp $(srcdir)/api-style.css $(srcdir)/deploy/
-       cd $(srcdir) && $(MAKE) -f monoapi.make topdir=$(mcs_topdir_from_srcdir) assemble
 -monoapi.tree monoapi.zip: monoapi.make Makefile.am toc.xml deploy/.stamp
++monoapi.zip : monoapi.tree
++monoapi.tree: docs.make Makefile.am toc.xml deploy/.stamp
+       cp api-style.css deploy
 -      $(MAKE) -f $< topdir=$(mcs_topdir) assemble
++      cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
++
++mono-tools.zip : mono-tools.tree
++mono-tools.tree: docs.make Makefile.am deploy/.stamp
++      cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
++
++mono-file-formats.zip : mono-file-formats.tree
++mono-file-formats.tree: docs.make Makefile.am deploy/.stamp
++      cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
  
 -deploy/.stamp: convert.exe Makefile.am
 -      $(mkdir_p) html
 -      perl exdoc -h . ../mono/*/*.c
 +$(srcdir)/deploy/.stamp: convert.exe Makefile.am
 +      $(mkdir_p) $(srcdir)/html
 +      runtimedir=`cd ../runtime && pwd`; export runtimedir; \
 +      cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
        touch $@
  
 -extract : deply/.stamp
 +extract: $(srcdir)/deploy/.stamp
  
--convert.exe: monoapi.make convert.cs Makefile.am
-       cd $(srcdir) && $(MAKE) -f monoapi.make topdir=$(mcs_topdir_from_srcdir) convert.exe
 -      $(MAKE) -f $< topdir=$(mcs_topdir) convert.exe
++convert.exe: docs.make convert.cs Makefile.am
++      cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
  
diff --cc docs/docs.make
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7977ff6fa61e7db3a7b6162c877add6f8ca68746
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,26 @@@
++thisdir = docs
++SUBDIRS = 
++include $(topdir)/build/rules.make
++
++ASSEMBLED_DOCS = \
++      mono-file-formats.tree mono-file-formats.zip  \
++      mono-tools.tree mono-tools.zip                \
++      monoapi.tree monoapi.zip
++
++convert.exe: convert.cs AgilityPack.dll
++      $(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
++
++monoapi.zip : monoapi.tree
++monoapi.tree: toc.xml docs.make
++      $(MDOC) assemble -o monoapi -f hb $<
++
++mono-tools.zip : mono-tools.tree
++mono-tools.tree: mono-tools.config docs.make
++      $(MDOC) assemble -o mono-tools -f man $<
++
++mono-file-formats.zip : mono-file-formats.tree
++mono-file-formats.tree: mono-file-formats.config docs.make
++      $(MDOC) assemble -o mono-file-formats -f man $<
++
++.doc-stamp:
++      
index acb59b2c3415292f614a7c889d39627052f78b8a,0000000000000000000000000000000000000000..da74d0426018812bd8eb547e2765954cd8f22f8f
mode 100644,000000..100644
--- /dev/null
@@@ -1,5 -1,0 +1,5 @@@
-   <manpage name="mdoc(5)"               page="../../mono/man/mdoc.5" />
-   <manpage name="mono-config(5)"        page="../../mono/man/mono-config.5" />
 +<?xml version="1.0"?>
 +<manpages>
++  <manpage name="mdoc(5)"               page="../man/mdoc.5" />
++  <manpage name="mono-config(5)"        page="../man/mono-config.5" />
 +</manpages>
index 4b97722d7b7bf87778521fa64d02efb2174487e3,0000000000000000000000000000000000000000..a5d8863748ec4f607f8977f11034ed4b36e72b90
mode 100644,000000..100644
--- /dev/null
@@@ -1,55 -1,0 +1,55 @@@
-   <manpage name="al(1)"                 page="../../mono/man/al.1" />
-   <manpage name="caspol(1)"             page="../../mono/man/caspol.1" />
-   <manpage name="cert2spc(1)"           page="../../mono/man/cert2spc.1" />
-   <manpage name="certmgr(1)"            page="../../mono/man/certmgr.1" />
-   <manpage name="chktrust(1)"           page="../../mono/man/chktrust.1" />
-   <manpage name="cilc(1)"               page="../../mono/man/cilc.1" />
-   <manpage name="disco(1)"              page="../../mono/man/disco.1" />
-   <manpage name="dtd2xsd(1)"            page="../../mono/man/dtd2xsd.1" />
-   <manpage name="gacutil(1)"            page="../../mono/man/gacutil.1" />
-   <manpage name="genxs(1)"              page="../../mono/man/genxs.1" />
-   <manpage name="httpcfg(1)"            page="../../mono/man/httpcfg.1" />
-   <manpage name="ilasm(1)"              page="../../mono/man/ilasm.1" />
-   <manpage name="macpack(1)"            page="../../mono/man/macpack.1" />
-   <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="../../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-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-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="../../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" />
-   <manpage name="mono-xmltool(1)"       page="../../mono/man/mono-xmltool.1" />
-   <manpage name="mozroots(1)"           page="../../mono/man/mozroots.1" />
-   <manpage name="oldmono(1)"            page="../../mono/man/oldmono.1" />
-   <manpage name="permview(1)"           page="../../mono/man/permview.1" />
-   <manpage name="prj2make(1)"           page="../../mono/man/prj2make.1" />
-   <manpage name="resgen(1)"             page="../../mono/man/resgen.1" />
-   <manpage name="secutil(1)"            page="../../mono/man/secutil.1" />
-   <manpage name="setreg(1)"             page="../../mono/man/setreg.1" />
-   <manpage name="sgen(1)"               page="../../mono/man/sgen.1" />
-   <manpage name="signcode(1)"           page="../../mono/man/signcode.1" />
-   <manpage name="sn(1)"                 page="../../mono/man/sn.1" />
-   <manpage name="soapsuds(1)"           page="../../mono/man/soapsuds.1" />
-   <manpage name="sqlsharp(1)"           page="../../mono/man/sqlsharp.1" />
-   <manpage name="vbnc(1)"               page="../../mono/man/vbnc.1" />
-   <manpage name="wsdl(1)"               page="../../mono/man/wsdl.1" />
-   <manpage name="wsdl2(1)"              page="../../mono/man/wsdl2.1" />
-   <manpage name="xsd(1)"                page="../../mono/man/xsd.1" />
 +<?xml version="1.0"?>
 +<manpages>
++  <manpage name="al(1)"                 page="../man/al.1" />
++  <manpage name="caspol(1)"             page="../man/caspol.1" />
++  <manpage name="cert2spc(1)"           page="../man/cert2spc.1" />
++  <manpage name="certmgr(1)"            page="../man/certmgr.1" />
++  <manpage name="chktrust(1)"           page="../man/chktrust.1" />
++  <manpage name="cilc(1)"               page="../man/cilc.1" />
++  <manpage name="disco(1)"              page="../man/disco.1" />
++  <manpage name="dtd2xsd(1)"            page="../man/dtd2xsd.1" />
++  <manpage name="gacutil(1)"            page="../man/gacutil.1" />
++  <manpage name="genxs(1)"              page="../man/genxs.1" />
++  <manpage name="httpcfg(1)"            page="../man/httpcfg.1" />
++  <manpage name="ilasm(1)"              page="../man/ilasm.1" />
++  <manpage name="macpack(1)"            page="../man/macpack.1" />
++  <manpage name="makecert(1)"           page="../man/makecert.1" />
++  <manpage name="mconfig(1)"            page="../man/mconfig.1" />
++  <manpage name="mcs(1)"                page="../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-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="mkbundle(1)"           page="../man/mkbundle.1" />
++  <manpage name="mono(1)"               page="../man/mono.1" />
++  <manpage name="mono-service(1)"       page="../man/mono-service.1" />
++  <manpage name="mono-shlib-cop(1)"     page="../man/mono-shlib-cop.1" />
++  <manpage name="monodocer(1)"          page="../man/monodocer.1" />
++  <manpage name="monodocs2html(1)"      page="../man/monodocs2html.1" />
++  <manpage name="monolinker(1)"         page="../man/monolinker.1" />
++  <manpage name="monop(1)"              page="../man/monop.1" />
++  <manpage name="monostyle(1)"          page="../man/monostyle.1" />
++  <manpage name="mono-xmltool(1)"       page="../man/mono-xmltool.1" />
++  <manpage name="mozroots(1)"           page="../man/mozroots.1" />
++  <manpage name="oldmono(1)"            page="../man/oldmono.1" />
++  <manpage name="permview(1)"           page="../man/permview.1" />
++  <manpage name="prj2make(1)"           page="../man/prj2make.1" />
++  <manpage name="resgen(1)"             page="../man/resgen.1" />
++  <manpage name="secutil(1)"            page="../man/secutil.1" />
++  <manpage name="setreg(1)"             page="../man/setreg.1" />
++  <manpage name="sgen(1)"               page="../man/sgen.1" />
++  <manpage name="signcode(1)"           page="../man/signcode.1" />
++  <manpage name="sn(1)"                 page="../man/sn.1" />
++  <manpage name="soapsuds(1)"           page="../man/soapsuds.1" />
++  <manpage name="sqlsharp(1)"           page="../man/sqlsharp.1" />
++  <manpage name="vbnc(1)"               page="../man/vbnc.1" />
++  <manpage name="wsdl(1)"               page="../man/wsdl.1" />
++  <manpage name="wsdl2(1)"              page="../man/wsdl2.1" />
++  <manpage name="xsd(1)"                page="../man/xsd.1" />
 +</manpages>
diff --cc docs/monoapi.make
index 5f5a936269566c917903f30d32eb9cd45e65e0e4,5f5a936269566c917903f30d32eb9cd45e65e0e4..0000000000000000000000000000000000000000
deleted file mode 100644,100644
+++ /dev/null
@@@ -1,12 -1,12 +1,0 @@@
--thisdir = docs
--SUBDIRS = 
--include $(topdir)/build/rules.make
--
--assemble: toc.xml
--      $(MDOC) assemble -o monoapi -f hb toc.xml
--
--convert.exe: convert.cs AgilityPack.dll
--      $(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
--
--.doc-stamp:
--