I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 97a6cbda authored by zzz's avatar zzz
Browse files

Debian: Set bootclasspath in override.properties

Require openjdk-7-jdk to build hso we have the correct bootclasspath jars
parent 51e04f7c
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~) ...@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~)
,ant (>= 1.8) ,ant (>= 1.8)
,ant-optional ,ant-optional
,debconf ,debconf
,default-jdk | openjdk-7-jdk ,openjdk-7-jdk
,dh-apparmor ,dh-apparmor
,gettext ,gettext
,libgmp-dev (>= 2:5.0.5) ,libgmp-dev (>= 2:5.0.5)
......
...@@ -48,6 +48,7 @@ override_dh_auto_clean: ...@@ -48,6 +48,7 @@ override_dh_auto_clean:
rm -rf $(CURDIR)/core/c/jcpuid/lib/ rm -rf $(CURDIR)/core/c/jcpuid/lib/
rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
rm -rf $(CURDIR)/debian/python-i2p rm -rf $(CURDIR)/debian/python-i2p
rm -f $(CURDIR)/override.properties
debconf-updatepo debconf-updatepo
override_dh_auto_build: override_dh_auto_build:
...@@ -71,6 +72,11 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ...@@ -71,6 +72,11 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
endif 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 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
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment