svn commit: r669252 - /xml/security/trunk/build.xml

[mu...@apache.org]

Author: mullan
Date: Wed Jun 18 11:39:00 2008
New Revision: 669252

URL: http://svn.apache.org/viewvc?rev=669252&view=rev
Log:
Fix problem with do.check.bindist target. Corrected names of the jars that
it was looking for (missing version information). Also copy xml-apis.jar
to lib directory of binary distribution (test target was failing without it).

Modified:
    xml/security/trunk/build.xml

Modified: xml/security/trunk/build.xml
URL: http://svn.apache.org/viewvc/xml/security/trunk/build.xml?rev=669252&r1=669251&r2=669252&view=diff
==============================================================================
--- xml/security/trunk/build.xml (original)
+++ xml/security/trunk/build.xml Wed Jun 18 11:39:00 2008
@@ -65,9 +65,9 @@
     <property name="lib.clover"		value="${dir.libs}/clover.jar" />
 
     <!-- XML Security libraries (for bin distribution) -->
-    <property name="lib.xmlsec"         value="${dir.libs}/xmlsec.jar" />
-    <property name="lib.xmlsec.samples" value="${dir.libs}/xmlsecSamples.jar"/>
-    <property name="lib.xmlsec.tests"   value="${dir.libs}/xmlsecTests.jar" />
+    <property name="lib.xmlsec"         value="${dir.libs}/xmlsec-${product.version}.jar" />
+    <property name="lib.xmlsec.samples" value="${dir.libs}/xmlsecSamples-${product.version}.jar"/>
+    <property name="lib.xmlsec.tests"   value="${dir.libs}/xmlsecTests-${product.version}.jar" />
 
     <!-- JAR properties -->
     <property name="jar.library"        value="${dir.build}/xmlsec-${product.version}.jar" />
@@ -245,14 +245,14 @@
 
     <target name="do.check.bindist">
 	<condition property="is.bin.dist">
-		<and>
-			<available file="${lib.xmlsec}" />
-			<available file="${lib.xmlsec.samples}" />
-			<available file="${lib.xmlsec.tests}" />
-			<not>
-				<available type="dir" file="src" />
-			</not>
-		</and>
+	    <and>
+		<available file="${lib.xmlsec}" />
+		<available file="${lib.xmlsec.samples}" />
+		<available file="${lib.xmlsec.tests}" />
+		<not>
+		    <available type="dir" file="src" />
+		</not>
+	    </and>
 	</condition>
     </target>
 
@@ -659,6 +659,8 @@
 	      todir="${dir.build.bindist}/libs"/>
 	<copy file="${lib.xalan.2}" 
 	      todir="${dir.build.bindist}/libs"/>
+	<copy file="${lib.xalan.3}" 
+	      todir="${dir.build.bindist}/libs"/>
 	<copy file="${lib.logging}" 
 	      todir="${dir.build.bindist}/libs"/>
 	<copy file="${lib.logging.api}" 
@@ -676,11 +678,11 @@
 
 	<mkdir dir="${dir.build.bindist}/doc"/>
 	<copy todir="${dir.build.bindist}/doc">
-		<fileset dir="${dir.docs}/build/site"/>
+	    <fileset dir="${dir.docs}/build/site"/>
 	</copy>
 	<mkdir dir="${dir.build.bindist}/doc/Java/api" />
 	<copy todir="${dir.build.bindist}/doc/Java/api">
-		<fileset dir="${dir.build.docs.html}/javadoc"/>
+	    <fileset dir="${dir.build.docs.html}/javadoc"/>
 	</copy>
 
 	<zip basedir="${dir.build.dist}/bin"