harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r647118 - /harmony/enhanced/buildtest/trunk/infra/scripts/config.xml
Date Fri, 11 Apr 2008 11:24:20 GMT
Author: smishura
Date: Fri Apr 11 04:24:17 2008
New Revision: 647118

URL: http://svn.apache.org/viewvc?rev=647118&view=rev
Log:
Fix bug found during testing with ANT 1.7.0: 
framework properties must be loaded after local properties
otherwise unset framework properties set to empty values by xmlproperty task

Modified:
    harmony/enhanced/buildtest/trunk/infra/scripts/config.xml

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/config.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/config.xml?rev=647118&r1=647117&r2=647118&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/config.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/config.xml Fri Apr 11 04:24:17 2008
@@ -141,16 +141,11 @@
 
         <echo>Generate config for: ${suite.name}</echo>
 
-        <!-- Load framework properties -->
-        <xmlproperty file="${scripts.dir}/parameters.xml"
-                     collapseAttributes="true"
-                     semanticAttributes="true"
-                     prefix="framework" />
-
         <!-- Load ALL suites properties -->
         <property file="${all.props}" />
 
-        <!-- Load local properties -->
+        <!-- Load local properties:
+             MUST precede load of framework properties -->
         <loadproperties srcfile="${framework.local.configuration.file}">
             <filterchain>
                 <expandproperties />
@@ -159,6 +154,12 @@
                 <replaceregex pattern="\\" replace="/" flags="g" />
             </filterchain>
         </loadproperties>
+
+        <!-- Load framework properties -->
+        <xmlproperty file="${scripts.dir}/parameters.xml"
+                     collapseAttributes="true"
+                     semanticAttributes="true"
+                     prefix="framework" />
 
         <!-- load external dependencies -->
         <loadproperties srcfile="${external.resources.location}">



Mime
View raw message