Changeset 0703a29 for build.xml


Ignore:
Timestamp:
Mar 11, 2017 3:24:23 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
aea20a5
Parents:
072d990 (diff), db0381d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.jetty9' (head 80022f6ef552acd1382d45103969aa7c17b1d794)

to branch 'i2p.i2p' (head 3b4b418ae8be95d52228fc7c325fc52e0223e4fe)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r072d990 r0703a29  
    7171            <echo message=" " />
    7272            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
    73             <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
    74             <echo message="  devscripts libjetty8-java glassfish-javaee"  />
     73            <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \"  />
     74            <echo message="  devscripts libjetty9-java libtomcat8-java glassfish-javaee libgetopt-java"  />
    7575            <echo message=" " />
    7676            <echo message="The following command will install the additional runtime dependencies:" />
     
    12431243    </target>
    12441244
    1245     <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
     1245    <target name="copyjetty-unlesspkg" unless="${with-libjetty9-java}" >
    12461246        <copy todir="pkg-temp/lib" >
    12471247            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
     
    12901290
    12911291    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
     1292<!--  replacement?
    12921293        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     1294-->
    12931295    </target>
    12941296
     
    14631465        <exec executable="sh" osfamily="unix" failonerror="true">
    14641466            <arg value="-c" />
    1465             <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
     1467            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
    14661468        </exec>
    14671469        <exec executable="sh" osfamily="mac" failonerror="true">
    14681470            <arg value="-c" />
    1469             <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
     1471            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
    14701472        </exec>
    14711473        <!-- windoz here : i admit, i hate escaped symbols in xml, indeed = =! -->
     
    15961598              can't overwrite an existing eepsite dir in a non-split configuration.
    15971599          -->
    1598         <copy todir="pkg-temp/eepsite-jetty7" >
     1600        <copy todir="pkg-temp/eepsite-jetty9" >
    15991601            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
    16001602        </copy>
     
    16021604
    16031605    <target name="delete-j6-update">
    1604         <delete dir="pkg-temp/eepsite-jetty7" />
     1606        <delete dir="pkg-temp/eepsite-jetty9" />
    16051607    </target>
    16061608
     
    22052207            <arg value="../i2p-${Extended.Version}" />
    22062208        </exec>
    2207         <delete includeemptydirs="true" quiet="false">
     2209        <delete includeemptydirs="true" quiet="false" failonerror="false">
    22082210            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    22092211            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     
    22212223            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    22222224            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2223             <!-- libjetty8-java -->
    2224             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2225            <!-- libjetty9-java -->
     2226            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    22252227            <!-- libjstl1.1-java or glassfish-javaee -->
    22262228          <!--
     
    22292231            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    22302232            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2231             <!-- libtomcat6-java or libtomcat7-java -->
    2232           <!--
    2233             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2234             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2235            -->
    22362233            <!-- anything added above, add in debian-release-tarball also -->
    22372234        </delete>
     
    22492246           -->
    22502247                <exclude name="apps/susidns/src/lib/standard.jar" />
    2251           <!--
    2252                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2253                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2254            -->
    22552248                <!-- anything added above, add in debian-release-tarball also -->
    22562249            </tarfileset>
     
    22872280            <arg value="../i2p-${Extended.Version}" />
    22882281        </exec>
    2289         <delete includeemptydirs="true" quiet="false">
     2282        <delete includeemptydirs="true" quiet="false" failonerror="false">
    22902283            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    22912284            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     
    23032296            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    23042297            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2305             <!-- libjetty8-java -->
     2298            <!-- libjetty9-java -->
    23062299          <!--
    2307             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2300            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    23082301           -->
    23092302            <!-- libjstl1.1-java or glassfish-javaee -->
     
    23132306            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    23142307            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2315             <!-- libtomcat6-java or libtomcat7-java -->
    2316           <!--
    2317             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2318             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2319            -->
    23202308            <!-- anything added above, add in debian-release-tarball also -->
    23212309        </delete>
     
    23352323           -->
    23362324                <exclude name="apps/susidns/src/lib/standard.jar" />
    2337           <!--
    2338                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2339                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2340            -->
    23412325                <!-- anything added above, add in debian-release-tarball also -->
    23422326            </tarfileset>
     
    23702354            <arg value="../i2p-${Extended.Version}" />
    23712355        </exec>
    2372         <delete includeemptydirs="true" quiet="false">
     2356        <delete includeemptydirs="true" quiet="false" failonerror="false">ilonerror="false">
    23732357            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    23742358            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     
    23822366            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    23832367            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2384             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2368            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    23852369          <!--
    23862370            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    23872371           -->
    23882372            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2389           <!--
    2390             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2391             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2392            -->
    23932373            <!-- anything added above, add in debian-tarball also -->
    23942374        </delete>
     
    24062386           -->
    24072387                <exclude name="apps/susidns/src/lib/standard.jar" />
    2408           <!--
    2409                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2410                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2411            -->
    24122388                <!-- anything added above, add in debian-tarball also -->
    24132389            </tarfileset>
Note: See TracChangeset for help on using the changeset viewer.