svn commit: r1295513 - /incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml

[rg...@apache.org]

Author: rgardler
Date: Thu Mar  1 11:08:18 2012
New Revision: 1295513

URL: http://svn.apache.org/viewvc?rev=1295513&view=rev
Log:
use properties for pathname to ensure it works regardless of location of widget files

Modified:
    incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml

Modified: incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml?rev=1295513&r1=1295512&r2=1295513&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml Thu Mar  1 11:08:18 2012
@@ -19,7 +19,7 @@
   <target name="_init_template"
           description="Define any template specifc properties">
     <echo message="+------------------------------------------"/>
-    <echo message="|  Initialising template properties"/>
+    <echo message="|  Initialising template properties for ${template.name}"/>
     <echo message="+------------------------------------------"/>
 
     <loadfile property="content.scripts"
@@ -135,6 +135,9 @@
       </filterchain>
     </loadfile>
 
+    <!-- load properties we've set in other templates -->
+    <property file="${widget.build.dir}/${widget.shortname}.properties"/>
+    <!-- write the full property set for this template -->
     <echoproperties destfile="${widget.build.dir}/${widget.shortname}.properties" prefix=""/>
   </target>
 
@@ -145,7 +148,7 @@
     <echo message="+------------------------------------------"/>
 
     <!-- Build from base template -->
-    <ant antfile="../../build.xml"
+    <ant antfile="${wookie.template.dir}/build.xml"
          target="_generate_widget">
       <property name="template.name" value="base"/>
       <property name="copyWidgetFiles" value="false"/>