Skip to content
Snippets Groups Projects
Commit 78bffca2 authored by Rich Lane's avatar Rich Lane
Browse files

add a lib ant property

parent 8a41ddc6
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/> <property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/>
<property name="ant.build.javac.source" value="1.6"/> <property name="ant.build.javac.source" value="1.6"/>
<property name="ant.build.javac.target" value="1.6"/> <property name="ant.build.javac.target" value="1.6"/>
<property name="lib" location="lib"/>
<patternset id="lib"> <patternset id="lib">
<include name="logback-classic-1.0.0.jar"/> <include name="logback-classic-1.0.0.jar"/>
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
</patternset> </patternset>
<path id="classpath"> <path id="classpath">
<fileset dir="lib"> <fileset dir="${lib}">
<patternset refid="lib"/> <patternset refid="lib"/>
</fileset> </fileset>
<fileset dir="${target}/lib"> <fileset dir="${target}/lib">
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
<include name="log4j-1.2.9.jar"/> <include name="log4j-1.2.9.jar"/>
</patternset> </patternset>
<path id="classpath-cobertura"> <path id="classpath-cobertura">
<fileset dir="lib"> <fileset dir="${lib}">
<patternset refid="lib-cobertura"/> <patternset refid="lib-cobertura"/>
</fileset> </fileset>
</path> </path>
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
<include name="org.easymock_2.5.2.jar"/> <include name="org.easymock_2.5.2.jar"/>
</patternset> </patternset>
<path id="classpath-test"> <path id="classpath-test">
<fileset dir="lib"> <fileset dir="${lib}">
<patternset refid="lib-test"/> <patternset refid="lib-test"/>
<patternset refid="lib-cobertura"/> <patternset refid="lib-cobertura"/>
<patternset refid="lib"/> <patternset refid="lib"/>
...@@ -213,7 +214,7 @@ ...@@ -213,7 +214,7 @@
<fileset dir="${python-src}"> <fileset dir="${python-src}">
<include name="**/*.py"/> <include name="**/*.py"/>
</fileset> </fileset>
<zipgroupfileset dir="lib"> <zipgroupfileset dir="${lib}">
<patternset refid="lib"/> <patternset refid="lib"/>
</zipgroupfileset> </zipgroupfileset>
<zipgroupfileset dir="${target}/lib"> <zipgroupfileset dir="${target}/lib">
...@@ -226,7 +227,7 @@ ...@@ -226,7 +227,7 @@
</manifest> </manifest>
<fileset dir="${build-test}"/> <fileset dir="${build-test}"/>
<fileset dir="${resources}"/> <fileset dir="${resources}"/>
<zipgroupfileset dir="lib"> <zipgroupfileset dir="${lib}">
<patternset refid="lib-test"/> <patternset refid="lib-test"/>
<patternset refid="lib-cobertura"/> <patternset refid="lib-cobertura"/>
</zipgroupfileset> </zipgroupfileset>
...@@ -255,9 +256,9 @@ ...@@ -255,9 +256,9 @@
</target> </target>
<target name="eclipse" depends="init,packetstreamer-thrift"> <target name="eclipse" depends="init,packetstreamer-thrift">
<pathconvert property="lib"> <pathconvert property="eclipse-lib">
<map from="${basedir}/" to=""/> <map from="${basedir}/" to=""/>
<fileset dir="lib"> <fileset dir="${lib}">
<patternset refid="lib"/> <patternset refid="lib"/>
<patternset refid="lib-test"/> <patternset refid="lib-test"/>
</fileset> </fileset>
...@@ -267,7 +268,7 @@ ...@@ -267,7 +268,7 @@
</pathconvert> </pathconvert>
<exec executable="${basedir}/setup-eclipse.sh"> <exec executable="${basedir}/setup-eclipse.sh">
<arg value="${main-class}"/> <arg value="${main-class}"/>
<arg value="${lib}"/> <arg value="${eclipse-lib}"/>
</exec> </exec>
</target> </target>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment