X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build.xml;h=7424dbf41b903a4930543924b219276da33ffe4a;hb=7cc550727c4e0bcd93c5d435f0799f568fc74dfa;hp=5baad646ad39f38b8a43b4a347e40812c9b560ac;hpb=d91ee794ba481f2fbac3329e01a18cf7ced5b1a3;p=jquery.git

diff --git a/build.xml b/build.xml
index 5baad64..7424dbf 100644
--- a/build.xml
+++ b/build.xml
@@ -19,13 +19,13 @@
 	<!-- SETUP -->
 
 	<property description="Source Folder" name="SRC_DIR" value="src" />
-	<property description="Files executefor parsing etc." name="BUILD_DIR" value="build" />
+	<property description="Files for parsing etc." name="BUILD_DIR" value="build" />
 	<property description="Rhino JS Engine" name="JAR" value="${BUILD_DIR}/js.jar" />
 
 	<property description="Dir to look for plugins" name="PLUGIN_DIR" location="../plugins" />
 	<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" />
+		value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.jw" />
 
 	<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}">
 			<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="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" />
 			<fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
 			<fileset dir="${SRC_DIR}" includes="outro.js" />
 		</concat>
@@ -101,18 +101,14 @@
 		<echo message="${JQ_PACK} built." />
 	</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" />
 		<copy todir="${TEST_DIR}/data">
 			<fileset dir="${BUILD_DIR}/test/data/" />
-		</copy>
-		<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>