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 2005/11/14 19:35:26 UTC
svn commit: r344178 - /db/derby/code/branches/10.1/build.xml
Author: fuzzylogic
Date: Mon Nov 14 10:35:24 2005
New Revision: 344178
URL: http://svn.apache.org/viewcvs?rev=344178&view=rev
Log:
Merge revision 330290 to 10.1 branch. Build fix for buildjars target caused
by svnversion -n problem adding a linefeed, which breaks manifest file
generation.
Modified:
db/derby/code/branches/10.1/build.xml
Modified: db/derby/code/branches/10.1/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/build.xml?rev=344178&r1=344177&r2=344178&view=diff
==============================================================================
--- db/derby/code/branches/10.1/build.xml (original)
+++ db/derby/code/branches/10.1/build.xml Mon Nov 14 10:35:24 2005
@@ -699,9 +699,13 @@
<property name="derby.jar.topdir" value="${basedir}/jars"/>
<mkdir dir="${derby.jar.dir}"/>
<mkdir dir="${derby.jar.dir}/lists"/>
- <loadfile srcFile="${basedir}/changenumber.properties"
+ <loadfile srcFile="${basedir}/changenumber.properties"
failonerror="false"
- property="changenumber"/>
+ property="changenumber">
+ <filterchain>
+ <striplinebreaks/>
+ </filterchain>
+ </loadfile>
<condition property="changenumber" value="???">
<not>
<isset property="changenumber"/>