From 239ab66c8ae8ac96ab0fd1cd183f3458e3c93bd4 Mon Sep 17 00:00:00 2001
From: Rich Lane <rich.lane@bigswitch.com>
Date: Thu, 24 May 2012 11:42:23 -0700
Subject: [PATCH] simplify build by removing packetstreamer jar
---
build.xml | 39 +++------------------------------------
1 file changed, 3 insertions(+), 36 deletions(-)
diff --git a/build.xml b/build.xml
index 6a932b711..2d12ee08b 100644
--- a/build.xml
+++ b/build.xml
@@ -39,12 +39,10 @@
<property name="python-src" location="src/main/python"/>
<property name="docs" location="${target}/docs"/>
<property name="main-class" value="net.floodlightcontroller.core.Main"/>
- <property name="packetstreamer-thrift-jar" value="packetstreamer-thrift.jar"/>
<property name="floodlight-jar" location="${target}/floodlight.jar"/>
<property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/>
<property name="thrift.dir" value="${basedir}/src/main/thrift"/>
<property name="thrift.out.dir" value="lib/gen-java"/>
- <property name="thrift.bin.dir" value="${target}/gen-java-bin"/>
<property name="thrift.package" value="net/floodlightcontroller/packetstreamer/thrift"/>
<property name="ant.build.javac.source" value="1.6"/>
<property name="ant.build.javac.target" value="1.6"/>
@@ -68,17 +66,11 @@
<include name="jython-2.5.2.jar"/>
<include name="libthrift-0.7.0.jar"/>
</patternset>
- <patternset id="genlib">
- <include name="${packetstreamer-thrift-jar}"/>
- </patternset>
<path id="classpath">
<fileset dir="${lib}">
<patternset refid="lib"/>
</fileset>
- <fileset dir="${target}/lib">
- <patternset refid="genlib"/>
- </fileset>
</path>
<patternset id="lib-cobertura">
@@ -104,9 +96,6 @@
<patternset refid="lib-cobertura"/>
<patternset refid="lib"/>
</fileset>
- <fileset dir="${target}/lib">
- <patternset refid="genlib"/>
- </fileset>
</path>
<target name="init">
@@ -114,15 +103,14 @@
<mkdir dir="${build-test}"/>
<mkdir dir="${target}/lib"/>
<mkdir dir="${thrift.out.dir}"/>
- <mkdir dir="${thrift.bin.dir}"/>
<mkdir dir="${test-output}"/>
</target>
- <target name="compile" depends="init,packetstreamer-thrift">
+ <target name="compile" depends="init,gen-thrift">
<javac includeAntRuntime="false"
classpathref="classpath"
debug="true"
- srcdir="${source}:${thrift.bin.dir}"
+ srcdir="${source}:${thrift.out.dir}"
destdir="${build}">
</javac>
</target>
@@ -165,18 +153,6 @@
</exec>
</target>
- <target name="compile-thrift" depends="init,gen-thrift">
- <javac srcdir="${thrift.out.dir}"
- includeantruntime="false"
- destdir="${thrift.bin.dir}"
- debug="true" debuglevel="lines,vars,source"
- classpathref="classpath" />
- </target>
- <target name="packetstreamer-thrift" depends="compile-thrift">
- <jar jarfile="${target}/lib/${packetstreamer-thrift-jar}"
- basedir="${thrift.bin.dir}"/>
- </target>
-
<target name="clean">
<delete dir="${target}"/>
</target>
@@ -253,9 +229,6 @@
<zipgroupfileset dir="${lib}">
<patternset refid="lib"/>
</zipgroupfileset>
- <zipgroupfileset dir="${target}/lib">
- <patternset refid="genlib"/>
- </zipgroupfileset>
</jar>
<jar destfile="${floodlight-test-jar}" filesetmanifest="mergewithoutmain">
<manifest>
@@ -267,9 +240,6 @@
<patternset refid="lib-test"/>
<patternset refid="lib-cobertura"/>
</zipgroupfileset>
- <zipgroupfileset dir="${target}/lib">
- <patternset refid="genlib"/>
- </zipgroupfileset>
</jar>
</target>
@@ -291,16 +261,13 @@
version="true"/>
</target>
- <target name="eclipse" depends="init,packetstreamer-thrift">
+ <target name="eclipse" depends="init,gen-thrift">
<pathconvert property="eclipse-lib">
<map from="${basedir}/" to=""/>
<fileset dir="${lib}">
<patternset refid="lib"/>
<patternset refid="lib-test"/>
</fileset>
- <fileset dir="${target}/lib">
- <patternset refid="genlib"/>
- </fileset>
</pathconvert>
<exec executable="${basedir}/setup-eclipse.sh">
<arg value="${main-class}"/>
--
GitLab