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 dj...@apache.org on 2007/11/19 20:27:33 UTC
svn commit: r596405 - in
/db/derby/code/trunk/java/build/org/apache/derbyPreBuild:
PropertySetter.java build.xml
Author: djd
Date: Mon Nov 19 11:27:33 2007
New Revision: 596405
URL: http://svn.apache.org/viewvc?rev=596405&view=rev
Log:
DERBY-3117 Fix compile when j14lib and j15lib are set but vm is not a vendor recognized by PropertySetter. Bug was incorrect property names being passed into setClasspathFromLib()
Modified:
db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml
Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java?rev=596405&r1=596404&r2=596405&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java Mon Nov 19 11:27:33 2007
@@ -202,8 +202,8 @@
String j14lib = getProperty( J14LIB );
String j15lib = getProperty( J15LIB );
- if ( j14lib != null ) { setClasspathFromLib( J14LIB, j14lib ); }
- if ( j15lib != null ) { setClasspathFromLib( J15LIB, j15lib ); }
+ if ( j14lib != null ) { setClasspathFromLib(J14CLASSPATH, j14lib ); }
+ if ( j15lib != null ) { setClasspathFromLib(J15CLASSPATH, j15lib ); }
//
// If the library properties were not set, the following
Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml?rev=596405&r1=596404&r2=596405&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml Mon Nov 19 11:27:33 2007
@@ -34,7 +34,7 @@
source="1.5"
target="1.5"
nowarn="on"
- debug="${debug}"
+ debug="true"
depend="${depend}"
deprecation="${deprecation}"
optimize="${optimize}"