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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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>
Note: See TracChangeset for help on using the changeset viewer.