Refactored test suite: tests subdir not needed anymore

[jquery.git] / build.xml

diff --git a/build.xml b/build.xml
index 1c85a8c..4aa5007 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -17,11 +17,13 @@
     <target name="jquery">
         <echo message="Building ${JQ}" />
         <mkdir dir="${DIST_DIR}" />
-        <concat destfile="${JQ}">
+        <concat destfile="${JQ}">\r
+               <fileset dir="${SRC_DIR}" includes="intro.js" />
             <fileset dir="${SRC_DIR}" includes="jquery/*.js" />
             <fileset dir="${SRC_DIR}" includes="event/*.js" />
             <fileset dir="${SRC_DIR}" includes="fx/*.js" />
-            <fileset dir="${SRC_DIR}" includes="ajax/*.js" />
+            <fileset dir="${SRC_DIR}" includes="ajax/*.js" />\r
+               <fileset dir="${SRC_DIR}" includes="outro.js" />
         </concat>
         <echo message="${JQ} built." />
     </target>
@@ -59,8 +61,8 @@
     <target name="test" depends="jquery">
         <echo message="Building Test Suite" />
         <delete dir="${TEST_DIR}" />
-        <mkdir dir="${TEST_DIR}/tests" />
-        <mkdir dir="${TEST_DIR}/js" />
+        <mkdir dir="${TEST_DIR}/js" />\r
+       <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
         <copy todir="${TEST_DIR}/js">
             <fileset dir="${BUILD_DIR}/test/js">
                 <include name="**/*.js"/>