db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r1499244 - /db/derby/code/trunk/build.xml
Date Wed, 03 Jul 2013 08:07:58 GMT
Author: dyre
Date: Wed Jul  3 08:07:58 2013
New Revision: 1499244

URL: http://svn.apache.org/r1499244
Log:
DERBY-5979: Part b: 1)  Make properties.dir absolute by prepending ${basedir}. This way the
release-targets work even when cwd is not equal to ${basedir} (as could be the case when invoking
those target from within an IDE). 2) Change the value of derby.junit.jvm from java to ${java.home}/bin/java.
This ensures that junit-ant-tasks work even if invoked from an environment (such as an IDE)
where the JAVA_HOME jvm may be different from the first jvm in PATH.

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?rev=1499244&r1=1499243&r2=1499244&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Jul  3 08:07:58 2013
@@ -27,7 +27,7 @@
 
   <property file="${user.home}/ant.properties"/>
   <!-- Set property lib dir -->
-  <property name="properties.dir" value="tools/ant/properties"/>
+  <property name="properties.dir" value="${basedir}/tools/ant/properties"/>
   <!-- Significant dirs -->
   <property file="${properties.dir}/dirs.properties"/>
   <!-- Compiler settings -->
@@ -2218,7 +2218,7 @@
     <tstamp prefix="derby.junit">
       <format property="standardtime" pattern="yyyy-MM-dd hh:mm aa zzz"/>
     </tstamp>
-    <property name="derby.junit.jvm" value="java"/>
+    <property name="derby.junit.jvm" value="${java.home}/bin/java"/>
     <property name="derby.junit.timestamp" value="${derby.junit.DSTAMP}_${derby.junit.TSTAMP}"/>
     <mkdir dir="junit_${derby.junit.timestamp}/testout"/>
 



Mime
View raw message