You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2010/12/11 23:36:14 UTC

svn commit: r1044732 - in /httpd/docs-build/trunk: build.xml deps.xml

Author: nd
Date: Sat Dec 11 22:36:14 2010
New Revision: 1044732

URL: http://svn.apache.org/viewvc?rev=1044732&view=rev
Log:
fix dependencies

Modified:
    httpd/docs-build/trunk/build.xml
    httpd/docs-build/trunk/deps.xml

Modified: httpd/docs-build/trunk/build.xml
URL: http://svn.apache.org/viewvc/httpd/docs-build/trunk/build.xml?rev=1044732&r1=1044731&r2=1044732&view=diff
==============================================================================
--- httpd/docs-build/trunk/build.xml (original)
+++ httpd/docs-build/trunk/build.xml Sat Dec 11 22:36:14 2010
@@ -338,7 +338,7 @@
         <!-- iterate over all desired files -->
         <for param="srcfile">
             <path>
-                <fileset dir="../" includes="**/*${inputext.@{lang}}">
+                <fileset dir="../" includes="**/*${inputext.@{lang}}" excludes="mod/*${inputext.@{lang}}">
                     <patternset refid="excludes" />
                     <patternset refid="scratch" />
                 </fileset>
@@ -365,6 +365,36 @@
             </sequential>
         </for>
 
+        <for param="srcfile">
+            <path>
+                <fileset dir="../" includes="mod/*${inputext.@{lang}}">
+                    <patternset refid="excludes" />
+                    <patternset refid="scratch" />
+                </fileset>
+            </path>
+
+            <sequential>
+                <basename property="@{srcfile}.basename" file="@{srcfile}"
+                            suffix="${inputext.@{lang}}" />
+                <dirname  property="@{srcfile}.dirname"  file="@{srcfile}" />
+
+                <!-- depends on the accompanying metafile -->
+                <dependset>
+                    <srcfileset dir="${@{srcfile}.dirname}"
+                           includes="${@{srcfile}.basename}.xml.meta
+                                     ${@{srcfile}.basename}.xml" />
+                    <targetfileset dir="${@{srcfile}.dirname}"
+                       includes="${@{srcfile}.basename}${outputext.@{lang}}" />
+                </dependset>
+
+                <xslt in="@{srcfile}"
+                     out="${@{srcfile}.dirname}/${@{srcfile}.basename}${outputext.@{lang}}"
+                   style="../style/manual.@{lang}.xsl">
+                    <xmlcatalog refid="w3c-catalog" />
+                </xslt>
+            </sequential>
+        </for>
+
         <if><not><available file="../.outdated.@{lang}" /></not><then>
             <echo message="HTML documentation (@{lang}) is up to date." />
         </then></if>

Modified: httpd/docs-build/trunk/deps.xml
URL: http://svn.apache.org/viewvc/httpd/docs-build/trunk/deps.xml?rev=1044732&r1=1044731&r2=1044732&view=diff
==============================================================================
--- httpd/docs-build/trunk/deps.xml (original)
+++ httpd/docs-build/trunk/deps.xml Sat Dec 11 22:36:14 2010
@@ -60,8 +60,7 @@
                includes="*.xml"
                excludes="index.xml*
                          *-dict.xml*
-                         *.xml.meta
-                         ${ap.modules.@{lang}.translated}" />
+                         *.xml.meta" />
 
         <targetfileset dir="../"
                   includes="mod/index${outputext.@{lang}}
@@ -85,7 +84,7 @@
                   excludes="${ap.noxml.@{lang}}" />
     </dependset>
     <dependset>
-        <srcfileset    dir="../faq"
+        <srcfileset    dir="../faq/"
                   includes="*.xml"
                   excludes="index.xml*
                             all_in_one.xml*" />
@@ -95,7 +94,7 @@
                   excludes="${ap.noxml.@{lang}}" />
     </dependset>
     <dependset>
-        <srcfileset    dir="../faq"
+        <srcfileset    dir="../faq/"
                   includes="*${inputext.@{lang}}"
                   excludes="index.xml*
                             all_in_one.xml*" />