Description: build.xml: remove usage of lib/ directory.
Author: Damien Raude-Morvan <drazzib@debian.org>
Forwarded: not-needed
Last-Update: 2011-03-04
--- a/build.xml
+++ b/build.xml
@@ -57,27 +57,31 @@
 	<taskdef uri="antlib:org.apache.ivy.ant" resource="org/apache/ivy/ant/antlib.xml" classpath="${lib.dir}/${ivy.version}.jar"/>
 	<!-- Latest ivy 9/2008 seems to want absolute path -->
 	<property name="ivy.lib.dir" value="${basedir}/lib"/>
+	
+	<path id="debian.build.classpath.id">
+		<pathelement path="${debian.build.classpath}"/>
+	</path>
+	<path id="debian.test.classpath.id">
+		<pathelement path="${debian.test.classpath}"/>
+	</path>
+	
 	<path id="project.classpath">
-		<fileset dir="${lib.dir}"/>
+		<path refid="debian.build.classpath.id" />
 	</path>
 	<path id="script.classpath">
-		<fileset dir="${lib.dir}"/>
+		<path refid="debian.build.classpath.id" />
 		<pathelement location="${classes.dir}"/>
 	</path>
 	<path id="full.classpath">
-		<fileset dir="${lib.dir}"/>
+		<path refid="debian.build.classpath.id" />
+		<path refid="debian.test.classpath.id" />
 		<fileset dir="./">
 			<filename name="${red5.filename}.jar"/>
 			<filename name="boot.jar"/>
 		</fileset>
 	</path>
 	<path id="runtime.classpath">
-		<fileset dir="${lib.dir}">
-			<exclude name="Grobo*.jar"/>
-			<exclude name="grobo*.jar"/>
-			<exclude name="junit*.jar"/>
-			<exclude name="ivy*.jar"/>
-		</fileset>
+		<path refid="debian.build.classpath.id" />
 	</path>
 	<!-- Build Targets -->
 	<target name="-java6.check">
@@ -462,9 +466,11 @@
 	</macrodef>
 	<!-- Determine classpath for jar file -->
 	<target name="jar-determine-classpath" depends="compile" unless="jar.classpath">
+<!--
 		<manifestclasspath property="jar.classpath" jarfile="${red5.filename}.jar">
 			<classpath refid="runtime.classpath"/>
 		</manifestclasspath>
+-->
 	</target>
 	<target name="jar" description="Make Archive" depends="jar-determine-classpath">
 		<jar destfile="${red5.filename}.jar">
@@ -506,14 +512,6 @@
 		</jar>
 	</target>
 	<target name="dist" description="Create binary distribution" depends="jar">
-		<copy todir="${dist.dir}/lib">
-			<fileset dir="${lib.dir}">
-				<exclude name="ivy*.jar"/>
-				<exclude name="junit*.jar"/>
-				<exclude name="grobo*.jar"/>
-				<exclude name="*-sources*.jar"/>
-			</fileset>
-		</copy>
 		<copy todir="${dist.dir}/conf">
 			<fileset dir="${config.dir}">
 				<!-- exclude war config files -->