Changeset e2f048b for apps/jetty


Ignore:
Timestamp:
Apr 1, 2016 6:19:06 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d6b1f81
Parents:
a493a28
Message:

Debian:
Add dependency on libjetty8-java and libservlet3.0-java packages
Remove those binaries in debian builds
Prep for dependency on libservlet2.5-java package
Prep for dependency on libtomcat6-java package
Prep for dependency on libtomcat7-java package
Prep for dependency on libjakarta-taglibs-standard-java package
Prep for dependency on libjstl1.1-java package
Add build properties for building with packages
Rework of apps/jetty/build.xml for building with packages
Redefine debian/ as the files for the jessie build
Make debian-alt directories for ubuntu builds
Move debian/changelog to debian-alt/trusty/changelog
Move debian-alt/jessie/changelog to debian/changelog
Add apps/jetty/jettylib/jsp-api.jar to classpath for jsp builds

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    ra493a28 re2f048b  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<project basedir="." default="all" name="jetty">
     3
     4    <!-- This copies jars, with some modifications and renaming,
     5         from the jetty-distribution directory to the jettylib directory.
     6         This is disabled if the property with-libjetty8-java=true.
     7
     8         This copies jars, with some modifications and renaming,
     9         from the apache-tomcat-deployer and apache-tomcat directories to the jettylib directory.
     10         This is disabled if the property with-libservlet2.5-java=true.
     11
     12         This also builds the small helper jar jetty-i2p.jar from
     13         the source in the java/ directory.
     14     -->
    315
    416    <property name="jetty.ver" value="8.1.17.v20150415" />
     
    2335     -->
    2436
    25     <target name="ensureJettylib" >
    26         <available property="jetty.zip.extracted" file="${jetty.base}" type="dir" />
     37    <!-- verify everything we need is in jettylib/ -->
     38    <target name="ensureJettylib" depends="ensureJettylib1, copyJettylib" />
     39
     40    <target name="ensureJettylib1" >
     41        <condition property="jetty.zip.extracted" >
     42            <or>
     43                <istrue value="${with-libjetty8-java}" />
     44                <available file="${jetty.base}" type="dir" />
     45            </or>
     46        </condition>
    2747        <condition property="jetty.zip.available" >
    2848            <or>
     
    3151            </or>
    3252        </condition>
    33         <ant target="copyJettylib" />
    34     </target>
     53    </target>
     54
    3555  <!--
    3656    <target name="ensureJettylib" depends="extractJettylib" />
     
    6383    <condition property="verified.already" >
    6484        <or>
     85            <istrue value="${with-libjetty8-java}" />
    6586            <istrue value="${jetty.zip.extracted}" />
    6687            <and>
     
    95116    </target>
    96117
    97     <target name="copyJettylib" depends="extractJettylib" >
     118    <target name="mkJettylibdir" >
    98119        <mkdir dir="jettylib" />
     120    </target>
     121
     122    <!-- Jetty and tomcat files -->
     123    <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib" />
     124
     125    <!-- Jetty files only -->
     126    <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty8-java}" >
    99127      <!-- We copy everything to names without the version numbers so we
    100128           can update them later. Where there was something similar in Jetty 5/6,
     
    158186        </jar>
    159187      -->
    160         <ant target="copyTomcatLib" />
    161188    </target>
    162189
     
    170197         with the JspC compiler jasper-runtime.jar below.
    171198     -->
    172     <target name="buildTomcatUtilJar" >
     199    <target name="buildTomcatUtilJar" unless="${with-libservlet2.5-java}" >
    173200        <!-- take only what we need from the tomcat-coyote jar -->
    174201        <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
     
    193220         tomcat-api.jar + tomcat-util.jar: Add to javax.servlet.jar (as of Tomcat 7 / Jetty 8)
    194221     -->
    195     <target name="copyTomcatLib" >
     222    <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
     223
     224    <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
     225        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
     226            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
     227            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
     228        </jar>
     229    </target>
     230
     231    <target name="copyTomcatLib2" unless="${with-libtomcat6-java}" >
    196232        <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
    197233            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
    198234            <zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" />
    199         </jar>
    200         <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
    201             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
    202             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
    203235        </jar>
    204236<!--
     
    216248            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
    217249        </jar>
     250    </target>
     251
     252    <target name="copyTomcatLib3" unless="${with-libtomcat7-java}" >
    218253        <jar destfile="jettylib/jasper-compiler.jar" >
    219254            <manifest>
Note: See TracChangeset for help on using the changeset viewer.