Build: Set javac release property (ticket #2775)

Ant version 1.9.8 or higher now required
Drop support for Xenial package build
Fix up BOB build configuration
Fix i2psnark standalone build
This commit is contained in:
zzz
2020-10-07 13:33:41 +00:00
parent ca1e2ba91e
commit a9a5d13e06
36 changed files with 126 additions and 41 deletions

View File

@ -6,7 +6,7 @@ Priority: optional
Bugs: mailto:zzz@i2pmail.org
Homepage: https://geti2p.net/
Build-Depends: debhelper (>= 9.20160709)
,ant (>= 1.8)
,ant (>= 1.9.8)
,debconf
,openjdk-8-jdk
,libjetty9-java (>= 9.4)

View File

@ -80,10 +80,11 @@ else
@echo "Already found deb in version, not doing anything"
endif
@# build options
@/bin/echo -e "javac.release=8" > $(CURDIR)/override.properties
@/bin/echo -e "javac.version=1.8" > $(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
@/bin/echo -e "build.built-by=launchpad" >> $(CURDIR)/override.properties
@/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties
@# debian and ubuntu: everywhere

View File

@ -81,10 +81,8 @@ else
@echo "Already found deb in version, not doing anything"
endif
@# build options
# @/bin/echo -e "javac.version=1.8" > $(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
@/bin/echo -e "javac.release=11" > $(CURDIR)/override.properties
@/bin/echo -e "build.built-by=launchpad" >> $(CURDIR)/override.properties
@/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties
@# debian and ubuntu: everywhere