Changeset 5c0c69c for build.xml


Ignore:
Timestamp:
Nov 20, 2018 2:25:49 PM (19 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
535f2da
Parents:
ef44c36
Message:

GeoIP: Add MaxMind? GeoLite2-Country database 2018113, gzipped
Database and Contents Copyright © 2018 MaxMind?, Inc.
This work is licensed under the Creative Commons Attribution-ShareAlike? 4.0 International License.
To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
This database incorporates GeoNames? http://www.geonames.org geographical data,
which is made available under the Creative Commons Attribution 3.0 License.
To view a copy of this license, visit http://www.creativecommons.org/licenses/by/3.0/us/.

  • Drop old ipv4 and ipv6 data files and build scripts
  • Build changes for new file
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    ref44c36 r5c0c69c  
    7777            <echo message=" " />
    7878            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
    79             <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \"  />
     79            <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java libjson-simple-java \"  />
    8080            <echo message="  devscripts libjetty9-java libtomcat8-java libtaglibs-standard-jstlel-java libgetopt-java"  />
    8181            <echo message=" " />
     
    16871687        <!-- decapitalized the file in 0.7.8 -->
    16881688        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    1689         <!-- small enough to include for now -->
    1690         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    16911689        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
    16921690      <!--
     
    17171715    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
    17181716    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
     1717        <mkdir dir="pkg-temp/geoip" />
     1718      <!--
    17191719        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    17201720        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
     1721       -->
     1722        <gunzip src="installer/resources/GeoLite2-Country.mmdb.gz" dest="pkg-temp/geoip/GeoLite2-Country.mmdb" />
    17211723    </target>
    17221724
     
    21142116    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    21152117    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     2118    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     2119-->
    21162120    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    2117 -->
    2118     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    21192121        <echo message="New version number is ${release.number}" />
    21202122        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
     
    24682470            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    24692471            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2472            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    24702473            <!-- libjetty9-java -->
    24712474            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
     
    25492552            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    25502553            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2554            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    25512555            <!-- libjetty9-java -->
    25522556          <!--
     
    26322636            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    26332637            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2638            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    26342639            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
    26352640            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
     
    27062711            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    27072712            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2713            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    27082714            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
    27092715            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
Note: See TracChangeset for help on using the changeset viewer.