svn commit: r923555 - in /db/derby/code/branches/10.4: BUILDING.txt build.xml

[my...@apache.org]

Author: myrnavl
Date: Tue Mar 16 02:55:23 2010
New Revision: 923555

URL: http://svn.apache.org/viewvc?rev=923555&view=rev
Log:
DERBY-4548; alternative location for ant.properties; 
  backport revision 920530 from 10.5

Modified:
    db/derby/code/branches/10.4/BUILDING.txt
    db/derby/code/branches/10.4/build.xml

Modified: db/derby/code/branches/10.4/BUILDING.txt
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/BUILDING.txt?rev=923555&r1=923554&r2=923555&view=diff
==============================================================================
--- db/derby/code/branches/10.4/BUILDING.txt (original)
+++ db/derby/code/branches/10.4/BUILDING.txt Tue Mar 16 02:55:23 2010
@@ -273,7 +273,8 @@ On many platforms, you can skip this sec
 defaults which the Derby build provides. However, please consult this
 section if the Derby build fails on your platform or if you want to
 override the build defaults. By editting the ant environment file
-(called ant.properties and located in your home directory), you can
+(called ant.properties and located in your home directory, or an optional
+file called local.properties in the top of the source tree), you can
 override the following defaults:
 
 - The location of the compiler libraries for jdk 1.4 and Java 5.

Modified: db/derby/code/branches/10.4/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/build.xml?rev=923555&r1=923554&r2=923555&view=diff
==============================================================================
--- db/derby/code/branches/10.4/build.xml (original)
+++ db/derby/code/branches/10.4/build.xml Tue Mar 16 02:55:23 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"/>