You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/05/11 22:15:05 UTC
svn commit: r537280 -
/incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml
Author: schor
Date: Fri May 11 13:15:04 2007
New Revision: 537280
URL: http://svn.apache.org/viewvc?view=rev&rev=537280
Log:
[UIMA-401] fix build-docbook to read local.docbook.properties first before doing the
skip control settings.
Modified:
incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml
Modified: incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml?view=diff&rev=537280&r1=537279&r2=537280
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml Fri May 11 13:15:04 2007
@@ -131,10 +131,6 @@
<property name="jai.version" value="1.1.3"/>
<!-- only this version supported in the auto download script -->
- <!-- Load our properties -->
- <!-- if the file is not there, it is not an error - it is just skipped -->
- <!-- earlier files override later ones -->
- <property file="local.docbook.properties"/> <!-- load from caller project -->
<property file="${docbook.tool.project}/properties/default.docbook.properties"/>
@@ -224,7 +220,7 @@
<!--echoproperties/-->
</target>
- <target name="init_every_time">
+ <target name="init_every_time" depends="init_first">
<!-- if chapter_name is not set, set it to the book_name -->
<condition property="chapter_name" value="${book_name}">
<isset property="book_name"/>
@@ -286,8 +282,17 @@
<or><isset property="skip.html-single"/><isset property="target-book-html-single-uptodate"/></or>
</condition>
-
</target>
+
+ <target name="init_first" unless="init_first_done">
+ <property name="init_first_done" value="ignored"/>
+
+ <!-- Load our properties -->
+ <!-- if the file is not there, it is not an error - it is just skipped -->
+ <!-- earlier files override later ones -->
+ <property file="local.docbook.properties"/> <!-- load from caller project -->
+ </target>
+
<!-- ======================================================================== -->
<!-- == target layout == -->
<!-- ======================================================================== -->