Return-Path: 
 <commits-return-52298-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 28205 invoked from network); 24 Mar 2008 06:02:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 24 Mar 2008 06:02:01 -0000
Received: (qmail 9197 invoked by uid 500); 24 Mar 2008 06:02:00 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 9178 invoked by uid 500); 24 Mar 2008 06:02:00 -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 9169 invoked by uid 99); 24 Mar 2008 06:02:00 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Mar 2008 23:02:00 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
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; Mon, 24 Mar 2008 06:01:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 714E31A9832; Sun, 23 Mar 2008 23:01:39 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r640320 - in /harmony/enhanced/buildtest/trunk/infra:
 build.xml
 scripts/config.xml
Date: Mon, 24 Mar 2008 06:01:39 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080324060139.714E31A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Sun Mar 23 23:01:38 2008
New Revision: 640320

URL: http://svn.apache.org/viewvc?rev=640320&view=rev
Log:
Add 'required-parameters.properties' file generation

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

Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=640320&r1=640319&r2=640320&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Sun Mar 23 23:01:38 2008
@@ -221,6 +221,8 @@
                 inheritrefs="true"
                 buildpath="${scripts.dir}">
         </subant>
+        
+        <!-- TODO check generated required-parameters.properties -->
     </target>
     <!-- ================================================================== 
                          Framework Setup Functionality

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/config.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/config.xml?rev=640320&r1=640319&r2=640320&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/config.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/config.xml Sun Mar 23 23:01:38 2008
@@ -17,6 +17,9 @@
 
 <project name="config" default="generate-config" basedir=".">
 
+    <!-- temporary file to store intermediate results of iteration -->
+    <property name="tmp.file" value="tmp.txt" />
+
     <target name="generate-config">
 
         <!-- first stage: generate initial props -->
@@ -53,7 +56,17 @@
 
         <!-- third stage: extract required properties
              to a separate file - 'required-parameters.properties'  -->
-        <!-- TODO -->
+        <ant antfile="${scripts.dir}/config.xml"
+             target="-gen-required-parameters"
+             inheritall="false">
+            <propertyset>
+                <propertyref name="all.props" />
+                <propertyref name="scripts.dir" />
+                <propertyref name="config.dir" />
+                <!--propertyref name="framework.local.configuration.file" /-->
+                <propertyset refid="global.build.parameters.id" />
+            </propertyset>
+        </ant>
     </target>
 
     <!-- The target is workaround for properties cycle dependencies
@@ -98,6 +111,104 @@
         </echoproperties>
     </target>
 
+    <target name="-gen-required-parameters">
+
+        <echo file="${config.dir}/required-parameters.properties">#
+# Required Parameters Settings File
+# TODO: add more words here
+
+</echo>
+
+        <property name="all.props" location="${config.dir}/all.props" />
+        <concat destfile="${all.props}">
+            <fileset dir="${config.dir}" includes="*.properties" />
+            <filterchain>
+                <linecontainsregexp>
+                    <!-- filter out undefined props -->
+                    <regexp pattern="=[^$]" />
+                </linecontainsregexp>
+            </filterchain>
+        </concat>
+
+        <property file="${all.props}" />
+
+        <propertyset id="tmp.id">
+            <propertyref regex=".+parameters\.required\..+\.description$" />
+        </propertyset>
+        <property name="tmp.str" refid="tmp.id" />
+        <echo message="${tmp.str}" file="${tmp.file}" />
+
+        <ant antfile="${scripts.dir}/config.xml"
+             target="-iterate"
+             inheritall="false">
+            <propertyset>
+                <propertyref name="scripts.dir" />
+                <propertyref name="config.dir" />
+            </propertyset>
+        </ant>
+
+        <delete file="${tmp.file}" />
+    </target>
+
+    <target name="-iterate">
+        <!-- check if next iteration should be done -->
+        <condition property="donext">
+            <length file="${tmp.file}" length="0" when="greater" />
+        </condition>
+        <ant antfile="${scripts.dir}/config.xml"
+             target="-flash-next-required-property"
+             inheritall="false">
+            <propertyset>
+                <propertyref name="donext" />
+                <propertyref name="scripts.dir" />
+                <propertyref name="config.dir" />
+            </propertyset>
+        </ant>
+    </target>
+
+    <target name="-flash-next-required-property" if="donext">
+        <loadproperties srcfile="${tmp.file}">
+            <filterchain>
+                <tokenfilter>
+                    <replaceregex pattern="^([^=]+)\.description=.*"
+                                  replace="propname=\1" />
+                </tokenfilter>
+            </filterchain>
+        </loadproperties>
+        <loadproperties srcfile="${tmp.file}">
+            <filterchain>
+                <tokenfilter>
+                    <replaceregex pattern="^[^=]+=[^,]+,? ?(.*)$"
+                                  replace="rest=\1" />
+                </tokenfilter>
+            </filterchain>
+        </loadproperties>
+        <echo message="${rest}" file="${tmp.file}" />
+
+        <property file="${config.dir}/all.props" />
+        <flash-property propname="${propname}" />
+
+        <subant genericantfile="${scripts.dir}/config.xml"
+                target="-iterate"
+                inheritall="false"
+                buildpath="${scripts.dir}">
+            <propertyset>
+                <propertyref name="scripts.dir" />
+                <propertyref name="config.dir" />
+            </propertyset>
+        </subant>
+
+    </target>
 
+    <macrodef name="flash-property">
+        <attribute name="propname" />
+        <sequential>
+            <echo file="${config.dir}/required-parameters.properties"
+                  append="true">
+#${@{propname}.description}
+@{propname}=${@{propname}}
+</echo>
+        </sequential>
+    </macrodef>
 </project>