Changeset b79471e for build.xml


Ignore:
Timestamp:
Apr 3, 2016 3:16:52 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
ae5828f
Parents:
f867a9d (diff), 18391ac (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.debian' (head c630b2a47f63476018a63783a9ae2a8a58503d87)

to branch 'i2p.i2p' (head 700a07a64359e4f328d1002e559f4585c6f02f19)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rf867a9d rb79471e  
    700700            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util" />
    701701            <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
    702             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
     702            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.geoip" />
    703703            <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.update:net.i2p.router.news" />
    704704            <!-- apps and bridges starting here, alphabetical please -->
     
    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, 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" depends="copyjetty-unlesspkg" >
     1205        <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib" />
     1206    </target>
     1207
     1208    <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
     1209        <copy todir="pkg-temp/lib" >
     1210            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
     1211        </copy>
     1212    </target>
     1213
     1214    <target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" >
     1215        <copy todir="pkg-temp/lib" >
     1216            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
     1217        </copy>
     1218    </target>
     1219
     1220    <target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" >
     1221        <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
     1222    </target>
     1223
     1224    <target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" >
     1225        <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     1226    </target>
     1227
    12071228    <!-- does NOT include launch4j licenses for Windows builds -->
    1208     <target name="preplicenses">
     1229    <target name="preplicenses" depends="preplicenses-unlesspkg" >
    12091230        <copy file="LICENSE.txt" todir="pkg-temp/" />
    12101231        <copy todir="pkg-temp/licenses/" >
    12111232          <fileset dir="licenses/" />
    12121233        </copy>
     1234        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     1235    </target>
     1236
     1237    <target name="preplicenses-unlesspkg" unless="${with-libjetty8-java}" >
    12131238        <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 
     1239    </target>
    12171240
    12181241    <!-- DOES include launch4j licenses for Windows builds -->
     
    14821505    </target>
    14831506
    1484     <!-- GeoIP files and flag icons -->
    1485     <target name="prepgeoupdate">
    1486         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    1487         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
     1507    <!-- GeoIP files -->
     1508    <target name="prepgeoupdate" depends="prepgeoupdate-unlesspkg" >
    14881509        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    14891510        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
     
    14911512        <copy file="installer/resources/public-suffix-list.txt" todir="pkg-temp/geoip/" />
    14921513       -->
     1514    </target>
     1515
     1516    <!-- GeoIP files, set withGeoIPDatabase=true in override.properties to prevent -->
     1517    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
     1518    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
     1519        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     1520        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    14931521    </target>
    14941522
     
    19732001        <exec executable="mtn" failonerror="true">
    19742002            <arg value="co" />
    1975             <arg value="-b" />
    1976             <arg value="i2p.i2p" />
    19772003            <!-- w: is the revision of the current workspace -->
    19782004            <arg value="-r" />
     
    19852011            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    19862012            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2013            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2014            <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          <!--
     2017            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2018            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2019            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2020            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2021           -->
     2022            <!-- anything added above, add in debian-release-tarball also -->
    19872023        </delete>
    19882024        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     
    19922028                <exclude name="debian-alt/**"/>
    19932029                <exclude name="**/*.sh"/>
     2030                <exclude name="installer/resources/geoip.txt"/>
     2031                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2032                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2033          <!--
     2034                <exclude name="apps/jetty/apache-tomcat/**"/>
     2035                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2036                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2037                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2038           -->
     2039                <!-- anything added above, add in debian-release-tarball also -->
    19942040            </tarfileset>
    19952041            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
     
    20152061        <exec executable="mtn" failonerror="true">
    20162062            <arg value="co" />
    2017             <arg value="-b" />
    2018             <arg value="i2p.i2p" />
    20192063            <!-- w: is the revision of the current workspace -->
    20202064            <arg value="-r" />
     
    20272071            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    20282072            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2073            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2074            <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          <!--
     2077            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2078            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2079            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2080            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2081           -->
     2082            <!-- anything added above, add in debian-tarball also -->
    20292083        </delete>
    20302084        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     
    20342088                <exclude name="debian-alt/**"/>
    20352089                <exclude name="**/*.sh"/>
     2090                <exclude name="installer/resources/geoip.txt"/>
     2091                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2092                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2093          <!--
     2094                <exclude name="apps/jetty/apache-tomcat/**"/>
     2095                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2096                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2097                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2098           -->
     2099                <!-- anything added above, add in debian-tarball also -->
    20362100            </tarfileset>
    20372101            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
Note: See TracChangeset for help on using the changeset viewer.