Rainer Jung wrote:
> On 18.09.2009 13:29, Jeff Trawick wrote:
>> On Fri, Sep 18, 2009 at 7:09 AM, Rainer Jung <[email protected]
>> So the generation of the html manual works.
>>
>>
>> Note that I don't have any problems getting the html manual generated
>> per se. I just get slightly different output from you and Bill, whether
>> running on Solaris or Mac.
>
> Yes, but that's to be expected, because those informations come out of
> style/xsl/common.xsl (for the Copyright year) and style/version.ent for
> the version info. The make task exports "style" from the 2.2.x branch,
> and at least I did copy it over from trunk, because I hadn't noticed the
> make task. Don't know, where Bill took it from.
Probably was a clone on httpd-2.2 Makefile. In any case; we can change the
build to export trunk and I believe we aught to (so that if we point to any
particular new directive, comment or example, they would resolve).
>> If you want to temporarily get rid of the "man" directory message, you
>> can uncomment the man pages generation in
>> docs/manual/style/lang-targets.xml:
>>
>> @@ -56,7 +56,9 @@
>>
>> <target description="- builds English HTML files" name="en">
>> <html.generic lang="en"/>
>> +<!--
>> <runtarget target="man-en"/>
>> +-->
>> </target>
>> <target unless="-off.en.done" depends="metafiles" name="-off-en">
>> <dependencies.offline dir="_off" style="zip" lang="en"/>
>>
>>
>> That's cool. I guess there is some way to tweak the build definitions
>> so that fcgid can provide a properties file which disables generation of
>> man pages*, but I'm not the right person to do that ;) Otherwise we
>> should just check in an empty man directory.
>
> Bill did that as a quick fix.
Yes, if anyone wants to suggest an update that lets us nuke man/
without modifying the xml, that would be cool. Can we have a conditional
on an 'exists' sort of criteria?
>> *Does this section of lang-targets.xml need an "unless" check for a new
>> property?
>>
>> <target description="- builds the English nroff files" name="man-en">
>> <nroff.generic lang="en"/>
>> </target>
>
> Exactly, I tried something like this:
>
> --- style/xsl/language.xsl 2009-03-20 19:09:28.000000000 +0100
> +++ style/xsl/language.xsl 2009-09-19 02:40:45.000000000 +0200
> @@ -237,6 +237,7 @@
>
> <xsl:if test="$file/man">
> <target name="man-{.}"
> + unless="skip-man"
> description="- builds the {$file/name} nroff
> files">&lf;
> <xsl:text> </xsl:text>
> <nroff.generic lang="{.}" />&lf;
>
> Then you run "./build.sh bootstrap" in docs/manual/build.
> It will regenerate style/lang-targets.xml with the following changes:
>
> --- style/lang-targets.xml 2009-03-20 19:09:31.000000000 +0100
> +++ style/lang-targets.xml 2009-09-19 02:45:11.000000000 +0200
> @@ -72,7 +72,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" name="man-en">
> <nroff.generic lang="en"/>
> </target>
> <target description="- builds the English latex file" name="latex-en">
> @@ -230,7 +230,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" name="man-tr">
> <nroff.generic lang="tr"/>
> </target>
>
> If we want to use this solution, we also should update this generated
> file in svn.
Hmmm :) Interesting.
> The other possibility would be to include another properties file, but
> that would need to sit outside of build and outside of style (since we
> export both from httpd), so maybe there's no good place left.
Well let me tar things up before we going playing with this extensively.
I didn't hear objections, so I'm inclined to tag and roll both ftp and
another fcgid later tomorrow, and at least the builds should suffer no
issues with the docs for now. But I'll make the trunk export change.
Bill
