Tried to fix make build, PLEASE TEST

[jquery.git] / build.xml

diff --git a/build.xml b/build.xml
index e7379d9..e2a415a 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
        <property description="Dir to look for plugins" name="PLUGIN_DIR" location="../plugins" />\r
        <property description="Add single plugins here" name="PLUGINS" value="none" />
        <property description="Add all plugins here" name="PLUGINS_ALL" 
-               value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js" />\r
+               value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.js" />\r
 
        <property description="Target parent folder for built files" name="PREFIX" value="." />
        <property description="Folder for docs target" name="DOCS_DIR" value="${PREFIX}/docs" />
@@ -45,10 +45,10 @@
                <mkdir dir="${DIST_DIR}" />
                <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" />\r
+                       <fileset dir="${SRC_DIR}" includes="jquery/jquery.js" />
+                       <fileset dir="${SRC_DIR}" includes="event/event.js" />
+                       <fileset dir="${SRC_DIR}" includes="fx/fx.js" />
+                       <fileset dir="${SRC_DIR}" includes="ajax/ajax.js" />\r
                        <fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />\r
                        <fileset dir="${SRC_DIR}" includes="outro.js" />
                </concat>
@@ -101,18 +101,14 @@
                <echo message="${JQ_PACK} built." />\r
        </target>
 
-       <target name="test" depends="jquery" description="Reads tests from source and compiles into html file, testsuite must be run on a webserver">
+       <target name="test" depends="jquery" description="Copy files for the test suite into their own directory.">
                <echo message="Building Test Suite" />
                <delete dir="${TEST_DIR}" />
                <mkdir dir="${TEST_DIR}/data" />\r
                <copy todir="${TEST_DIR}/data">\r
                        <fileset dir="${BUILD_DIR}/test/data/" />\r
-               </copy>\r
-               <java jar="${JAR}" fork="true">
-                       <arg value="${BUILD_DIR}/test/test.js" />
-                       <arg value="${JQ}" />
-                       <arg value="${TEST_DIR}" />
-               </java>
+               </copy>
+               <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
                <echo message="Test Suite built." />
        </target>