Return-Path: 
 <harmony-commits-return-8018-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org
Received: (qmail 98210 invoked from network); 22 Jul 2006 11:52:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Jul 2006 11:52:32 -0000
Received: (qmail 23258 invoked by uid 500); 22 Jul 2006 11:52:32 -0000
Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org
Received: (qmail 23194 invoked by uid 500); 22 Jul 2006 11:52:32 -0000
Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:harmony-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:harmony-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:harmony-commits@incubator.apache.org>
List-Id: <harmony-commits.incubator.apache.org>
Reply-To: harmony-dev@incubator.apache.org
Delivered-To: mailing list harmony-commits@incubator.apache.org
Received: (qmail 23183 invoked by uid 99); 22 Jul 2006 11:52:32 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Jul 2006 04:52:32 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Jul 2006 04:52:31 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id C20171A981A; Sat, 22 Jul 2006 04:52:11 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r424562 - /incubator/harmony/enhanced/trunk/build.xml
Date: Sat, 22 Jul 2006 11:52:11 -0000
To: harmony-commits@incubator.apache.org
From: geirm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060722115211.C20171A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: geirm
Date: Sat Jul 22 04:52:11 2006
New Revision: 424562

URL: http://svn.apache.org/viewvc?rev=424562&view=rev
Log:
added predictability to version - will take 
the svn rev of 'build.xml' to use as the 
revision for the classlib and vm, or you
can override via 

   ant -Dsvn.revision=123123


Modified:
    incubator/harmony/enhanced/trunk/build.xml

Modified: incubator/harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/trunk/build.xml?rev=424562&r1=424561&r2=424562&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/build.xml (original)
+++ incubator/harmony/enhanced/trunk/build.xml Sat Jul 22 04:52:11 2006
@@ -288,8 +288,9 @@
     <!-- ================================================================================ -->
     <!--    Switches the working_vm directory to vm choice - wired for DRLVM for now      -->
     <!-- ================================================================================ -->
-        <target name="switch_svn_vm">
+    <target name="switch_svn_vm" depends="init">
         <exec executable="svn" dir="working_vm" failonerror="true">
+            <arg line="-r${svn.revision}"/>
             <arg line="switch" />
             <arg line="${vm.svn.url}" />
         </exec>
@@ -298,8 +299,9 @@
     <!-- ================================================================================ -->
     <!--    Switches the working_vm directory to classlib choice                          -->
     <!-- ================================================================================ -->
-    <target name="switch_svn_classlib">
+    <target name="switch_svn_classlib" depends="init">
         <exec executable="svn" dir="working_classlib" failonerror="true">
+            <arg line="-r${svn.revision}"/>
             <arg line="switch" />
             <arg line="${classlib.svn.url}" />
         </exec>
@@ -324,14 +326,14 @@
         </condition>
 
         <!-- this special case makes sense -->
-        <condition property="hy.os" value="windows">
+        <condition property="harmony.os" value="windows">
             <isset property="is.windows"/>
         </condition>
-        <condition property="hy.os" value="linux">
+        <condition property="harmony.os" value="linux">
             <os name="linux" />
         </condition>
 
-        <property name="hy.os" value="${os.name}" />
+        <property name="harmony.os" value="${os.name}" />
 
         <!-- Conditions for different architectures -->
         <condition property="is.x86_64">
@@ -355,47 +357,59 @@
         <condition property="is.32bit">
             <or>
                 <os arch="x86"/>
+                <os arch="i386"/>
             </or>
         </condition>
-        <condition property="hy.bits" value="32">
+        <condition property="harmony.bits" value="32">
             <isset property="is.32bit" />
         </condition>
-        <property name="hy.bits" value="64" />
+        <property name="harmony.bits" value="64" />
 
         <!-- Normalized architecture name -->
-        <condition property="hy.arch" value="x86">
+        <condition property="harmony.arch" value="x86">
             <isset property="is.x86" />
         </condition>
-        <property name="hy.arch" value="${os.arch}" />
+        <property name="harmony.arch" value="${os.arch}" />
 
 
         <property name="deploy.hdk.file.prefix"
                  value="incubator-harmony-hdk-r${svn.revision}" />
         <property name="deploy.hdk.tar"
-                 value="${deploy.hdk.file.prefix}-${hy.os}-${hy.arch}-snapshot.tar.gz" />
+                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}-{$harmony.bits}-snapshot.tar.gz" />
         <property name="deploy.hdk.zip"
-                 value="${deploy.hdk.file.prefix}-${hy.os}-${hy.arch}-snapshot.zip" />
+                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}-snapshot.zip" />
 
         <property name="deploy.jre.file.prefix"
                  value="incubator-harmony-jre-r${svn.revision}" />
         <property name="deploy.jre.tar"
-                 value="${deploy.jre.file.prefix}-${hy.os}-${hy.arch}-snapshot.tar.gz" />
+                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}-snapshot.tar.gz" />
         <property name="deploy.jre.zip"
-                 value="${deploy.jre.file.prefix}-${hy.os}-${hy.arch}-snapshot.zip" />
+                 value="${deploy.jre.file.prefix}-${harmonyy.os}-${harmonyy.arch}-${harmony.bits}-snapshot.zip" />
 
+        <echo>
+                   Apache Harmony Federated Build
+            ==========================================
+            svn rev          :  r${svn.revision}
+            operating system :  ${harmony.os}
+            architecture     :  ${harmony.arch}-${harmony.bits}
+            ant os name/arch :  ${os.name}/${os.arch}
+            output location  :  ${target.dir}
+        </echo>
     </target>
 
     <!-- ================================================================================ -->
-    <!-- svn-prop : get svn revision number                                               -->
+    <!-- svn-prop : get svn revision number of the build.xml file                         -->
+    <!--                                                                                  -->
     <!--         taken from classlib/properties.xml, because of uncertainty               -->
     <!--         of state of the working_classlib dir, I need a copy                      -->
     <!--   TODO - we want to be able to pass property in to ant so we don't need a        -->
     <!--      pause and it's reproducable                                                 -->
     <!-- ================================================================================ -->
     <target name="svn-prop">
-        <exec executable="svn">
+        <exec executable="svn" dir=".">
             <arg value="--non-interactive" />
             <arg value="info" />
+            <arg value="build.xml" />
             <redirector outputproperty="svn.revision">
                 <outputfilterchain>
                     <linecontains>