db-derby-commits mailing list archives

Author: kristwaa
Date: Wed Aug 15 08:17:52 2007
New Revision: 566216

URL: http://svn.apache.org/viewvc?view=rev&rev=566216
Log:
DERBY-2906: derbynet.jar & derbytools.jar incorrectly have a META-INF/services/java.sql.Driver
entry. All jar build targets now delete the content of the lists directory before creating
the jar.
Patch file: derby-2906-1a.diff

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?view=diff&rev=566216&r1=566215&r2=566216
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Aug 15 08:17:52 2007
@@ -1012,6 +1012,11 @@
 
     <echo level="info" message="Beginning derby.jar ${sanity.name} build"/>
 
+    <!-- purge lists directory to avoid unneccesary 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>
@@ -1187,6 +1192,11 @@
 
     <echo level="info" message="Beginning derbytools.jar ${sanity.name} build"/>
 
+    <!-- purge lists directory to avoid unneccesary 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"/>
@@ -1236,6 +1246,11 @@
 
     <echo level="info" message="Beginning derbynet.jar ${sanity.name} build"/>
 
+    <!-- purge lists directory to avoid unneccesary 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"/>
@@ -1304,6 +1319,11 @@
 
     <echo level="info" message="Beginning derbyclient.jar ${sanity.name} build"/>
 
+    <!-- purge lists directory to avoid unneccesary 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"/>
 
@@ -1366,6 +1386,11 @@
 
     <echo level="info" message="Beginning derbyrun.jar build"/>
 
+    <!-- purge lists directory to avoid unneccesary 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*"/>
@@ -1401,6 +1426,11 @@
 
   <target name="derbylocalejars" depends="initjars">
  
+    <!-- purge lists directory to avoid unneccesary 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"/>