Changeset e69f39f6 for build.xml

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

File:

• build.xml (modified) (2 diffs)

build.xml

@@ -1480 +1480 @@
 
     <!-- GeoIP files -->
-    <target name="prepgeoupdate">
-        <copy todir="pkg-temp/geoip/" >
-            <!-- We use a fileset here so it doesn't fail if the files don't exist.
-                 As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
-            <fileset dir="installer/resources" includes="geoip.txt geoipv6.dat.gz" />
-        </copy>
+    <target name="prepgeoupdate" depends="prepgeoupdate-unlesspkg" >
         <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
         <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
@@ -1491 +1486 @@
         <copy file="installer/resources/public-suffix-list.txt" todir="pkg-temp/geoip/" />
        -->
+    </target>
+
+    <!-- GeoIP files, set withGeoIPDatabase=true in override.properties to prevent -->
+    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
+    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
+        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
+        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
     </target>