Permalink
Browse files

Updating the build to put the files in the order specified by include…

…s.list. The ordering of the JS fils is very important.
  • Loading branch information...
1 parent 96eb88d commit fb61b4a48d17df5fe51d63d4e13a46af0cc55d73 @stomlinson stomlinson committed Oct 23, 2010
Showing with 19 additions and 20 deletions.
  1. +5 −5 build.xml
  2. +14 −15 includes.list
View
10 build.xml
@@ -12,7 +12,7 @@
<property name="docs_parse" location="docparse" />
<property file="per_user.properties" />
<property file="yuidoc.properties" />
-
+ <property file="includes.list" />
<target name="get_build_number" >
<property file="build.number" />
@@ -55,8 +55,8 @@
<echo level="info" message="JSLint: running..." />
<foreach param="filename" target="lintfile">
<path>
- <fileset dir="${src}" includesfile="includes.list">
- </fileset>
+ <filelist dir="${src}" files="${includes.list}">
+ </filelist>
</path>
@@ -69,8 +69,8 @@
description="concatinate the script">
<echo message="Combining js files to ${js_combined}" />
<concat destfile="${js_combined}">
- <fileset dir="${src}" includesfile="includes.list">
- </fileset>
+ <filelist dir="${src}" files="${includes.list}">
+ </filelist>
</concat>
</target>
View
29 includes.list
@@ -1,17 +1,16 @@
-
-core.js
-aframe.js
-dataContainer.js
-observable.js
-observablesMixin.js
-aobject.js
-plugin.js
-arrayCommonFunctionsMixin.js
-mvcHash.js
-mvcArray.js
-display.js
-list.js
-listPluginBindToCollection.js
-collectionPluginPersistence.js
+includes.list=core.js,\
+aframe.js,\
+dataContainer.js,\
+observable.js,\
+observablesMixin.js,\
+aobject.js,\
+plugin.js,\
+arrayCommonFunctionsMixin.js,\
+mvcHash.js,\
+mvcArray.js,\
+display.js,\
+list.js,\
+listPluginBindToCollection.js,\
+collectionPluginPersistence.js,\
form.js

0 comments on commit fb61b4a

Please sign in to comment.