Changeset 477fa9e


Ignore:
Timestamp:
Oct 7, 2018 2:29:47 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e2a41b7
Parents:
0cd67ac
Message:

Build: Fix build config with-libtomcat8-java but not with-libjetty9-java,
by copying required jetty jar to jetty-apache-jsp.jar

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r0cd67ac r477fa9e  
    141141           with-libjetty9-java (only): not supported
    142142     -->
    143     <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib1, copyJettylib2, copyTomcatLib" />
     143    <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib1, copyJettylib2, copyJettylib3, copyTomcatLib" />
    144144
    145145    <!-- Jetty files only -->
     
    226226    </target>
    227227
     228    <!-- Copy jetty-apache-jsp.jar -->
     229    <!-- ONLY if with-libtomcat8-java but NOT with-libjetty9-java (wheezy/jessie configuration) -->
     230    <!-- If neither with-libtomcat8-java nor with-libjetty9-java, it's merged into jasper-runtime.jar in the copyTomcatLib2 target below -->
     231    <target name="copyJettylib3" depends="extractJettylib, copyTomcatLib1" if="${with-libtomcat-without-libjetty}" >
     232            <copy preservelastmodified="true" file="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar" tofile="jettylib/jetty-apache-jsp.jar" />
     233    </target>
    228234
    229235    <!-- Tomcat.
     
    251257                <istrue value="${with-libtomcat8-java}" />
    252258            </or>
     259        </condition>
     260        <condition property="with-libtomcat-without-libjetty" >
     261            <and>
     262                <istrue value="${with-libtomcat-java}" />
     263                <not>
     264                    <istrue value="${with-libjetty9-java}" />
     265                </not>
     266            </and>
    253267        </condition>
    254268    </target>
Note: See TracChangeset for help on using the changeset viewer.