diff --git a/build.xml b/build.xml index c94be94c1475fafe689bd3811b2e9fbfade75047..9c38860fa25ef5181b8931f705978d6fe555b6c7 100644 --- a/build.xml +++ b/build.xml @@ -36,6 +36,7 @@ <property name="packetstreamer-gen-build" location="lib/gen-java-bin"/> <property name="packetstreamer-thrift-jar" value="packetstreamer-thrift.jar"/> <property name="floodlight-jar" location="${target}/floodlight.jar"/> + <property name="floodlight-nodeps-jar" location="${target}/floodlight-nodeps.jar"/> <property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/> <patternset id="lib"> @@ -201,7 +202,7 @@ <target name="coverage" depends="instrument,test,coverage-report"/> <target name="dist" depends="compile,compile-test"> - <jar destfile="${floodlight-jar}" filesetmanifest="mergewithoutmain"> + <jar destfile="${floodlight-nodeps-jar}" filesetmanifest="mergewithoutmain"> <manifest> <attribute name="Main-Class" value="${main-class}"/> <attribute name="Class-Path" value="."/> @@ -211,13 +212,20 @@ <fileset dir="${python-src}"> <include name="**/*.py"/> </fileset> - <zipgroupfileset dir="lib"> - <patternset refid="lib"/> - </zipgroupfileset> <zipgroupfileset dir="${target}/lib"> <patternset refid="genlib"/> </zipgroupfileset> </jar> + <jar destfile="${floodlight-jar}"> + <manifest> + <attribute name="Main-Class" value="${main-class}"/> + <attribute name="Class-Path" value="."/> + </manifest> + <zipgroupfileset dir="lib"> + <patternset refid="lib"/> + </zipgroupfileset> + <zipfileset src="${floodlight-nodeps-jar}"/> + </jar> <jar destfile="${floodlight-test-jar}" filesetmanifest="mergewithoutmain"> <manifest> <attribute name="Class-Path" value="."/> diff --git a/debian/floodlight.install b/debian/floodlight.install index 900beb94f874761c9f97066c911096e554ef3bc9..2d38b457a3b8e8233182f3f629efe9eb5d7332d1 100644 --- a/debian/floodlight.install +++ b/debian/floodlight.install @@ -1,2 +1,2 @@ -target/floodlight.jar usr/share/java +target/floodlight-nodeps.jar usr/share/java debian/misc/floodlight usr/bin