Changeset 169fd56 for build.xml


Ignore:
Timestamp:
Mar 27, 2016 12:55:28 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e69f39f6
Parents:
97a6cbd
Message:

Transport:
Include Maxmind geoip-api-java library v1.3.1 (LGPL v2.1)
Use Maxmind database for geoip lookup if it exists
Debian:
Don't bundle geoip.txt and geoipv6.dat.gz, depend on geoip-database instead

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r97a6cbd r169fd56  
    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 -->
     
    14791479    </target>
    14801480
    1481     <!-- GeoIP files and flag icons -->
     1481    <!-- GeoIP files -->
    14821482    <target name="prepgeoupdate">
    1483         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    1484         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
     1483        <copy todir="pkg-temp/geoip/" >
     1484            <!-- We use a fileset here so it doesn't fail if the files don't exist.
     1485                 As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
     1486            <fileset dir="installer/resources" includes="geoip.txt geoipv6.dat.gz" />
     1487        </copy>
    14851488        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    14861489        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
     
    19871990                <exclude name="debian/**"/>
    19881991                <exclude name="**/*.sh"/>
     1992                <exclude name="installer/resources/geoip.txt"/>
     1993                <exclude name="installer/resources/geoipv6.dat.gz"/>
    19891994            </tarfileset>
    19901995            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
Note: See TracChangeset for help on using the changeset viewer.