You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2012/03/06 13:36:58 UTC
svn commit: r1297447 - in /db/derby/docs/branches/10.7: ./ build.xml
lib/fo2html.xsl
Author: kahatlen
Date: Tue Mar 6 12:36:57 2012
New Revision: 1297447
URL: http://svn.apache.org/viewvc?rev=1297447&view=rev
Log:
DERBY-5586: Remove the fo2html.xsl script from the docs repository
Merged revision 1297403 from trunk.
Removed:
db/derby/docs/branches/10.7/lib/fo2html.xsl
Modified:
db/derby/docs/branches/10.7/ (props changed)
db/derby/docs/branches/10.7/build.xml
Propchange: db/derby/docs/branches/10.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 12:36:57 2012
@@ -1 +1 @@
-/db/derby/docs/trunk:1045405
+/db/derby/docs/trunk:1045405,1297403
Modified: db/derby/docs/branches/10.7/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.7/build.xml?rev=1297447&r1=1297446&r2=1297447&view=diff
==============================================================================
--- db/derby/docs/branches/10.7/build.xml (original)
+++ db/derby/docs/branches/10.7/build.xml Tue Mar 6 12:36:57 2012
@@ -21,22 +21,19 @@ limitations under the License.
<target name="usage">
<echo message="For pdf output, run "ant pdf""/>
<echo message="For html output with frames, run "ant html""/>
- <echo message="For html output as a single page, run "ant monohtml""/>
<echo message="For output in all formats in all idioms, run "ant all""/>
<echo message="For Brazilian Portuguese output, run "ant pt_BR.usage""/>
</target>
- <!-- PDFs are built as a part of the monohtml target -->
- <target name="all" depends="html,monohtml,pt_BR,ja_JP"/>
+ <target name="all" depends="html,pdf,pt_BR,ja_JP"/>
- <!-- targets that build all formats of each manual. PDFs are built -->
- <!-- as a dependent of the monohtml target -->
- <target name="adminguide" depends="init,html.adminguide,monohtml.adminguide"/>
- <target name="devguide" depends="init,html.devguide,monohtml.devguide"/>
- <target name="getstart" depends="init,html.getstart,monohtml.getstart"/>
- <target name="ref" depends="init,html.ref,monohtml.ref"/>
- <target name="tools" depends="init,html.tools,monohtml.tools"/>
- <target name="tuning" depends="init,html.tuning,monohtml.tuning"/>
+ <!-- targets that build all formats of each manual. -->
+ <target name="adminguide" depends="init,html.adminguide,pdf.adminguide"/>
+ <target name="devguide" depends="init,html.devguide,pdf.devguide"/>
+ <target name="getstart" depends="init,html.getstart,pdf.getstart"/>
+ <target name="ref" depends="init,html.ref,pdf.ref"/>
+ <target name="tools" depends="init,html.tools,pdf.tools"/>
+ <target name="tuning" depends="init,html.tuning,pdf.tuning"/>
<target name="html" depends="init,html.getstart,html.tools,html.devguide,html.adminguide,html.ref,html.tuning"/>
@@ -226,63 +223,6 @@ limitations under the License.
</ant>
</target>
- <target name="monohtml" depends="monohtml.adminguide,monohtml.devguide,monohtml.getstart,monohtml.ref,monohtml.tools,monohtml.tuning"/>
-
- <target name="monohtml.adminguide" depends="init,pdf.adminguide">
- <antcall target="monohtml.dita">
- <param name="manual.name" value="adminguide"/>
- <param name="manual.dir" value="adminguide"/>
- <param name="manual.fo" value="derbyadmin.fo"/>
- </antcall>
- </target>
-
- <target name="monohtml.devguide" depends="init,pdf.devguide">
- <antcall target="monohtml.dita">
- <param name="manual.name" value="devguide"/>
- <param name="manual.dir" value="devguide"/>
- <param name="manual.fo" value="derbydev.fo"/>
- </antcall>
- </target>
-
- <target name="monohtml.getstart" depends="init,pdf.getstart">
- <antcall target="monohtml.dita">
- <param name="manual.name" value="getstart"/>
- <param name="manual.dir" value="getstart"/>
- <param name="manual.fo" value="getstartderby.fo"/>
- </antcall>
- </target>
-
- <target name="monohtml.ref" depends="init,pdf.ref">
- <antcall target="monohtml.dita">
- <param name="manual.name" value="ref"/>
- <param name="manual.dir" value="ref"/>
- <param name="manual.fo" value="refderby.fo"/>
- </antcall>
- </target>
-
- <target name="monohtml.tools" depends="init,pdf.tools">
- <antcall target="monohtml.dita">
- <param name="manual.name" value="tools"/>
- <param name="manual.dir" value="tools"/>
- <param name="manual.fo" value="derbytools.fo"/>
- </antcall>
- </target>
-
- <target name="monohtml.tuning" depends="init,pdf.tuning">
- <antcall target="monohtml.dita">
- <param name="manual.name" value="tuning"/>
- <param name="manual.dir" value="tuning"/>
- <param name="manual.fo" value="tuningderby.fo"/>
- </antcall>
- </target>
-
- <target name="monohtml.dita">
- <xslt processor="trax"
- in="${dita.output.dir}/${manual.dir}/${manual.fo}"
- out="${dita.output.dir}/${manual.dir}/${manual.name}-single.html"
- style="${basedir}/lib/fo2html.xsl"/>
- </target>
-
<!-- Preprocess the devguide source, which the ref manual depends on -->
<target name="preprocess-devguide">
<antcall target="preprocess">
@@ -333,7 +273,7 @@ limitations under the License.
<!-- Brazilian Portuguese manuals -->
- <target name="pt_BR" depends="init,pt_BR_image,pt_BR.html,pt_BR.monohtml"/>
+ <target name="pt_BR" depends="init,pt_BR_image,pt_BR.html"/>
<target name="pt_BR_image">
<copy todir="${dita.output.dir}/pt_BR/images">
@@ -353,25 +293,16 @@ limitations under the License.
<ant dir="src/pt_BR" target="pt_BR.ref.pdf"/>
</target>
- <target name="pt_BR.monohtml" depends="init">
- <ant dir="src/pt_BR" target="pt_BR.adminguide.monohtml"/>
- <ant dir="src/pt_BR" target="pt_BR.getstart.monohtml"/>
- <ant dir="src/pt_BR" target="pt_BR.ref.monohtml"/>
- </target>
-
<target name="pt_BR.adminguide" depends="init">
<ant dir="src/pt_BR" target="pt_BR.adminguide.html"/>
- <ant dir="src/pt_BR" target="pt_BR.adminguide.monohtml"/>
</target>
<target name="pt_BR.getstart" depends="init">
<ant dir="src/pt_BR" target="pt_BR.getstart.html"/>
- <ant dir="src/pt_BR" target="pt_BR.getstart.monohtml"/>
</target>
<target name="pt_BR.ref" depends="init">
<ant dir="src/pt_BR" target="pt_BR.ref.html"/>
- <ant dir="src/pt_BR" target="pt_BR.ref.monohtml"/>
</target>
<target name="pt_BR.usage">
@@ -379,7 +310,7 @@ limitations under the License.
</target>
<!-- Japanese Japanese manuals -->
- <target name="ja_JP" depends="init,ja_JP_image,ja_JP.html,ja_JP.monohtml"/>
+ <target name="ja_JP" depends="init,ja_JP_image,ja_JP.html"/>
<target name="ja_JP_image">
<copy todir="${dita.output.dir}/ja_JP/images">
@@ -397,19 +328,12 @@ limitations under the License.
<ant dir="src/ja_JP" target="ja_JP.ref.pdf"/>
</target>
- <target name="ja_JP.monohtml" depends="init">
- <ant dir="src/ja_JP" target="ja_JP.getstart.monohtml"/>
- <ant dir="src/ja_JP" target="ja_JP.ref.monohtml"/>
- </target>
-
<target name="ja_JP.getstart" depends="init">
<ant dir="src/ja_JP" target="ja_JP.getstart.html"/>
- <ant dir="src/ja_JP" target="ja_JP.getstart.monohtml"/>
</target>
<target name="ja_JP.ref" depends="init">
<ant dir="src/ja_JP" target="ja_JP.ref.html"/>
- <ant dir="src/ja_JP" target="ja_JP.ref.monohtml"/>
</target>
<target name="ja_JP.usage">