Changeset 925cacc for apps/jetty


Ignore:
Timestamp:
Apr 29, 2017 2:24:10 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3dbbc29
Parents:
a21e0274
Message:

Jetty: Set up to add patch for RolloverFileOutputStream?
checked in file is unmodified from 9.2.21 for reference
patch in next checkin

Location:
apps/jetty
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    ra21e0274 r925cacc  
    130130
    131131    <!-- Jetty files only -->
    132     <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty9-java}" >
     132    <target name="copyJettylib1" depends="extractJettylib, buildPatches" unless="${with-libjetty9-java}" >
    133133      <!-- We copy everything to names without the version numbers so we
    134134           can update them later. Where there was something similar in Jetty 5/6,
     
    160160        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-servlet-${jetty.ver}.jar" tofile="jettylib/jetty-servlet.jar" />
    161161        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-servlets-${jetty.ver}.jar" tofile="jettylib/jetty-servlets.jar" />
     162      <!--
    162163        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
     164       -->
     165        <jar destfile="jettylib/jetty-util.jar"  manifest="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" filesetmanifest="mergewithoutmain" >
     166            <zipfileset excludes="**/RolloverFileOutputStream*.class" src="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" />
     167            <zipfileset src="build/jetty-util-patch.jar" />
     168        </jar>
    163169        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-webapp-${jetty.ver}.jar" tofile="jettylib/jetty-webapp.jar" />
    164170        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-xml-${jetty.ver}.jar" tofile="jettylib/jetty-xml.jar" />
     
    367373    </target>   
    368374
     375    <target name="buildPatches" depends="jarPatches" unless="${with-libjetty9-java}" />
     376
     377    <target name="compilePatches" unless="${with-libjetty9-java}" >
     378        <mkdir dir="./build" />
     379        <mkdir dir="./build/objPatches" />
     380        <javac
     381            srcdir="./patches/jetty-util/src/main/java"
     382            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
     383            destdir="./build/objPatches"
     384            includeAntRuntime="false"
     385            classpath="" >
     386            <compilerarg line="${javac.compilerargs}" />
     387        </javac>
     388    </target>
     389
     390    <target name="jarPatches" depends="compilePatches, jarPatchesUpToDate" unless="jarPatches.uptodate" >
     391        <jar destfile="./build/jetty-util-patch.jar" basedir="./build/objPatches" includes="**/*.class" >
     392        </jar>
     393    </target>   
     394
     395    <target name="jarPatchesUpToDate" >
     396        <condition property="jarPatches.uptodate" >
     397            <or>
     398                <equals arg1="${with-libjetty9-java}" arg2="true" />
     399                <uptodate property="jarPatches.uptodate" targetfile="jettylib/jetty-i2p.jar" >
     400                    <srcfiles dir= "build/objPatches" includes="**/*.class" />
     401                </uptodate>
     402            </or>
     403        </condition>
     404    </target>   
     405
    369406    <target name="clean" >
    370407        <delete dir="./build" />
Note: See TracChangeset for help on using the changeset viewer.