Return-Path: 
 <cvs-return-33656-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 20897 invoked from network); 19 Sep 2009 15:41:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Sep 2009 15:41:09 -0000
Received: (qmail 51957 invoked by uid 500); 19 Sep 2009 15:41:08 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 51873 invoked by uid 500); 19 Sep 2009 15:41:08 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 51864 invoked by uid 99); 19 Sep 2009 15:41:08 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Sep 2009 15:41:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Sep 2009 15:41:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6FB53238889C; Sat, 19 Sep 2009 15:40:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r816938 - in /httpd/httpd/trunk/docs/manual/style:
 lang-targets.xml xsl/language.xsl
Date: Sat, 19 Sep 2009 15:40:43 -0000
To: cvs@httpd.apache.org
From: rjung@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090919154043.6FB53238889C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rjung
Date: Sat Sep 19 15:40:42 2009
New Revision: 816938

URL: http://svn.apache.org/viewvc?rev=816938&view=rev
Log:
Add ant task to html manual and man page generation:
- check-man checks for the presence of the "man"
  directory and sets an ant property skip-man in
  case the directory is missing
- all the man age generating tasks first call
  check-man as a dependency, and then only run
  if skip-man is unset.

Thats useful for unbundled modules like mod_ftp
and mod_fcgid, which do not have a man directory.
Building their docs otherwise bombs.

Modified:
    httpd/httpd/trunk/docs/manual/style/lang-targets.xml
    httpd/httpd/trunk/docs/manual/style/xsl/language.xsl

Modified: httpd/httpd/trunk/docs/manual/style/lang-targets.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang-targets.xml?rev=816938&r1=816937&r2=816938&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang-targets.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang-targets.xml Sat Sep 19 15:40:42 2009
@@ -22,6 +22,7 @@
 <!-- ==================================================================== -->
 <project name="lang-targets">
 
+<target name="check-man"><if><not><available type="dir" file="../../man"/></not><then><property value="yes" name="skip-man"/></then></if></target>
 <target description="- builds all HTML files and nroff man pages" name="all" depends="de, en, es, fr, ja, ko, pt-br, ru, tr"/>
 <target description="- builds all zip download packages" name="zip-all" depends="zip-de, zip-en, zip-es, zip-fr, zip-ja, zip-ko, zip-pt-br, zip-ru, zip-tr"/>
 <target description="- builds all war download packages" name="war-all" depends="war-de, war-en, war-es, war-fr, war-ja, war-ko, war-pt-br, war-ru, war-tr"/>
@@ -72,7 +73,7 @@
 <target description="- builds the English CHM file" name="chm-en">
     <chm.generic lang="en"/>
 </target>
-<target description="- builds the English nroff files" name="man-en">
+<target description="- builds the English nroff files" unless="skip-man" depends="check-man" name="man-en">
     <nroff.generic lang="en"/>
 </target>
 <target description="- builds the English latex file" name="latex-en">
@@ -230,7 +231,7 @@
 <target description="- builds the Turkish CHM file" name="chm-tr">
     <chm.generic lang="tr"/>
 </target>
-<target description="- builds the Turkish nroff files" name="man-tr">
+<target description="- builds the Turkish nroff files" unless="skip-man" depends="check-man" name="man-tr">
     <nroff.generic lang="tr"/>
 </target>
 

Modified: httpd/httpd/trunk/docs/manual/style/xsl/language.xsl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/xsl/language.xsl?rev=816938&r1=816937&r2=816938&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/xsl/language.xsl (original)
+++ httpd/httpd/trunk/docs/manual/style/xsl/language.xsl Sat Sep 19 15:40:42 2009
@@ -133,6 +133,14 @@
 <project name="lang-targets">
     &lf;&lf;
 
+    <!-- Test for existence of man page directory -->
+    <target name="check-man">
+        <if><not><available file="../../man" type="dir" /></not><then>
+            <property name="skip-man" value="yes" />
+        </then></if>
+    </target>
+    &lf;
+
     <!-- build *-all targets -->
     <!-- =================== -->
     <target name="all"
@@ -237,6 +245,8 @@
 
             <xsl:if test="$file/man">
                 <target name="man-{.}"
+                        depends="check-man"
+                        unless="skip-man"
                         description="- builds the {$file/name} nroff files">&lf;
                     <xsl:text>    </xsl:text>
                     <nroff.generic lang="{.}" />&lf;