forked from I2P_Developers/i2p.i2p
Use ${ant.home}/lib/ant.jar instead of pulling ant.jar from Jetty
This commit is contained in:
@ -174,7 +174,7 @@
|
|||||||
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
||||||
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
||||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||||
<pathelement location="../../jetty/jettylib/ant.jar" />
|
<pathelement location="${ant.home}/lib/ant.jar" />
|
||||||
<pathelement location="build/i2ptunnel.jar" />
|
<pathelement location="build/i2ptunnel.jar" />
|
||||||
<pathelement location="build/temp-beans.jar" />
|
<pathelement location="build/temp-beans.jar" />
|
||||||
</classpath>
|
</classpath>
|
||||||
|
@ -95,7 +95,6 @@
|
|||||||
<copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
|
<copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
|
||||||
<copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
|
<copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
|
||||||
<copy preservelastmodified="true" file="${jetty.base}/lib/management/jetty-management-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" />
|
<copy preservelastmodified="true" file="${jetty.base}/lib/management/jetty-management-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" />
|
||||||
<copy file="${jetty.base}/lib/jsp-2.1/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
|
|
||||||
<delete file="jetty.tar" />
|
<delete file="jetty.tar" />
|
||||||
<delete dir="${jetty.base}" />
|
<delete dir="${jetty.base}" />
|
||||||
<!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
|
<!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
|
||||||
|
@ -247,7 +247,7 @@
|
|||||||
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
|
||||||
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
<pathelement location="../../jetty/jettylib/commons-el.jar" />
|
||||||
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
|
||||||
<pathelement location="../../jetty/jettylib/ant.jar" />
|
<pathelement location="${ant.home}/lib/ant.jar" />
|
||||||
<pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
|
<pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
|
||||||
<pathelement location="../../systray/java/build/obj" />
|
<pathelement location="../../systray/java/build/obj" />
|
||||||
<pathelement location="../../systray/java/lib/systray4j.jar" />
|
<pathelement location="../../systray/java/lib/systray4j.jar" />
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
<pathelement location="${lib}/jsp-api.jar" />
|
<pathelement location="${lib}/jsp-api.jar" />
|
||||||
<pathelement location="${lib}/commons-logging.jar" />
|
<pathelement location="${lib}/commons-logging.jar" />
|
||||||
<pathelement location="${lib}/commons-el.jar" />
|
<pathelement location="${lib}/commons-el.jar" />
|
||||||
<pathelement location="${lib}/ant.jar" />
|
<pathelement location="${ant.home}/lib/ant.jar" />
|
||||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||||
</path>
|
</path>
|
||||||
<property name="javac.compilerargs" value="" />
|
<property name="javac.compilerargs" value="" />
|
||||||
|
Reference in New Issue
Block a user