Changeset d6b1f81


Ignore:
Timestamp:
Apr 3, 2016 1:04:23 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d940aa5
Parents:
e2f048b
Message:

Debian: Fixes for with-libjetty8-java builds

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    re2f048b rd6b1f81  
    223223
    224224    <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
     225        <!-- EL libs.
     226             Tomcat 6 has EL 2.1.
     227             Tomcat 7 / libservlet3.0 has EL 2.2.
     228             According to http://stackoverflow.com/questions/7202686/differences-between-el-2-1-and-2-2
     229             2.2 is backwards-compatible with 2.1.
     230         -->
    225231        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
    226232            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
  • build.xml

    re2f048b rd6b1f81  
    11441144
    11451145    <!-- see targets below for conditional copying -->
    1146     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty-unlesspkg, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
     1146    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
    11471147        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    11481148        <!-- Also remove deletelist.txt used for updater only -->
     
    12021202    </target>
    12031203
     1204    <target name="copyjetty" depends="copyjetty-unlesspkg" >
     1205        <copy file="build/jetty-i2p.jar" todir="pkg-temp/libs/" />
     1206    </target>
     1207
    12041208    <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
    12051209        <copy todir="pkg-temp/lib" >
    1206             <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" />
     1210            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
    12071211        </copy>
    12081212    </target>
     
    19972001        <exec executable="mtn" failonerror="true">
    19982002            <arg value="co" />
    1999             <arg value="-b" />
    2000             <arg value="i2p.i2p" />
    20012003            <!-- w: is the revision of the current workspace -->
    20022004            <arg value="-r" />
     
    20112013            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    20122014            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2015            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2016          <!--
    20132017            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    20142018            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2015             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
    20162019            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
    20172020            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2021           -->
    20182022            <!-- anything added above, add in debian-release-tarball also -->
    20192023        </delete>
     
    20262030                <exclude name="installer/resources/geoip.txt"/>
    20272031                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2032                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2033          <!--
    20282034                <exclude name="apps/jetty/apache-tomcat/**"/>
    20292035                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2030                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
    20312036                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
    20322037                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2038           -->
    20332039                <!-- anything added above, add in debian-release-tarball also -->
    20342040            </tarfileset>
     
    20552061        <exec executable="mtn" failonerror="true">
    20562062            <arg value="co" />
    2057             <arg value="-b" />
    2058             <arg value="i2p.i2p" />
    20592063            <!-- w: is the revision of the current workspace -->
    20602064            <arg value="-r" />
     
    20692073            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    20702074            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2075            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2076          <!--
    20712077            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    20722078            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2073             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
    20742079            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
    20752080            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2081           -->
    20762082            <!-- anything added above, add in debian-tarball also -->
    20772083        </delete>
     
    20842090                <exclude name="installer/resources/geoip.txt"/>
    20852091                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2092                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2093          <!--
    20862094                <exclude name="apps/jetty/apache-tomcat/**"/>
    20872095                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2088                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
    20892096                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
    20902097                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2098           -->
    20912099                <!-- anything added above, add in debian-tarball also -->
    20922100            </tarfileset>
  • debian/rules

    re2f048b rd6b1f81  
    8585        # debian: in wheezy jessie stretch sid
    8686        @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     87        mkdir -p $(CURDIR)/apps/jetty/jettylib
    8788        ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    8889        ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     
    99100        ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    100101        ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     102        # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     103        ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     104        ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    101105
    102106        # ubuntu: only in wily
    103107        # debian: in wheezy jessie stretch sid
     108        #mkdir -p $(CURDIR)/apps/jetty/jettylib
    104109        #@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
    105110        #ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    106         #ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107         #ln -sf /usr/share/java/servlet-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    108111
    109112        # ubuntu: only in precise trusty vivid
    110113        # debian: only in wheezy
    111114        #@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     115        #mkdir -p $(CURDIR)/apps/jetty/jettylib
    112116        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    113117        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     
    117121        # debian and ubuntu: everywhere
    118122        #@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     123        #mkdir -p $(CURDIR)/apps/jetty/jettylib
    119124        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    120125        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
Note: See TracChangeset for help on using the changeset viewer.