You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2006/12/07 20:10:27 UTC
svn commit: r483610 - /db/derby/code/trunk/build.xml
Author: fuzzylogic
Date: Thu Dec 7 11:10:27 2006
New Revision: 483610
URL: http://svn.apache.org/viewvc?view=rev&rev=483610
Log:
DERBY-2163: Remove service extension entry from locale jars and derbyrun.jar.
Also remove stale references to COPYRIGHT.
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=483610&r1=483609&r2=483610
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Dec 7 11:10:27 2006
@@ -1332,7 +1332,7 @@
<mkdir dir="${derby.jar.dir}/lists/META-INF"/>
<copy todir="${derby.jar.dir}/lists/META-INF">
- <fileset dir="${basedir}" includes="LICENSE*,NOTICE*,COPYRIGHT*"/>
+ <fileset dir="${basedir}" includes="LICENSE*,NOTICE*"/>
</copy>
<manifest file="${derby.jar.dir}/lists/smfcmd.mf">
@@ -1348,7 +1348,7 @@
<fileset dir="${out.dir}"
includes="org/apache/derby/iapi/tools/**"/>
<fileset dir="${derby.jar.dir}/lists"
- includes="META-INF/**"/>
+ includes="META-INF/LICENSE,META-INF/NOTICE"/>
</jar>
</target>
@@ -1444,7 +1444,7 @@
org/apache/derby/loc/*_${locale.iname}.properties,
org/apache/derby/loc/drda/*_${locale.iname}.properties"/>
<fileset dir="${derby.jar.dir}/lists"
- includes="META-INF/**"/>
+ includes="META-INF/LICENSE,META-INF/NOTICE"/>
</jar>
</target>
@@ -1508,7 +1508,7 @@
<mkdir dir="${derby.jar.dir}/lists/META-INF"/>
<copy todir="${derby.jar.dir}/lists/META-INF">
- <fileset dir="${basedir}" includes="LICENSE*,NOTICE*,COPYRIGHT*"/>
+ <fileset dir="${basedir}" includes="LICENSE*,NOTICE*"/>
</copy>
</target>
@@ -1609,23 +1609,23 @@
<property file="${basedir}/snapshot/maintversion.properties"/>
<zip destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
<zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
- <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,COPYRIGHT,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
+ <zipfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
</zip>
<tar destfile="${basedir}/snapshot/db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
compression="gzip">
<tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/insane" includes="*.jar,*.war"/>
- <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin,COPYRIGHT,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
+ <tarfileset prefix="db-derby-snapshot-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
</tar>
<!-- debug archives - DERBY-178 -->
<zip destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
<zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
- <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,COPYRIGHT,LICENSE,NOTICE,CHANGES,README,javadoc/publishedapi/**"/>
+ <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,CHANGES,README,javadoc/publishedapi/**"/>
</zip>
<tar destfile="${basedir}/snapshot/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
compression="gzip">
<tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${basedir}/jars/sane" includes="*.jar,*.war"/>
- <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,COPYRIGHT,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
+ <tarfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,README,javadoc/publishedapi/**"/>
</tar>
<copy file="${basedir}/jars/insane/derby_core_plugin_${major}.${minor}.${interim}.zip"