[rvm-commits] SF.net SVN: jikesrvm: [13514] rvmroot/trunk

[<rg...@us...>]

Revision: 13514
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13514&view=rev
Author:   rgarner
Date:     2007-09-06 22:10:50 -0700 (Thu, 06 Sep 2007)

Log Message:
-----------
Allow config.variant and config.with-profile to play nicely together

Modified Paths:
--------------
    rvmroot/trunk/build/base.xml
    rvmroot/trunk/build.xml

Modified: rvmroot/trunk/build/base.xml
===================================================================
--- rvmroot/trunk/build/base.xml	2007-09-06 12:55:51 UTC (rev 13513)
+++ rvmroot/trunk/build/base.xml	2007-09-07 05:10:50 UTC (rev 13514)
@@ -52,10 +52,13 @@
     <attribute name="property"/>
     <attribute name="config"/>
     <sequential>
+      <condition property="config.full-variant" value="${config.variant}profile" else="${config.variant}">
+        <isset property="config.with-profile"/>
+      </condition>
       <condition property="@{property}"
                  value="@{config}_${target.name}"
-                 else="@{config}_${config.variant}_${target.name}">
-        <equals arg1="${config.variant}" arg2=""/>
+                 else="@{config}_${config.full-variant}_${target.name}">
+        <equals arg1="${config.full-variant}" arg2=""/>
       </condition>
     </sequential>
   </macrodef>

Modified: rvmroot/trunk/build.xml
===================================================================
--- rvmroot/trunk/build.xml	2007-09-06 12:55:51 UTC (rev 13513)
+++ rvmroot/trunk/build.xml	2007-09-07 05:10:50 UTC (rev 13514)
@@ -1488,7 +1488,7 @@
   <!-- Create an image using a profile (which requires first creating a profile) -->
   <target name="profiled-image">
 	<ant inheritAll="false" target="create-bootimage-profile">
-	  <property name="config.variant" value="profile"/>
+	  <property name="config.with-profile" value="true"/>
 	  <property name="config.bootimage.compiler" value="base"/>
 	  <property name="config.bootimage.compiler.args" value="-X:bc:edge_counters=true"/>
 	</ant>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.