Author: rgardler
Date: Thu Aug 9 10:01:51 2012
New Revision: 1371130
URL: http://svn.apache.org/viewvc?rev=1371130&view=rev
Log:
The new process for building widgets allows for a crude form of 'multiple
inheritence', this requires a different order of processing of controller.js
files
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=1371130&r1=1371129&r2=1371130&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/build.xml Thu Aug 9 10:01:51 2012
@@ -149,7 +149,9 @@
<copy todir="${widget.build.dir}/${widget.shortname}/scripts"
overwrite="true"
failonerror="false">
- <fileset dir="${widget.build.dir}/${widget.shortname}.tmp/scripts"/>
+ <fileset dir="${widget.build.dir}/${widget.shortname}.tmp/scripts">
+ <exclude name="**/*_controller.js"/>
+ </fileset>
<filterchain>
<expandproperties/>
</filterchain>
@@ -435,7 +437,6 @@
failonerror="false">
<fileset dir="${template.dir}/${template.name}/scripts">
<include name="**/*.js"/>
- <exclude name="**/*_controller.js"/>
</fileset>
</copy>
