Author: rgardler
Date: Mon Dec 31 17:47:42 2012
New Revision: 1427200
URL: http://svn.apache.org/viewvc?rev=1427200&view=rev
Log:
ensure scipts and styles can be overridden by common files
Modified:
wookie/trunk/widgets/templates/assetPlayer/template_build.xml
wookie/trunk/widgets/templates/base/template_build.xml
Modified: wookie/trunk/widgets/templates/assetPlayer/template_build.xml
URL:
http://svn.apache.org/viewvc/wookie/trunk/widgets/templates/assetPlayer/template_build.xml?rev=1427200&r1=1427199&r2=1427200&view=diff
==============================================================================
--- wookie/trunk/widgets/templates/assetPlayer/template_build.xml (original)
+++ wookie/trunk/widgets/templates/assetPlayer/template_build.xml Mon Dec 31
17:47:42 2012
@@ -23,6 +23,30 @@
<echo message="| Initialising template properties for ${template.name}"/>
<echo message="+------------------------------------------"/>
+ <loadfile property="content.styles"
+ srcFile="content_styles.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
+ <loadfile property="content.styles"
+ srcFile="../common/content_style.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
+ <loadfile property="content.styles"
+ srcFile="${template.dir}/${template.name}/content_styles.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
<loadfile property="content.scripts"
srcFile="content_scripts.html"
failonerror="false">
@@ -30,6 +54,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.scripts"
+ srcFile="../common/content_scripts.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.scripts"
srcFile="${template.dir}/${template.name}/content_scripts.html"
Modified: wookie/trunk/widgets/templates/base/template_build.xml
URL:
http://svn.apache.org/viewvc/wookie/trunk/widgets/templates/base/template_build.xml?rev=1427200&r1=1427199&r2=1427200&view=diff
==============================================================================
--- wookie/trunk/widgets/templates/base/template_build.xml (original)
+++ wookie/trunk/widgets/templates/base/template_build.xml Mon Dec 31 17:47:42
2012
@@ -32,6 +32,14 @@
</loadfile>
<loadfile property="content.styles"
+ srcFile="../common/content_style.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
+ <loadfile property="content.styles"
srcFile="${template.dir}/${template.name}/content_styles.html"
failonerror="false">
<filterchain>
@@ -46,6 +54,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.scripts"
+ srcFile="../common/content_scripts.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.scripts"
srcFile="${template.dir}/${template.name}/content_scripts.html"
