Return-Path: 
 <commits-return-44574-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 10316 invoked from network); 5 Oct 2007 09:21:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Oct 2007 09:21:14 -0000
Received: (qmail 24478 invoked by uid 500); 5 Oct 2007 09:12:34 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 24461 invoked by uid 500); 5 Oct 2007 09:12:34 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 24451 invoked by uid 99); 5 Oct 2007 09:12:34 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 02:12:34 -0700
X-ASF-Spam-Status: No, hits=-99.1 required=10.0
	tests=ALL_TRUSTED,URIBL_RHS_DOB
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 09:12:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A08AA1A9832; Fri,  5 Oct 2007 02:12:24 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r582151 - /harmony/enhanced/trunk/build.xml
Date: Fri, 05 Oct 2007 09:12:24 -0000
To: commits@harmony.apache.org
From: varlax@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071005091224.A08AA1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: varlax
Date: Fri Oct  5 02:12:23 2007
New Revision: 582151

URL: http://svn.apache.org/viewvc?rev=582151&view=rev
Log:
Fix for HARMONY-4883: allow SVN root customization

Modified:
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=582151&r1=582150&r2=582151&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Fri Oct  5 02:12:23 2007
@@ -23,22 +23,6 @@
     <!-- name of the target directory to use for building and final assembly -->
     <property name="target.dir" value="target" />
 
-    <!-- SVN URL for classlib default -->
-    <condition property="classlib.svn.url"
-               value="https://svn.apache.org/repos/asf/harmony/enhanced/classlib/branches/java6"
-               else="https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk">
-        <isset property="java6" />
-    </condition>
-
-    <!-- SVN URL for VM default -->
-    <property name="vm.svn.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/drlvm/trunk" />
-
-    <!-- SVN URL for jdktools default -->
-    <property name="jdktools.svn.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk" />
-
-    <!-- SVN URL for common_resources default -->
-    <property name="commonresources.svn.url" value="https://svn.apache.org/repos/asf/harmony/enhanced/common_resources" />
-
     <!-- classlib location to tell DRLVM build -->
     <property name="drlvm.classlib.offset" value="../../../working_classlib"/>
 
@@ -688,6 +672,7 @@
             build mode       :  ${hy.cfg}
             output location  :  ${target.dir}
             DRLVM classlib   :  ${drlvm.classlib.offset}
+            SVN root         :  ${svn.root}
         </echo>
     </target>
 
@@ -730,20 +715,19 @@
               failifexecutionfails="false"
               resultproperty="svn.rc">
             <arg value="info" />
-            <redirector outputproperty="svn.info.tmp">
+            <redirector outputproperty="svn.root.tmp">
                 <outputfilterchain>
                     <linecontainsregexp>
-                        <regexp pattern="Repository Root:|Revision:" />
+                        <regexp pattern="Repository Root:" />
                     </linecontainsregexp>
                     <tokenfilter>
                         <replacestring from="Repository Root: " to=""/>
-                        <replacestring from="Revision: " to=" "/>
                     </tokenfilter>
                     <striplinebreaks/>
                 </outputfilterchain>
             </redirector>
         </exec>
-        <condition property="svn.info" value="${svn.info.tmp}" >
+        <condition property="svn.info" value="${svn.root.tmp} ${svn.revision}" >
             <equals arg1="${svn.rc}" arg2="0" />
         </condition>
         <tstamp>
@@ -751,6 +735,23 @@
                     pattern="'Unknown revision at' dd-MMM-yyyy hh:mm aa"/>
         </tstamp>
         <property name="harmony.long.version" value="${svn.info}" />
+
+        <condition property="svn.root" value="${svn.root.tmp}" >
+            <equals arg1="${svn.rc}" arg2="0" />
+        </condition>
+
+        <!-- default SVN URLs -->
+        <property name="svn.root" value="http://svn.apache.org/repos/asf"/>
+
+        <condition property="classlib.svn.url"
+                   value="${svn.root}/harmony/enhanced/classlib/branches/java6"
+                   else="${svn.root}/harmony/enhanced/classlib/trunk">
+            <isset property="java6" />
+        </condition>
+
+        <property name="vm.svn.url" value="${svn.root}/harmony/enhanced/drlvm/trunk" />
+        <property name="jdktools.svn.url" value="${svn.root}/harmony/enhanced/jdktools/trunk" />
+        <property name="commonresources.svn.url" value="${svn.root}/harmony/enhanced/common_resources" />
     </target>
 
     <target name="bundle_src_tgz" depends="init" if="is.unix">