db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r940710 - in /db/derby/code/branches/10.1: BUILDING.txt build.xml
Date Tue, 04 May 2010 02:09:56 GMT
Author: myrnavl
Date: Tue May  4 02:09:55 2010
New Revision: 940710

URL: http://svn.apache.org/viewvc?rev=940710&view=rev
Log:
DERBY-4548; alternative location for ant.properties;
  backport of revision 929204 from 10.2, with adjustments to BUILDING.txt

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

Modified: db/derby/code/branches/10.1/BUILDING.txt
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/BUILDING.txt?rev=940710&r1=940709&r2=940710&view=diff
==============================================================================
--- db/derby/code/branches/10.1/BUILDING.txt (original)
+++ db/derby/code/branches/10.1/BUILDING.txt Tue May  4 02:09:55 2010
@@ -322,8 +322,13 @@ to specify your environment and options:
     to the value of the environment variable %USERPROFILE%.
 
 (2) Create a file called "ant.properties" in your ${user.home} 
-    directory and define the following variables in 
-    "ant.properties". 
+    directory and define the relevant variables. 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.
+
+    You can set the following in the property file(s): 
 
     NOTE TO MAC OS X USERS: See section 5.
  

Modified: db/derby/code/branches/10.1/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/build.xml?rev=940710&r1=940709&r2=940710&view=diff
==============================================================================
--- db/derby/code/branches/10.1/build.xml (original)
+++ db/derby/code/branches/10.1/build.xml Tue May  4 02:09:55 2010
@@ -4,6 +4,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"/>



Mime
View raw message