Changeset 2fe1f97


Ignore:
Timestamp:
Apr 30, 2016 6:08:50 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
33629d0, 6bfd39d5
Parents:
30ecded
Message:

Debian: Add runtime dependency on libhttpclient-java,
link to /usr/share/java/httpclient.jar and httpcore.jar.
This is 2 MB of dependencies to replace 20 KB of copied code,
so may not be worth it, esp. for Tails.

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • build.properties

    r30ecded r2fe1f97  
    132132# Don't compile GettextResource.java, we will use libintl.jar from the gettext-base package
    133133#with-gettext-base=true
    134 # Don't compile gnu/getopt classes, we will use libgetopt-java package
     134# Don't compile gnu.getopt classes, we will use libgetopt-java package
    135135#with-libgetopt-java=true
     136# Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages
     137#with-libhttpclient-java=true
  • build.xml

    r30ecded r2fe1f97  
    20322032            <!-- libgetopt-java -->
    20332033            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2034            <!-- libhttpclient-java and libhttpcore-java -->
     2035            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
    20342036            <!-- systray4j -->
    20352037            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
     
    21022104            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
    21032105            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2106            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
    21042107            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
    21052108            <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
  • core/java/build.xml

    r30ecded r2fe1f97  
    3939        <istrue value="${with-libgetopt-java}" />
    4040    </condition>
    41     <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath}" />
     41    <!-- fixups if we're using httpclient.jar and httpcore.jar for org.apache.http classes -->
     42    <condition property="source.exclude3" value="org/apache/http/**" else="NOTHING" >
     43        <istrue value="${with-libhttpclient-java}" />
     44    </condition>
     45    <condition property="javac.classpath.mod3" value="build/httpclient.jar:build/httpcore.jar:" else="" >
     46        <istrue value="${with-libhttpclient-java}" />
     47    </condition>
     48    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath}" />
    4249
    4350    <target name="compile" depends="depend">
     
    5360            <exclude name="${source.exclude1}" />
    5461            <exclude name="${source.exclude2}" />
     62            <exclude name="${source.exclude3}" />
    5563        </javac>
    5664    </target>
  • debian/control

    r30ecded r2fe1f97  
    1616 ,gettext
    1717 ,libgetopt-java
     18 ,libhttpclient-java, libhttpcore-java
    1819 ,libgmp-dev (>= 2:5.0.5)
    1920 ,libservice-wrapper-java
     
    7980 gettext-base,
    8081 libgetopt-java,
     82 libhttpclient-java, libhttpcore-java,
    8183 libjetty8-java, libservlet3.0-java,
    8284 glassfish-javaee
  • debian/i2p-router.links

    r30ecded r2fe1f97  
    9090# ubuntu and debian: everywhere
    9191usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
     92
     93
     94# comment out if not building with libhttpclient-java and libhttpcore-java
     95# ubuntu and debian: everywhere
     96usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
     97usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar
  • debian/rules

    r30ecded r2fe1f97  
    150150        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    151151
     152        @# debian and ubuntu: everywhere
     153        @/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties
     154        @mkdir -p $(CURDIR)/core/java/build
     155        ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar
     156        ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar
     157
    152158        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    153159        echo router.updateDisabled=true > $(I2P)/router.config
  • router/java/build.xml

    r30ecded r2fe1f97  
    1717            <classpath>
    1818                <pathelement location="../../core/java/build/obj" />
     19                <pathelement location="../../core/java/build/gnu-getopt.jar" />
     20                <pathelement location="../../core/java/build/httpclient.jar" />
     21                <pathelement location="../../core/java/build/httpcore.jar" />
    1922            </classpath>
    2023        </depend>
     
    3942               debuglevel="lines,vars,source"
    4043               includeAntRuntime="false"
    41                destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar" >
     44               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar" >
    4245            <compilerarg line="${javac.compilerargs}" />
    4346        </javac>
Note: See TracChangeset for help on using the changeset viewer.