Changeset e69f39f6


Ignore:
Timestamp:
Mar 31, 2016 2:51:42 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a493a28
Parents:
169fd56
Message:

Debian:
Add build property to prevent bundling of geoip.txt and geoipv6.dat.gz

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • build.properties

    r169fd56 re69f39f6  
    114114#bundle.routerInfos.count=200
    115115#bundle.routerInfos.i2pConfigDir=/PATH/TO/.i2p
     116
     117### Debian/Ubuntu packages ###
     118# Don't include geoip files, we will use geoip-database package
     119#with-geoip-database=true
  • build.xml

    r169fd56 re69f39f6  
    14801480
    14811481    <!-- GeoIP files -->
    1482     <target name="prepgeoupdate">
    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>
     1482    <target name="prepgeoupdate" depends="prepgeoupdate-unlesspkg" >
    14881483        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    14891484        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
     
    14911486        <copy file="installer/resources/public-suffix-list.txt" todir="pkg-temp/geoip/" />
    14921487       -->
     1488    </target>
     1489
     1490    <!-- GeoIP files, set withGeoIPDatabase=true in override.properties to prevent -->
     1491    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
     1492    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
     1493        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     1494        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    14931495    </target>
    14941496
  • debian/rules

    r169fd56 re69f39f6  
    7777        @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
    7878        @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     79        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    7980        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
    8081        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
Note: See TracChangeset for help on using the changeset viewer.