db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1297502 - in /db/derby/docs/branches/10.3: ./ build.xml lib/fo2html.xsl src/ja_JP/build.xml src/pt_BR/build.xml
Date Tue, 06 Mar 2012 14:42:13 GMT
Author: kahatlen
Date: Tue Mar  6 14:42:12 2012
New Revision: 1297502

URL: http://svn.apache.org/viewvc?rev=1297502&view=rev
Log:
DERBY-5586: Remove the fo2html.xsl script from the docs repository

Merged revisions 1297403 and 1297472 from trunk and resolved conflicts.

Removed:
    db/derby/docs/branches/10.3/lib/fo2html.xsl
Modified:
    db/derby/docs/branches/10.3/   (props changed)
    db/derby/docs/branches/10.3/build.xml
    db/derby/docs/branches/10.3/src/ja_JP/build.xml
    db/derby/docs/branches/10.3/src/pt_BR/build.xml

Propchange: db/derby/docs/branches/10.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 14:42:12 2012
@@ -1 +1 @@
-/db/derby/docs/trunk:808424
+/db/derby/docs/trunk:808424,1297403,1297472

Modified: db/derby/docs/branches/10.3/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/build.xml?rev=1297502&r1=1297501&r2=1297502&view=diff
==============================================================================
--- db/derby/docs/branches/10.3/build.xml (original)
+++ db/derby/docs/branches/10.3/build.xml Tue Mar  6 14:42:12 2012
@@ -21,22 +21,19 @@ limitations under the License.
   <target name="usage">
     <echo message="For pdf output, run &quot;ant pdf&quot;"/>
     <echo message="For html output with frames, run &quot;ant html&quot;"/>
-    <echo message="For html output as a single page, run &quot;ant monohtml&quot;"/>
     <echo message="For output in all formats in all idioms, run &quot;ant all&quot;"/>
     <echo message="For Brazilian Portuguese output, run &quot;ant pt_BR.usage&quot;"/>
   </target>
 
-  <!-- PDFs are built as a part of the monohtml target -->
-  <target name="all" depends="html,monohtml"/>
+  <target name="all" depends="html,pdf"/>
 
-  <!-- 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"/>
 
@@ -218,63 +215,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>
-
   <target name="clean">
     <delete dir="${dita.output.dir}"/>
     <delete dir="${dita.temp.dir}"/>
@@ -286,8 +226,8 @@ limitations under the License.
 
   <!-- Brazilian Portuguese manuals -->
 
-  <target name="pt_BR" depends="init,pt_BR.html,pt_BR.monohtml"/>
-
+  <target name="pt_BR" depends="init,pt_BR.html,pt_BR.pdf"/>
+ 
   <target name="pt_BR.html" depends="init">
     <ant dir="src/pt_BR" target="pt_BR.adminguide.html"/>
     <ant dir="src/pt_BR" target="pt_BR.getstart.html"/>
@@ -300,25 +240,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">
@@ -326,7 +257,7 @@ limitations under the License.
   </target>
     
   <!-- Japanese Japanese manuals -->
-  <target name="ja_JP" depends="init,ja_JP.html,ja_JP.monohtml"/>
+  <target name="ja_JP" depends="init,ja_JP.html,ja_JP.pdf"/>
 
   <target name="ja_JP.html" depends="init">
     <ant dir="src/ja_JP" target="ja_JP.getstart.html"/>
@@ -336,13 +267,8 @@ limitations under the License.
     <ant dir="src/ja_JP" target="ja_JP.getstart.pdf"/>
   </target>
 
-  <target name="ja_JP.monohtml" depends="init">
-    <ant dir="src/ja_JP" target="ja_JP.getstart.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.usage">

Modified: db/derby/docs/branches/10.3/src/ja_JP/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/ja_JP/build.xml?rev=1297502&r1=1297501&r2=1297502&view=diff
==============================================================================
--- db/derby/docs/branches/10.3/src/ja_JP/build.xml (original)
+++ db/derby/docs/branches/10.3/src/ja_JP/build.xml Tue Mar  6 14:42:12 2012
@@ -22,13 +22,12 @@
   <target name="usage">
     <echo message="Building Japanese Manuals:"/>
     <echo message="For html output with frames, run &quot;ant ja_JP.html&quot;"/>
-    <echo message="For html output as a single page, run &quot;ant ja_JP.monohtml&quot;"/>
     <echo message="For output in all formats, run &quot;ant ja_JP&quot;"/>
   </target>
 
   <target name="ja_JP.getstart">
     <antcall target="ja_JP.getstart.html"/>
-    <antcall target="ja_JP.getstart.monohtml"/>
+    <antcall target="ja_JP.getstart.pdf"/>
   </target>
 
   <target name="ja_JP.getstart.html">
@@ -46,12 +45,4 @@
     </ant>
   </target>
 
-  <target name="ja_JP.getstart.monohtml" depends="ja_JP.getstart.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="getstart"/>
-      <property name="manual.dir" value="ja_JP/getstart"/>
-      <property name="manual.fo" value="getstartderby.fo"/>
-    </ant>
-  </target>
-  
 </project>

Modified: db/derby/docs/branches/10.3/src/pt_BR/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.3/src/pt_BR/build.xml?rev=1297502&r1=1297501&r2=1297502&view=diff
==============================================================================
--- db/derby/docs/branches/10.3/src/pt_BR/build.xml (original)
+++ db/derby/docs/branches/10.3/src/pt_BR/build.xml Tue Mar  6 14:42:12 2012
@@ -23,13 +23,12 @@
     <echo message="Building Brazilian Portuguese Manuals:"/>
     <echo message="For pdf output, run &quot;ant pt_BR.pdf&quot;"/>
     <echo message="For html output with frames, run &quot;ant pt_BR.html&quot;"/>
-    <echo message="For html output as a single page, run &quot;ant pt_BR.monohtml&quot;"/>
     <echo message="For output in all formats, run &quot;ant pt_BR&quot;"/>
   </target>
 
   <target name="pt_BR.adminguide">
     <antcall target="pt_BR.adminguide.html"/>
-    <antcall target="pt_BR.adminguide.monohtml"/>
+    <antcall target="pt_BR.adminguide.pdf"/>
   </target>
 
 
@@ -48,17 +47,9 @@
     </ant>
   </target>
 
-  <target name="pt_BR.adminguide.monohtml" depends="pt_BR.adminguide.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="adminguide"/>
-      <property name="manual.dir" value="pt_BR/adminguide"/>
-      <property name="manual.fo" value="derbyadmin.fo"/>
-    </ant>
-  </target>
-
   <target name="pt_BR.getstart">
     <antcall target="pt_BR.getstart.html"/>
-    <antcall target="pt_BR.getstart.monohtml"/>
+    <antcall target="pt_BR.getstart.pdf"/>
   </target>
 
   <target name="pt_BR.getstart.html">
@@ -76,17 +67,9 @@
     </ant>
   </target>
 
-  <target name="pt_BR.getstart.monohtml" depends="pt_BR.getstart.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="getstart"/>
-      <property name="manual.dir" value="pt_BR/getstart"/>
-      <property name="manual.fo" value="getstartderby.fo"/>
-    </ant>
-  </target>
-
   <target name="pt_BR.ref">
     <antcall target="pt_BR.ref.html"/>
-    <antcall target="pt_BR.ref.monohtml"/>
+    <antcall target="pt_BR.ref.pdf"/>
   </target>
 
   <target name="pt_BR.ref.html">
@@ -104,12 +87,4 @@
     </ant>
   </target>
 
-  <target name="pt_BR.ref.monohtml" depends="pt_BR.ref.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="ref"/>
-      <property name="manual.dir" value="pt_BR/ref"/>
-      <property name="manual.fo" value="refderby.fo"/>
-    </ant>
-  </target>
-
 </project>



Mime
View raw message