Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 68373 invoked from network); 30 Mar 2010 17:54:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Mar 2010 17:54:49 -0000 Received: (qmail 93802 invoked by uid 500); 30 Mar 2010 17:54:49 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 93447 invoked by uid 500); 30 Mar 2010 17:54:49 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 93257 invoked by uid 99); 30 Mar 2010 17:54:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Mar 2010 17:54:48 +0000 X-ASF-Spam-Status: No, hits=-1251.0 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Mar 2010 17:54:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DF85C23888FE; Tue, 30 Mar 2010 17:54:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r929204 - in /db/derby/code/branches/10.2: BUILDING.txt build.xml Date: Tue, 30 Mar 2010 17:54:26 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100330175426.DF85C23888FE@eris.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 @@ +