Debian: Set bootclasspath in override.properties

Require openjdk-7-jdk to build hso we have the correct bootclasspath jars
This commit is contained in:
zzz
2016-03-26 17:28:58 +00:00
parent 51e04f7c6e
commit 97a6cbda3e
2 changed files with 7 additions and 1 deletions

2
debian/control vendored
View File

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~)
,ant (>= 1.8)
,ant-optional
,debconf
,default-jdk | openjdk-7-jdk
,openjdk-7-jdk
,dh-apparmor
,gettext
,libgmp-dev (>= 2:5.0.5)

6
debian/rules vendored
View File

@@ -48,6 +48,7 @@ override_dh_auto_clean:
rm -rf $(CURDIR)/core/c/jcpuid/lib/
rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
rm -rf $(CURDIR)/debian/python-i2p
rm -f $(CURDIR)/override.properties
debconf-updatepo
override_dh_auto_build:
@@ -71,6 +72,11 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
else
@echo "Already found deb in version, not doing anything"
endif
# build options
@/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.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(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
echo router.updateDisabled=true > $(I2P)/router.config
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper