zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Debian:

Browse Source 
Add build property to prevent bundling of geoip.txt and geoipv6.dat.gz
This commit is contained in:
zzz
2016-03-31 14:51:42 +00:00
parent 169fd56527
commit e69f39f6e3
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.properties
View File

@@ -113,3 +113,7 @@ javac.version=1.6
#bundle.routerInfos=true #bundle.routerInfos=true
#bundle.routerInfos.count=200 #bundle.routerInfos.count=200
#bundle.routerInfos.i2pConfigDir=/PATH/TO/.i2p #bundle.routerInfos.i2pConfigDir=/PATH/TO/.i2p
### Debian/Ubuntu packages ###
# Don't include geoip files, we will use geoip-database package
#with-geoip-database=true

14
build.xml
View File

@@ -1479,12 +1479,7 @@
</target> </target>
<!-- GeoIP files --> <!-- GeoIP files -->
<target name="prepgeoupdate"> <target name="prepgeoupdate" depends="prepgeoupdate-unlesspkg" >
<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>
<copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" /> <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
<copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" /> <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
<!-- <!--
@@ -1492,6 +1487,13 @@
--> -->
</target> </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>
<!-- All jetty jars required for update. <!-- All jetty jars required for update.
TODO do we need to bother updating jasper? TODO do we need to bother updating jasper?
--> -->

1
debian/rules vendored
View File

@@ -76,6 +76,7 @@ endif
@/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
@/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
@/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
echo router.updateDisabled=true > $(I2P)/router.config echo router.updateDisabled=true > $(I2P)/router.config