Changeset 6b923c7


Ignore:
Timestamp:
May 22, 2011 6:33:51 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
96cf5986
Parents:
18e57d1
Message:

Fix build error that omitted local jetty patches from org.mortbay.jetty.jar;
affected 0.8.4 and 0.8.6 installers. Include jar in the updater for the next release.
Thx KYTV.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r18e57d1 r6b923c7  
    6868        <untar src="jetty.tar" dest="." />
    6969        <mkdir dir="jettylib" />
    70         <copy todir="jettylib">
     70        <copy todir="jettylib" preservelastmodified="true" >
    7171            <fileset dir="${jetty.base}/lib">
    7272                <include name="*.jar" />
    7373            </fileset>
    74         </copy>
    75         <copy todir="jettylib">
    7674            <fileset dir="${jetty.base}/ext">
    7775                <include name="ant.jar" />
     
    8078                <include name="jasper-compiler.jar" />
    8179                <include name="jasper-runtime.jar" />
    82                 <include name="javax.servlet.jar" />
    83                 <include name="org.mortbay.jetty.jar" />
    8480            </fileset>
    8581        </copy>
  • build.xml

    r18e57d1 r6b923c7  
    879879    <!-- this is the same dependency as pkg, but with updater200 in the middle,
    880880         since preppkg puts too much stuff in pkg-temp -->
     881<!--
    881882    <target name="release" depends="distclean, updater, updater200, preppkg, installer" >
     883-->
     884    <target name="release" depends="distclean, updaterWithJettyFixes, updater200WithJettyFixes, preppkg, installer" >
    882885        <echo message="================================================================" />
    883886        <echo message="Did you update these files?" />
Note: See TracChangeset for help on using the changeset viewer.