Changeset 97a6cbd for debian


Ignore:
Timestamp:
Mar 26, 2016 5:28:58 PM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r51e04f7 r97a6cbd  
    1010 ,ant-optional
    1111 ,debconf
    12  ,default-jdk | openjdk-7-jdk
     12 ,openjdk-7-jdk
    1313 ,dh-apparmor
    1414 ,gettext
  • debian/rules

    r51e04f7 r97a6cbd  
    4949        rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    5050        rm -rf $(CURDIR)/debian/python-i2p
     51        rm -f $(CURDIR)/override.properties
    5152        debconf-updatepo
    5253
     
    7273        @echo "Already found deb in version, not doing anything"
    7374endif
     75        # build options
     76        @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
     77        @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     78        @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     79        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
    7480        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    7581        echo router.updateDisabled=true > $(I2P)/router.config
Note: See TracChangeset for help on using the changeset viewer.