svn commit: r920530 - in /db/derby/code/branches/10.5: BUILDING.html build.xml

[my...@apache.org]

Author: myrnavl
Date: Mon Mar  8 21:40:06 2010
New Revision: 920530

URL: http://svn.apache.org/viewvc?rev=920530&view=rev
Log:
DERBY-4548; alternative location for ant.properties; backport changes to 10.5:
  911231, 915129 and 920527. 

Modified:
    db/derby/code/branches/10.5/BUILDING.html
    db/derby/code/branches/10.5/build.xml

Modified: db/derby/code/branches/10.5/BUILDING.html
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/BUILDING.html?rev=920530&r1=920529&r2=920530&view=diff
==============================================================================
--- db/derby/code/branches/10.5/BUILDING.html (original)
+++ db/derby/code/branches/10.5/BUILDING.html Mon Mar  8 21:40:06 2010
@@ -315,7 +315,8 @@
 <p>
 You can customize the Derby build by setting variables in a file
 called <i>ant.properties</i>. The Ant tool looks for this file in your
-home directory. To find out where Ant thinks your home directory is,
+home directory. 
+To find out where Ant thinks your home directory is,
 issue the following command and look for "user.home" in the output:
 </p>
 
@@ -327,6 +328,9 @@
 
 <br/>
 <p>
+Alternatively, or additionally, you can place properties in a file called 'local.properties' in the top of the source tree. Properties placed in this file have precedence over those in user.home/ant.properties. 
+</p>
+<p>
 Here are some Derby-specific variables which you may want to set in <i>ant.properties</i>:
 </p>
 

Modified: db/derby/code/branches/10.5/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/build.xml?rev=920530&r1=920529&r2=920530&view=diff
==============================================================================
--- db/derby/code/branches/10.5/build.xml (original)
+++ db/derby/code/branches/10.5/build.xml Mon Mar  8 21:40:06 2010
@@ -20,6 +20,7 @@
 
 <!-- Set Properties -->
   <!-- User settings -->
+  <property file="local.properties"/>
   <property file="${user.home}/ant.properties"/>
   <!-- Set property lib dir -->
   <property name="properties.dir" value="tools/ant/properties"/>