Author: rgardler
Date: Fri Aug 10 12:55:59 2012
New Revision: 1371691
URL: http://svn.apache.org/viewvc?rev=1371691&view=rev
Log:
put stylesheet additions supplied by templates into a subdirectory during build
to prevent them overwriting files supplied by other templates and the widget
itself
Modified:
incubator/wookie/trunk/widgets/templates/build.xml
Modified: incubator/wookie/trunk/widgets/templates/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/build.xml?rev=1371691&r1=1371690&r2=1371691&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/build.xml Fri Aug 10 12:55:59 2012
@@ -324,7 +324,7 @@
</fileset>
<fileset dir="${widget.build.dir}/${widget.shortname}.tmp/style"
erroronmissingdir="false">
- <include name="*.add.css"/>
+ <include name="**/*.add.css"/>
<!-- deprecated: don't use .css.add extensions -->
<include name="**/*.css.add"/>
</fileset>
@@ -448,7 +448,7 @@
</copy>
<!-- Copy/Create the stylesheets -->
- <copy todir="${widget.build.dir}/${widget.shortname}.tmp/style"
+ <copy
todir="${widget.build.dir}/${widget.shortname}.tmp/style/${template.name}"
overwrite="true"
failonerror="false">
<fileset dir="${template.dir}/${template.name}/style"/>
