X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=build.xml;h=49596e9ba6349718421d6e5c573a2e6a615f013c;hb=ddd110c9e583fb43257ae1b9b06223bdc7e21f31;hp=4a598eaa2d1baccdf43adb688d02ec2f43c52898;hpb=c79f06913801f7d700090e282ecf46123ff8ca65;p=jquery.git

diff --git a/build.xml b/build.xml
index 4a598ea..49596e9 100644
--- a/build.xml
+++ b/build.xml
@@ -1,12 +1,14 @@
 <project name="jQuery" default="all" basedir=".">
-	
+
 	<!-- SETUP -->
 
     <property name="SRC_DIR" value="src" />
     <property name="BUILD_DIR" value="build" />
     <property name="JAR" value="${BUILD_DIR}/js.jar" />
-	
-	<property name="PLUGIN_DIR" location="../plugins" />
+
+	<property name="PLUGIN_DIR" location="../plugins" />
+	<property name="PLUGINS" value="none" />
+	<property name="PLUGINS_ALL" value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js" />
 
     <property name="PREFIX" value="." />
     <property name="DOCS_DIR" value="${PREFIX}/docs" />
@@ -17,10 +19,12 @@
     <property name="JQ_LITE" value="${DIST_DIR}/jquery.lite.js" />
     <property name="JQ_MIN" value="${DIST_DIR}/jquery.min.js" />
     <property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.js" />
-	<property name="JQ_TEMP" value="${DIST_DIR}/jquery.js.tmp" />
+
+	<property name="TABS" value="${PLUGIN_DIR}/tabs/tabs.js" />
+	<property name="TABS_PACK" value="${DIST_DIR}/jquery.tabs.pack.js" />
 
 	<!-- MAIN -->
-	
+
     <target name="jquery">
         <echo message="Building ${JQ}" />
         <mkdir dir="${DIST_DIR}" />
@@ -30,10 +34,17 @@
             <fileset dir="${SRC_DIR}" includes="event/*.js" />
             <fileset dir="${SRC_DIR}" includes="fx/*.js" />
             <fileset dir="${SRC_DIR}" includes="ajax/*.js" />
+        	<fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
     		<fileset dir="${SRC_DIR}" includes="outro.js" />
         </concat>
         <echo message="${JQ} built." />
     </target>
+	
+	<target name="jquery_with_plugins" description="Build jquery with all plugins">
+		<antcall target="jquery">
+			<param name="PLUGINS" value="${PLUGINS_ALL}" />
+		</antcall>
+	</target>
 
     <target name="lite" depends="jquery">
         <echo message="Building ${JQ_LITE}" />
@@ -63,7 +74,17 @@
             <arg value="${JQ_PACK}" />
         </java>
         <echo message="${JQ_PACK} built." />
-    </target>
+    </target>
+		
+    <target name="pack_with_plugins" depends="jquery_with_plugins">
+        <echo message="Building ${JQ_PACK}" />
+        <java jar="${JAR}" fork="true">
+            <arg value="${BUILD_DIR}/build/pack.js" />
+            <arg value="${JQ}" />
+            <arg value="${JQ_PACK}" />
+        </java>
+        <echo message="${JQ_PACK} built." />
+    </target>		
 
     <target name="test" depends="jquery">
         <echo message="Building Test Suite" />
@@ -102,7 +123,31 @@
             <arg value="${DOCS_DIR}" />
         </java>
         <echo message="Documentation built." />
-    </target>
+    </target>
+		
+    <target name="docs_with_plugins" depends="jquery_with_plugins">
+        <echo message="Building Documentation" />
+        <delete dir="${DOCS_DIR}" />
+        <mkdir dir="${DOCS_DIR}/data" />
+    	<copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" />
+        <mkdir dir="${DOCS_DIR}/js" />
+        <copy todir="${DOCS_DIR}/js" >
+            <fileset dir="${BUILD_DIR}/docs/js">
+                <include name="**/*.js"/>
+            </fileset>
+        </copy>
+		<copy todir="${DOCS_DIR}/style" >
+            <fileset dir="${BUILD_DIR}/docs/style">
+                <include name="**"/>
+            </fileset>
+        </copy>
+        <java jar="${JAR}" fork="true">
+            <arg value="${BUILD_DIR}/docs/docs.js" />
+            <arg value="${JQ}" />
+            <arg value="${DOCS_DIR}" />
+        </java>
+        <echo message="Documentation built." />
+    </target>		
 
     <target name="clean">
         <delete dir="${DOCS_DIR}" />
@@ -112,38 +157,17 @@
 
     <target name="all" depends="clean,jquery,lite,min,pack,docs,test" >
         <echo message="Build complete." />
+    </target>
+	
+	<target name="pack_tabs">
+        <echo message="Building ${TABS_PACK}" />
+		<mkdir dir="${DIST_DIR}" />
+        <java jar="${JAR}" fork="true">
+            <arg value="${BUILD_DIR}/build/pack.js" />
+            <arg value="${TABS}" />
+            <arg value="${TABS_PACK}" />
+        </java>
+        <echo message="${TABS_PACK} built." />
     </target>
-	
-	<!-- PLUGINS -->
-	
-	<target name="ifx" description="Build jquery with Interface fx plugins">
-		<antcall target="plugin">
-			<param name="plugins" value="interface/ifx*.js" />
-		</antcall>
-	</target>
-	
-	<target name="plugindocs" description="Build documentation for a set of plugins - Not working, yet">
-		<antcall target="raw">
-			<param name="plugins" value="center/*.js, cookie/*.js, form/*.js" />
-		</antcall>
-		<antcall target="docs" />
-	</target>
-	
-	<target name="raw" description="Build a set of plugins, without jquery itself">
-		<concat destfile="${JQ}">
-			<fileset dir="${PLUGIN_DIR}" includes="${plugins}" />
-        </concat>
-		<echo message="${plugins} built." />
-	</target>
-	
-	<target name="plugin" depends="jquery" description="Build jquery with a given set of plugins, see ifx target for an example">
-		<copy tofile="${JQ_TEMP}" file="${JQ}"/>
-		<concat destfile="${JQ}">
-        	<fileset file="${JQ_TEMP}" />
-			<fileset dir="${PLUGIN_DIR}" includes="${plugins}" />
-        </concat>
-		<delete file="${JQ_TEMP}" />
-		<echo message="${JQ} with ${plugins} built." />
-	</target>
 
 </project>