[65889] branches/new-help-system/base/doc

raimue at macports.org raimue at macports.org
Fri Apr 2 08:46:18 PDT 2010


Revision: 65889
          http://trac.macports.org/changeset/65889
Author:   raimue at macports.org
Date:     2010-04-02 08:46:17 -0700 (Fri, 02 Apr 2010)
Log Message:
-----------
Do not write stub files, use own .soelim file instead which will be used to
build both groff and html version of the man page.

Modified Paths:
--------------
    branches/new-help-system/base/doc/Makefile
    branches/new-help-system/base/doc/manpage.xsl

Added Paths:
-----------
    branches/new-help-system/base/doc/port-deactivate.1.soelim

Modified: branches/new-help-system/base/doc/Makefile
===================================================================
--- branches/new-help-system/base/doc/Makefile	2010-04-02 15:24:01 UTC (rev 65888)
+++ branches/new-help-system/base/doc/Makefile	2010-04-02 15:46:17 UTC (rev 65889)
@@ -11,6 +11,7 @@
 		port-uninstall.1
 MAN5=		macports.conf.5
 MAN7=		portfile.7 portstyle.7 porthier.7 portgroup.7
+MAN=		${MAN1} ${MAN5} ${MAN7}
 INSTALLDIR=	${DESTDIR}${prefix}
 TOPSRCDIR=	..
 
@@ -20,11 +21,11 @@
 
 all: man
 
-man: ${MAN1} ${MAN5} ${MAN7} ${MAN1:.1=.1.gz} ${MAN5:.5=.5.gz} ${MAN7:.7=.7.gz}
+man: ${MAN} ${MAN:%=%.gz}
 
-xml: ${MAN1:.1=.1.xml} ${MAN5:.5=.5.xml} ${MAN7:.7=.7.xml}
+xml: ${MAN:%=%.xml}
 
-html: ${MAN1:.1=.1.html} ${MAN5:.5=.5.html} ${MAN7:.7=.7.html}
+html: ${MAN:%=%.html}
 
 clean:
 	rm -f *.{1,5,7}
@@ -52,9 +53,15 @@
 %: %.xml manpage.xsl
 	$(XSLTPROC) $(XSLTFLAGS) manpage.xsl $<
 
+%: %.soelim
+	ln -f $< $@
+
 %.html: %.txt
 	$(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b xhtml11 $<
 
+%.html: %.soelim
+	ln -sf $(shell awk '{print $$2}' < $<) $@
+
 install: all
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}

Modified: branches/new-help-system/base/doc/manpage.xsl
===================================================================
--- branches/new-help-system/base/doc/manpage.xsl	2010-04-02 15:24:01 UTC (rev 65888)
+++ branches/new-help-system/base/doc/manpage.xsl	2010-04-02 15:46:17 UTC (rev 65889)
@@ -5,12 +5,8 @@
 
 <xsl:param name="man.base.url.for.relative.links">http://guide.macports.org/</xsl:param>
 
-<xsl:template match="literal">
-	<xsl:value-of select="$git.docbook.backslash"/>
-	<xsl:text>fB</xsl:text>
-	<xsl:apply-templates/>
-	<xsl:value-of select="$git.docbook.backslash"/>
-	<xsl:text>fR</xsl:text>
+<!-- Do not write soelim files -->
+<xsl:template name="write.stubs">
 </xsl:template>
 
 </xsl:stylesheet>

Added: branches/new-help-system/base/doc/port-deactivate.1.soelim
===================================================================
--- branches/new-help-system/base/doc/port-deactivate.1.soelim	                        (rev 0)
+++ branches/new-help-system/base/doc/port-deactivate.1.soelim	2010-04-02 15:46:17 UTC (rev 65889)
@@ -0,0 +1 @@
+.so man1/port-activate.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100402/b2270db6/attachment.html>


More information about the macports-changes mailing list