db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r570669 - /db/derby/code/branches/10.2/build.xml
Date Wed, 29 Aug 2007 07:43:54 GMT
Author: kristwaa
Date: Wed Aug 29 00:43:54 2007
New Revision: 570669

URL: http://svn.apache.org/viewvc?rev=570669&view=rev
Log:
DERBY-2906: Merged rev 566216 from trunk. Resolved two conflicting lines and fixed a spelling
error.

Modified:
    db/derby/code/branches/10.2/build.xml

Modified: db/derby/code/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/build.xml?rev=570669&r1=570668&r2=570669&view=diff
==============================================================================
--- db/derby/code/branches/10.2/build.xml (original)
+++ db/derby/code/branches/10.2/build.xml Wed Aug 29 00:43:54 2007
@@ -962,6 +962,11 @@
 
     <echo message="Beginning derby.jar ${sanity.name} build"/>
 
+    <!-- purge lists directory to avoid unnecessary content from other jars -->
+    <delete>
+      <fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
+    </delete>
+         
     <concat destfile="${derby.jar.dir}/lists/otherDerbyClasses.properties">
       <fileset dir="${basedir}/tools/jar" includes="*DBMS*.properties"/>
     </concat>
@@ -1143,7 +1148,12 @@
 
     <echo message="Beginning derbytools.jar ${sanity.name} build"/>
 
-    <echo message=" creating tools.list "/>
+    <!-- purge lists directory to avoid unnecessary content from other jars -->
+    <delete>
+      <fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
+    </delete>
+
+    <echo level="info" message=" creating tools.list "/>
     <java classname="org.apache.derbyBuild.classlister" fork="yes">
       <jvmarg value="-Ddb2jtools=true"/>
       <jvmarg value="-Doutputfile=${derby.jar.dir}/lists/derbytools.list"/>
@@ -1192,7 +1202,12 @@
 
     <echo message="Beginning derbynet.jar ${sanity.name} build"/>
 
-    <echo message=" creating net.list"/> 
+    <!-- purge lists directory to avoid unnecessary content from other jars -->
+    <delete>
+      <fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
+    </delete>
+
+    <echo level="info" message=" creating net.list"/> 
     <java classname="org.apache.derbyBuild.classlister" fork="yes">
       <jvmarg value="-Ddb2jdrda=true"/>
       <jvmarg value="-Doutputfile=${derby.jar.dir}/lists/derbynet.list"/>
@@ -1259,6 +1274,11 @@
 
     <echo message="Beginning derbyclient.jar ${sanity.name} build"/>
 
+    <!-- purge lists directory to avoid unnecessary content from other jars -->
+    <delete>
+      <fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
+    </delete>
+
     <copy file="${basedir}/tools/jar/dnc.properties"
           tofile="${derby.jar.dir}/lists/dnc.properties"/>
 
@@ -1321,6 +1341,11 @@
 
     <echo message="Beginning derbyrun.jar build"/>
 
+    <!-- purge lists directory to avoid unnecessary content from other jars -->
+    <delete>
+      <fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
+    </delete>
+
     <mkdir dir="${derby.jar.dir}/lists/META-INF"/>
     <copy todir="${derby.jar.dir}/lists/META-INF">
       <fileset dir="${basedir}" includes="LICENSE*,NOTICE*"/>
@@ -1356,6 +1381,11 @@
 
   <target name="derbylocalejars" depends="initjars">
  
+    <!-- purge lists directory to avoid unnecessary content from other jars -->
+    <delete>
+      <fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
+    </delete>
+
     <!-- copy boilerplate common to derby jar files -->
     <antcall target="meta-inf-common"/>
 



Mime
View raw message