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 kr...@apache.org on 2010/10/21 22:18:19 UTC
svn commit: r1026127 - in /db/derby/code/trunk: build.xml
java/build/org/apache/derbyBuild/ChangesFileGenerator.java
tools/release/build.xml
Author: kristwaa
Date: Thu Oct 21 20:18:18 2010
New Revision: 1026127
URL: http://svn.apache.org/viewvc?rev=1026127&view=rev
Log:
DERBY-4858: Remove deprecated code for generating CHANGES.html
Removed the class generating the CHANGES file, and modified or removed all relevant
ant targets.
Patch file: derby-4858-1a-changes_removal.diff
Removed:
db/derby/code/trunk/java/build/org/apache/derbyBuild/ChangesFileGenerator.java
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/tools/release/build.xml
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1026127&r1=1026126&r2=1026127&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Oct 21 20:18:18 2010
@@ -2121,7 +2121,7 @@
<!-- debug archives - DERBY-178 -->
<zip destfile="${snapshot.dir}/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.zip">
<zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}/lib" dir="${jarsdist.dir}/sane" includes="*.jar,*.war"/>
- <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,CHANGES,README,javadoc/publishedapi/**" excludes="bin/templates/**"/>
+ <zipfileset prefix="db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}" dir="${basedir}" includes="bin/**,LICENSE,NOTICE,README,javadoc/publishedapi/**" excludes="bin/templates/**"/>
</zip>
<tar destfile="${snapshot.dir}/db-derby-snapshot-debug-${major}.${minor}.${interim}.${point}-${changenumber}.tar.gz"
compression="gzip">
Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?rev=1026127&r1=1026126&r2=1026127&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Thu Oct 21 20:18:18 2010
@@ -39,7 +39,7 @@
<!-- Files to be included with and excluded from the source distribution -->
- <property name="src.top.includes" value="BUILDING.html,README,CHANGES.html,COPYRIGHT,KEYS,LICENSE,NOTICE,RELEASE-NOTES.html,STATUS,build.xml,index.html,published_api_overview.html"/>
+ <property name="src.top.includes" value="BUILDING.html,README,COPYRIGHT,KEYS,LICENSE,NOTICE,RELEASE-NOTES.html,STATUS,build.xml,index.html,published_api_overview.html"/>
<property name="src.tools.includes" value="tools/ant/**,tools/ide/**,tools/j2ee/**,tools/jar/**,tools/java/**,tools/javadoc/**,tools/jdbc4/**,tools/testing/**,tools/release/build.xml"/>
<property name="src.dirs.includes" value="java/**,plugins/**,bin/**,maven2/**"/>
<property name="src.includes" value="${src.top.includes},${src.tools.includes},${src.dirs.includes}"/>
@@ -57,8 +57,6 @@
<property name="relnotes.src.summary" value="${basedir}/releaseSummary.xml" />
<property name="relnotes.src.buglist" value="${relnotes.src.reports}/fixedBugsList.xml" />
<property name="relnotes.out.filename" value="${basedir}/RELEASE-NOTES.html" />
- <property name="changesfile.src.buglist" value="${relnotes.src.reports}/changes.xml" />
- <property name="changesfile.out.filename" value="${basedir}/CHANGES.html" />
<!-- Define the task which generates the release notes -->
<taskdef
@@ -67,13 +65,6 @@
classpath="${out.dir}"
/>
-<!-- Define the task which generates the release notes -->
- <taskdef
- name="generateChangesFile"
- classname="org.apache.derbyBuild.ChangesFileGenerator"
- classpath="${out.dir}"
- />
-
<!-- Targets -->
<target name="release" depends="clean,bin,lib,lib-debug,src"/>
@@ -98,9 +89,9 @@
<mkdir dir="${crlf.dir}"/>
<mkdir dir="${lf.dir}"/>
<fixcrlf srcdir="${basedir}" destdir="${crlf.dir}" eol="crlf"
- includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
+ includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
<fixcrlf srcdir="${basedir}" destdir="${lf.dir}" eol="lf"
- includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
+ includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"/>
</target>
@@ -122,32 +113,13 @@
</target>
-<!--
- Generate the Changes File Notes
-
- The ${relnotes.src.reports} property must point at a
- directory containing the following JIRA report:
-
- fixedBugsList.xml - This is a JIRA xml report of issues fixed in the release.
-
--->
- <target name="genchanges">
-
- <generateChangesFile
- summaryFileName="${relnotes.src.summary}"
- bugListFileName="${changesfile.src.buglist}"
- outputFileName="${changesfile.out.filename}"
- />
-
- </target>
-
<!-- bin distribution -->
<target name="bin" depends="bin.zip,bin.tgz"/>
<target name="bin.zip" depends="init">
<zip destfile="${release.dir}/${derby.bin}.zip"
compress="true">
<!-- top-level -->
- <zipfileset dir="${crlf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
+ <zipfileset dir="${crlf.dir}" includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
prefix="${derby.bin}/"/>
<zipfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
<!-- bin -->
@@ -206,7 +178,7 @@
<tar destfile="${release.dir}/${derby.bin}.tar.gz"
compression="gzip" longfile="gnu">
<!-- top-level -->
- <tarfileset dir="${lf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
+ <tarfileset dir="${lf.dir}" includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
prefix="${derby.bin}/"/>
<tarfileset dir="${basedir}" includes="index.html" prefix="${derby.bin}/"/>
<!-- bin -->
@@ -265,7 +237,7 @@
<target name="lib.zip" depends="init">
<zip destfile="${release.dir}/${derby.lib}.zip"
compress="true">
- <zipfileset dir="${crlf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
+ <zipfileset dir="${crlf.dir}" includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
prefix="${derby.lib}/"/>
<zipfileset dir="${basedir}/jars/insane" prefix="${derby.lib}/lib" includes="derby*.*"
excludes="derby_core_plugin*,derbyTesting.jar"/>
@@ -279,7 +251,7 @@
<target name="lib.tgz">
<tar destfile="${release.dir}/${derby.lib}.tar.gz"
compression="gzip">
- <tarfileset dir="${lf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
+ <tarfileset dir="${lf.dir}" includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
prefix="${derby.lib}/"/>
<tarfileset dir="${basedir}/jars/insane" prefix="${derby.lib}/lib" includes="derby*.*"
excludes="derby_core_plugin*,derbyTesting.jar"/>
@@ -296,7 +268,7 @@
<target name="lib-debug.zip" depends="init">
<zip destfile="${release.dir}/${derby.lib-debug}.zip"
compress="true">
- <zipfileset dir="${crlf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
+ <zipfileset dir="${crlf.dir}" includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
prefix="${derby.lib-debug}/"/>
<zipfileset dir="${basedir}/jars/sane" prefix="${derby.lib-debug}/lib" includes="derby*.*"
excludes="derby_core_plugin*,derbyTesting.jar"/>
@@ -310,7 +282,7 @@
<target name="lib-debug.tgz">
<tar destfile="${release.dir}/${derby.lib-debug}.tar.gz"
compression="gzip">
- <tarfileset dir="${lf.dir}" includes="CHANGES.html,COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
+ <tarfileset dir="${lf.dir}" includes="COPYRIGHT,LICENSE,KEYS,NOTICE,RELEASE-NOTES.html"
prefix="${derby.lib-debug}/"/>
<tarfileset dir="${basedir}/jars/sane" prefix="${derby.lib-debug}/lib" includes="derby*.*"
excludes="derby_core_plugin*,derbyTesting.jar"/>