Changeset 97a6cbd

Timestamp:

Mar 26, 2016 5:28:58 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

169fd56, 2fb0572

Parents:

51e04f7

Message:

Debian: Set bootclasspath in override.properties
Require openjdk-7-jdk to build hso we have the correct bootclasspath jars

Location:

debian

Files:

• control (modified) (1 diff)
• rules (modified) (2 diffs)

debian/control

@@ -10 +10 @@
  ,ant-optional
  ,debconf
- ,default-jdk | openjdk-7-jdk
+ ,openjdk-7-jdk
  ,dh-apparmor
  ,gettext

debian/rules

@@ -49 +49 @@
         rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
         rm -rf $(CURDIR)/debian/python-i2p
+        rm -f $(CURDIR)/override.properties
         debconf-updatepo
 
@@ -72 +73 @@
         @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