moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix detecting missing downloaded and compiled OOXML jars, remove older versions of apache-rat correctly

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1631249 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2014-10-12 20:07:11 +00:00
parent a16db327fd
commit 591d82f2e3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.xml
View File

@ -391,7 +391,7 @@ under the License.
<include name="log4j-1.2.13*"/> <include name="log4j-1.2.13*"/>
<include name="org.jacoco.*-0.6.*"/> <include name="org.jacoco.*-0.6.*"/>
<include name="dom4j*"/> <include name="dom4j*"/>
<include name="rat-0.10*"/> <include name="apache-rat-0.10*"/>
</fileset> </fileset>
</delete> </delete>
@ -495,7 +495,6 @@ under the License.
<and> <and>
<available file="${ooxml.xmlbeans23.jar}"/> <available file="${ooxml.xmlbeans23.jar}"/>
<available file="${ooxml.xmlbeans26.jar}"/> <available file="${ooxml.xmlbeans26.jar}"/>
<available file="${ooxml.xsds.jar}"/>
</and> </and>
<isset property="disconnected"/> <isset property="disconnected"/>
</or> </or>
@ -518,6 +517,7 @@ under the License.
<or> <or>
<and> <and>
<available file="${ooxml.lib}/${ooxml.xsds.izip.1}"/> <available file="${ooxml.lib}/${ooxml.xsds.izip.1}"/>
<available file="${ooxml.lib}/${ooxml.xsds.izip.2}"/>
</and> </and>
<isset property="disconnected"/> <isset property="disconnected"/>
</or> </or>
@ -554,7 +554,10 @@ under the License.
<target name="check-compiled-ooxml-xsds" depends="fetch-ooxml-xsds"> <target name="check-compiled-ooxml-xsds" depends="fetch-ooxml-xsds">
<condition property="ooxml-compiled-xsds.present"> <condition property="ooxml-compiled-xsds.present">
<or> <or>
<available file="${ooxml.xsds.jar}"/> <and>
<available file="${ooxml.xsds.jar}"/>
<available file="${ooxml.encryption.jar}"/>
</and>
<isset property="disconnected"/> <isset property="disconnected"/>
</or> </or>
</condition> </condition>