build.xml will now automatically try and run build-plugins on -post-compile

  => build-plugins will try to run build-plugins_bash and build-plugins_ant-contrib
     => build-plugins_ant-contrib will only run if ant-contrib was found where libs.antcontrib points
     => build-plugins_bash will only run if ant-contrib was not found where libs.antcontrib points, and /bin/bash exists


git-svn-id: http://svn.dmdirc.com/trunk@2664 00569f92-eb28-0410-84fd-f71c24880f

BuildPlugins.xml

@@ -6,6 +6,7 @@
 	<property file="nbproject/project.properties"/>
 	<property file="nbproject/private/private.properties"/>
 	<property file="${user.properties.file}"/>
+	<available file="${libs.antcontrib}" property="has.ant-contrib"/>
 	
 	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
 		<classpath>
@@ -24,7 +25,17 @@
 		</jar>
 	</target>
 		
-	<target name="build-plugins">
+	<target name="build-plugins" depends="build-plugins_bash, build-plugins_ant-contrib"/>
+	
+	<available file="/bin/bash" property="has.bash"/>	
+	<target name="build-plugins_bash" unless="has.ant-contrib" if="has.bash">
+		<exec executable="/bin/bash">
+			<arg value="createAllPluginJar.sh"/>
+			<arg value="${src.dir}/com/dmdirc/addons/"/>
+		</exec>
+	</target>
+	
+	<target name="build-plugins_ant-contrib" if="has.ant-contrib">
 		<mkdir dir="plugins/"/>
 		<foreach target="makepluginjar" param="target.file">
 			<path>

build.xml

@@ -4,7 +4,8 @@
 <!-- (If you delete it and reopen the project it will be recreated.) -->
 <project name="DMDirc" default="default" basedir=".">
     <description>Builds, tests, and runs the project DMDirc.</description>
-    <import file="nbproject/build-impl.xml"/>
+		<import file="nbproject/build-impl.xml"/>
+		<import file="BuildPlugins.xml"/>
     <!--
 
     There exist several targets which are by default empty and which can be 
@@ -68,10 +69,5 @@
             <fileset dir="${build.classes.dir}"/>
         </jar>
     -->
-    <target name="-post-compile">
-        <exec executable="/bin/bash">
-            <arg value="createAllPluginJar.sh"/>
-            <arg value="${src.dir}/com/dmdirc/addons/"/>
-        </exec>
-    </target>
+    <target name="-post-compile" depends="build-plugins"/>
 </project>