Change anchor tasks to extension points

wet-boew · Nov 3, 2012 · a9bacc0 · a9bacc0
1 parent 0b42bfe
commit a9bacc0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 19 deletions.
diff --git a/build/build-tasks.xml b/build/build-tasks.xml
@@ -17,9 +17,7 @@
 		<classpath refid="antcontrib.classpath" />
 	</taskdef>
 
-	<target name="-init" depends="-build-jruby">
-		<mkdir dir="${build.dir}"/>
-	</target>
+	<extension-point name="-init"/>
 
 	<!-- yui-compressor task definition  -->
 	<path id="yui.classpath">
@@ -53,7 +51,7 @@
 	</path>	
 
 	<!-- Include jruby + gems (compass + sass) -->
-	<target name="-build-jruby" depends="-jruby.jar.check" unless="jruby.jar.exists">
+	<target name="-build-jruby" extensionOf="-init" depends="-jruby.jar.check" unless="jruby.jar.exists">
 		<mkdir dir="${lib.dir}/jruby-compiled" />
 		<delete dir="${lib.dir}/vendors-${jruby.depends}" />
 		<get src="http://jruby.org.s3.amazonaws.com/downloads/${jruby.version}/jruby-complete-${jruby.version}.jar" dest="${lib.dir}/jruby-complete-${jruby.version}.jar" skipexisting="true"/>
@@ -120,4 +118,8 @@
 		<delete dir="${build.dir}" />
 		<delete dir="${dist.dir}" />
 	</target>
+
+	<extension-point name="build" depends="-init" />
+
+	<extension-point name="test" />
 </project>
diff --git a/src/base/build.xml b/src/base/build.xml
@@ -7,8 +7,4 @@
 
 	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
 
-	<target name="build" />
-
-	<target name="test" description="Placeholder for future test tasks"/>
-
 </project>
diff --git a/src/grids/build.xml b/src/grids/build.xml
@@ -41,6 +41,4 @@
 			</filterchain>
 		</copy>
 	</target>
-
-	<target name="test" description="Placeholder for future test tasks"/>
 </project>
diff --git a/src/js/build.xml b/src/js/build.xml
@@ -152,10 +152,8 @@
 		<delete dir="${build.dir}" />
 		<delete dir="${dist.dir}" />
 	</target>
-
-	<target name="test" depends="-jshint"/>
 
-	<target name="-jshint">
+	<target name="-jshint" extensionOf="test">
 		<jshint dir="${src.dir}" fail="${jshint.failbuild}" globalsFile="${jshint.globals.file}" options="strict:false">
 			<report type="xml" destfile="${build.dir}/jshint.out.xml" />
 			<include name="**/*.js"/>

diff --git a/src/theme-clf2-nsi2/build.xml b/src/theme-clf2-nsi2/build.xml
@@ -73,5 +73,5 @@
 		</copy>
 	</target>
 
-	<target name="test" depends="-jshint"/>
+	<target name="lint" extensionOf="test" depends="-jshint"/>
 </project>
diff --git a/src/theme-gcwu-fegc/build.xml b/src/theme-gcwu-fegc/build.xml
@@ -102,5 +102,5 @@
 		</copy>
 	</target>
 
-	<target name="test" depends="-jshint"/>
+	<target name="lint" extensionOf="test" depends="-jshint"/>
 </project>
diff --git a/src/theme-gcwu-intranet/build.xml b/src/theme-gcwu-intranet/build.xml
@@ -7,9 +7,7 @@
 
 	<target name="default" depends="clean,build" description="Performs a clean and build when calling ant without any target"></target>
 
-	<target name="build" depends="-init, -minify" />
-
-	<target name="-minify" depends="-merge-css, -base64-encode">
+	<target name="-minify" extensionOf="build" depends="-merge-css, -base64-encode">
 		<copy todir="${build.dir}/js">
 			<fileset dir="${src.dir}/js"/>
 			<filterchain>
@@ -103,5 +101,5 @@
 		</copy>
 	</target>
 
-	<target name="test" depends="-jshint"/>
+	<target name="lint" extensionOf="test" depends="-jshint"/>
 </project>