Skip to content

Commit

Permalink
Fixes a property conflict with the XMLA jar publish target.
Browse files Browse the repository at this point in the history
git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@406 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information
lucboudreau committed Mar 19, 2011
1 parent c62104f commit d302c08
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -341,17 +341,17 @@ class XmlaOlap4jDriverVersion {
</if>
</sequential>
<property
name="publish.file"
name="publish.file.xmla"
value="${dist.dir}/${ivy.artifact.id}-xmla-${project.revision}.jar"/>
<sequential>
<fail message="No file found at: ${publish.file}">
<fail message="No file found at: ${publish.file.xmla}">
<condition>
<not>
<available file="${publish.file}" />
<available file="${publish.file.xmla}" />
</not>
</condition>
</fail>
<echo message="Publishing ${publish.file} to ${ivy.repository.publish}..." />
<echo message="Publishing ${publish.file.xmla} to ${ivy.repository.publish}..." />
<if>
<isset property="isWindows" />
<then>
Expand All @@ -365,7 +365,7 @@ class XmlaOlap4jDriverVersion {
<arg value="-DartifactId=${ivy.artifact.id}-xmla" />
<arg value="-Dpackaging=jar" />
<arg value="-Dversion=${project.revision}" />
<arg value="-Dfile=${publish.file}" />
<arg value="-Dfile=${publish.file.xmla}" />
</exec>
</then>
<else>
Expand All @@ -377,7 +377,7 @@ class XmlaOlap4jDriverVersion {
<arg value="-DartifactId=${ivy.artifact.id}-xmla" />
<arg value="-Dpackaging=jar" />
<arg value="-Dversion=${project.revision}" />
<arg value="-Dfile=${publish.file}" />
<arg value="-Dfile=${publish.file.xmla}" />
</exec>
</else>
</if>
Expand Down

0 comments on commit d302c08

Please sign in to comment.