marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix build error that omitted local jetty patches from org.mortbay.jetty.jar;

Browse Source 
affected 0.8.4 and 0.8.6 installers. Include jar in the updater for the next release.
        Thx KYTV.
This commit is contained in:
zzz
2011-05-22 18:33:51 +00:00
parent 18e57d19db
commit 6b923c7251
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/jetty/build.xml
View File

@@ -67,20 +67,16 @@
<gunzip src="${jetty.filename}" dest="jetty.tar" /> <gunzip src="${jetty.filename}" dest="jetty.tar" />
<untar src="jetty.tar" dest="." /> <untar src="jetty.tar" dest="." />
<mkdir dir="jettylib" /> <mkdir dir="jettylib" />
<copy todir="jettylib"> <copy todir="jettylib" preservelastmodified="true" >
<fileset dir="${jetty.base}/lib"> <fileset dir="${jetty.base}/lib">
<include name="*.jar" /> <include name="*.jar" />
</fileset> </fileset>
</copy>
<copy todir="jettylib">
<fileset dir="${jetty.base}/ext"> <fileset dir="${jetty.base}/ext">
<include name="ant.jar" /> <include name="ant.jar" />
<include name="commons-el.jar" /> <include name="commons-el.jar" />
<include name="commons-logging.jar" /> <include name="commons-logging.jar" />
<include name="jasper-compiler.jar" /> <include name="jasper-compiler.jar" />
<include name="jasper-runtime.jar" /> <include name="jasper-runtime.jar" />
<include name="javax.servlet.jar" />
<include name="org.mortbay.jetty.jar" />
</fileset> </fileset>
</copy> </copy>
<delete file="jetty.tar" /> <delete file="jetty.tar" />

3
build.xml
View File

@@ -878,7 +878,10 @@
<!-- this is the same dependency as pkg, but with updater200 in the middle, <!-- this is the same dependency as pkg, but with updater200 in the middle,
since preppkg puts too much stuff in pkg-temp --> since preppkg puts too much stuff in pkg-temp -->
<!--
<target name="release" depends="distclean, updater, updater200, preppkg, installer" > <target name="release" depends="distclean, updater, updater200, preppkg, installer" >
-->
<target name="release" depends="distclean, updaterWithJettyFixes, updater200WithJettyFixes, preppkg, installer" >
<echo message="================================================================" /> <echo message="================================================================" />
<echo message="Did you update these files?" /> <echo message="Did you update these files?" />
<exec executable="ls" failonerror="true"> <exec executable="ls" failonerror="true">