svn commit: r929204 - in /db/derby/code/branches/10.2: BUILDING.txt build.xml

[my...@apache.org]

Author: myrnavl
Date: Tue Mar 30 17:54:26 2010
New Revision: 929204

URL: http://svn.apache.org/viewvc?rev=929204&view=rev
Log:
DERBY-4548; alternative to user.home/ant.properties;
  backport of revision 926345 from 10.3. merge command:
  svn -merge -c 926345 https://svn.apache.org/repos/asf/db/derby/code/branches/10.3 

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

Modified: db/derby/code/branches/10.2/BUILDING.txt
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/BUILDING.txt?rev=929204&r1=929203&r2=929204&view=diff
==============================================================================
--- db/derby/code/branches/10.2/BUILDING.txt (original)
+++ db/derby/code/branches/10.2/BUILDING.txt Tue Mar 30 17:54:26 2010
@@ -370,12 +370,17 @@ to specify your environment and options:
     On newer Windows systems, ${user.home} is often equivalent
     to the value of the environment variable %USERPROFILE%.
 
-    NOTE: It is not a requirement that ant.properties reside in your
-    user.home directory. The file can be placed anywhere accessible
-    on the local filesystem, but ant must then be invoked with the
-    -propertyfile option:
-
-    ant -propertyfile {path_to_propertyfile}
+    NOTE: It is not a requirement that an ant.properties file resides 
+    in your user.home directory. The file can be placed anywhere 
+    accessible on the local filesystem, but ant must then be invoked 
+    with the -propertyfile option:
+
+    ant -propertyfile {path_to_propertyfile} 
+
+    Alternatively or additionally, you can create a file called
+    local.properties at the top of the checked out tree. Property
+    settings in this file take precedence over those in the 
+    ant.properties file in the user.home directory.
 
 (2) Create a file called "ant.properties" in your ${user.home} 
     directory and define the following variables in 

Modified: db/derby/code/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/build.xml?rev=929204&r1=929203&r2=929204&view=diff
==============================================================================
--- db/derby/code/branches/10.2/build.xml (original)
+++ db/derby/code/branches/10.2/build.xml Tue Mar 30 17:54:26 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"/>