Changeset e2f048b for build.xml


Ignore:
Timestamp:
Apr 1, 2016 6:19:06 PM (5 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

  • build.xml

    ra493a28 re2f048b  
    765765        <echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
    766766    </target>
     767
    767768    <target name="javadoc-zip" depends="javadoc">
    768769        <zip destfile="javadoc.zip" basedir="build" level="9" includes="javadoc\**" />
    … …  
    10631064    </target>
    10641065
     1066    <!-- This is the target called by debian/rules -->
    10651067    <target name="preppkg-unix" depends="preppkg-base, prep-script-translation" >
    10661068        <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
    … …  
    11411143    </target>
    11421144
    1143     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos">
     1145    <!-- 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">
    11441147        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    11451148        <!-- Also remove deletelist.txt used for updater only -->
    … …  
    11491152        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    11501153        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    1151         <!-- all jetty stuff -->
    1152         <copy todir="pkg-temp/lib" >
    1153             <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
    1154         </copy>
    11551154        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    11561155        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    … …  
    11711170        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    11721171        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    1173         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    1174         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
    11751172        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    11761173        <copy file="apps/i2psnark/i2psnark.config" todir="pkg-temp/" />
    … …  
    12051202    </target>
    12061203
     1204    <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
     1205        <copy todir="pkg-temp/lib" >
     1206            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" />
     1207        </copy>
     1208    </target>
     1209
     1210    <target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" >
     1211        <copy todir="pkg-temp/lib" >
     1212            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
     1213        </copy>
     1214    </target>
     1215
     1216    <target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" >
     1217        <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
     1218    </target>
     1219
     1220    <target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" >
     1221        <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     1222    </target>
     1223
    12071224    <!-- does NOT include launch4j licenses for Windows builds -->
    1208     <target name="preplicenses">
     1225    <target name="preplicenses" depends="preplicenses-unlesspkg" >
    12091226        <copy file="LICENSE.txt" todir="pkg-temp/" />
    12101227        <copy todir="pkg-temp/licenses/" >
    12111228          <fileset dir="licenses/" />
    12121229        </copy>
     1230        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     1231    </target>
     1232
     1233    <target name="preplicenses-unlesspkg" unless="${with-libjetty8-java}" >
    12131234        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    1214         <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
    1215     </target>
    1216 
     1235    </target>
    12171236
    12181237    <!-- DOES include launch4j licenses for Windows builds -->
    … …  
    19902009            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    19912010            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2011            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2012            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2013            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2014            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2015            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2016            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2017            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2018            <!-- anything added above, add in debian-release-tarball also -->
    19922019        </delete>
    19932020        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
    … …  
    19992026                <exclude name="installer/resources/geoip.txt"/>
    20002027                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2028                <exclude name="apps/jetty/apache-tomcat/**"/>
     2029                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2030                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2031                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2032                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2033                <!-- anything added above, add in debian-release-tarball also -->
    20012034            </tarfileset>
    20022035            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
    … …  
    20342067            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    20352068            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2069            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2070            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2071            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2072            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2073            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2074            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2075            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2076            <!-- anything added above, add in debian-tarball also -->
    20362077        </delete>
    20372078        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
    … …  
    20412082                <exclude name="debian-alt/**"/>
    20422083                <exclude name="**/*.sh"/>
     2084                <exclude name="installer/resources/geoip.txt"/>
     2085                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2086                <exclude name="apps/jetty/apache-tomcat/**"/>
     2087                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2088                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2089                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2090                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2091                <!-- anything added above, add in debian-tarball also -->
    20432092            </tarfileset>
    20442093            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
Note: See TracChangeset for help on using the changeset viewer.