Skip to content

Commit

Permalink
* docs.make, Makefile.am: Build mono-file-formats{.tree,.zip},
Browse files Browse the repository at this point in the history
	  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=/branches/mono-2-2/mono/; revision=119260
  • Loading branch information
Jonathan Pryor committed Nov 19, 2008
2 parents ea65084 + 6ed0b0b commit e43c207
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 72 deletions.
16 changes: 16 additions & 0 deletions docs/ChangeLog
@@ -1,3 +1,19 @@
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-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.
Expand Down
23 changes: 17 additions & 6 deletions docs/Makefile.am
Expand Up @@ -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 = \
Expand All @@ -18,6 +20,7 @@ EXTRA_DIST = \
convert.cs \
current-api \
deploy \
docs.make \
documented \
embedded-api \
exception-handling.txt \
Expand All @@ -40,7 +43,6 @@ EXTRA_DIST = \
mini-porting.txt \
mono-api-metadata.html \
mono_handle_d \
monoapi.make \
monoapi.source \
new-regalloc \
object-layout \
Expand Down Expand Up @@ -73,9 +75,18 @@ clean-local:
-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.zip : monoapi.tree
monoapi.tree: docs.make Makefile.am toc.xml deploy/.stamp
cp api-style.css deploy
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) $@

$(srcdir)/deploy/.stamp: convert.exe Makefile.am
$(mkdir_p) $(srcdir)/html
Expand All @@ -85,6 +96,6 @@ $(srcdir)/deploy/.stamp: convert.exe Makefile.am

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
convert.exe: docs.make convert.cs Makefile.am
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe

26 changes: 26 additions & 0 deletions docs/docs.make
@@ -0,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:

4 changes: 2 additions & 2 deletions docs/mono-file-formats.config
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manpages>
<manpage name="mdoc(5)" page="../../mono/man/mdoc.5" />
<manpage name="mono-config(5)" page="../../mono/man/mono-config.5" />
<manpage name="mdoc(5)" page="../man/mdoc.5" />
<manpage name="mono-config(5)" page="../man/mono-config.5" />
</manpages>
104 changes: 52 additions & 52 deletions docs/mono-tools.config
@@ -1,55 +1,55 @@
<?xml version="1.0"?>
<manpages>
<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" />
<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>
12 changes: 0 additions & 12 deletions docs/monoapi.make

This file was deleted.

0 comments on commit e43c207

Please sign in to comment.