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 15:06:58 UTC
svn commit: r1297482 - in /db/derby/docs/branches/10.6: ./ build.xml
src/ja_JP/build.xml src/pt_BR/build.xml
Author: kahatlen
Date: Tue Mar 6 14:06:57 2012
New Revision: 1297482
URL: http://svn.apache.org/viewvc?rev=1297482&view=rev
Log:
DERBY-5586: Remove monohtml targets for translated manuals
Merged revision 1297472 from trunk.
Modified:
db/derby/docs/branches/10.6/ (props changed)
db/derby/docs/branches/10.6/build.xml
db/derby/docs/branches/10.6/src/ja_JP/build.xml
db/derby/docs/branches/10.6/src/pt_BR/build.xml
Propchange: db/derby/docs/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 14:06:57 2012
@@ -1 +1 @@
-/db/derby/docs/trunk:938088,958944,1297403
+/db/derby/docs/trunk:938088,958944,1297403,1297472
Modified: db/derby/docs/branches/10.6/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.6/build.xml?rev=1297482&r1=1297481&r2=1297482&view=diff
==============================================================================
--- db/derby/docs/branches/10.6/build.xml (original)
+++ db/derby/docs/branches/10.6/build.xml Tue Mar 6 14:06:57 2012
@@ -226,7 +226,7 @@ limitations under the License.
<!-- Brazilian Portuguese manuals -->
- <target name="pt_BR" depends="init,pt_BR_image,pt_BR.html"/>
+ <target name="pt_BR" depends="init,pt_BR_image,pt_BR.html,pt_BR.pdf"/>
<target name="pt_BR_image">
<copy todir="${dita.output.dir}/pt_BR/images">
@@ -263,7 +263,7 @@ limitations under the License.
</target>
<!-- Japanese Japanese manuals -->
- <target name="ja_JP" depends="init,ja_JP_image,ja_JP.html"/>
+ <target name="ja_JP" depends="init,ja_JP_image,ja_JP.html,ja_JP.pdf"/>
<target name="ja_JP_image">
<copy todir="${dita.output.dir}/ja_JP/images">
Modified: db/derby/docs/branches/10.6/src/ja_JP/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.6/src/ja_JP/build.xml?rev=1297482&r1=1297481&r2=1297482&view=diff
==============================================================================
--- db/derby/docs/branches/10.6/src/ja_JP/build.xml (original)
+++ db/derby/docs/branches/10.6/src/ja_JP/build.xml Tue Mar 6 14:06:57 2012
@@ -22,13 +22,12 @@
<target name="usage">
<echo message="Building Japanese Manuals:"/>
<echo message="For html output with frames, run "ant ja_JP.html""/>
- <echo message="For html output as a single page, run "ant ja_JP.monohtml""/>
<echo message="For output in all formats, run "ant ja_JP""/>
</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,17 +45,9 @@
</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>
-
<target name="ja_JP.ref">
<antcall target="ja_JP.ref.html"/>
- <antcall target="ja_JP.ref.monohtml"/>
+ <antcall target="ja_JP.ref.pdf"/>
</target>
<target name="ja_JP.ref.html">
@@ -74,12 +65,4 @@
</ant>
</target>
- <target name="ja_JP.ref.monohtml" depends="ja_JP.ref.pdf">
- <ant dir="../.." target="monohtml.dita">
- <property name="manual.name" value="ref"/>
- <property name="manual.dir" value="ja_JP/ref"/>
- <property name="manual.fo" value="refderby.fo"/>
- </ant>
- </target>
-
</project>
Modified: db/derby/docs/branches/10.6/src/pt_BR/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.6/src/pt_BR/build.xml?rev=1297482&r1=1297481&r2=1297482&view=diff
==============================================================================
--- db/derby/docs/branches/10.6/src/pt_BR/build.xml (original)
+++ db/derby/docs/branches/10.6/src/pt_BR/build.xml Tue Mar 6 14:06:57 2012
@@ -23,13 +23,12 @@
<echo message="Building Brazilian Portuguese Manuals:"/>
<echo message="For pdf output, run "ant pt_BR.pdf""/>
<echo message="For html output with frames, run "ant pt_BR.html""/>
- <echo message="For html output as a single page, run "ant pt_BR.monohtml""/>
<echo message="For output in all formats, run "ant pt_BR""/>
</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>