Changeset d263e42 for core/java


Ignore:
Timestamp:
Nov 19, 2018 2:58:20 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
97e7a98
Parents:
54184f2
Message:

Debian: Add libjson-simple-java dependency

File:
1 edited

Legend:

Unmodified
Added
Removed
  • core/java/build.xml

    r54184f2 rd263e42  
    4747        <istrue value="${with-libhttpclient-java}" />
    4848    </condition>
    49     <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath}" />
     49    <!-- fixups if we're using json-simple.jar for org.json.simple classes -->
     50    <condition property="source.exclude4" value="org/json/simple/**" else="NOTHING" >
     51        <istrue value="${with-libjson-simple-java}" />
     52    </condition>
     53    <condition property="javac.classpath.mod4" value="build/json-simple.jar:" else="" >
     54        <istrue value="${with-libjson-simple-java}" />
     55    </condition>
     56    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath.mod4}${javac.classpath}" />
    5057
    5158    <!-- jar classpath fixups -->
     
    5865    <condition property="httpclient.jar" value="/usr/share/java/httpclient.jar /usr/share/java/httpcore.jar" else="" >
    5966        <istrue value="${with-libhttpclient-java}" />
     67    </condition>
     68    <condition property="json-simple.jar" value="/usr/share/java/json-simple.jar" else="" >
     69        <istrue value="${with-libjson-simple-java}" />
    6070    </condition>
    6171
     
    7383            <exclude name="${source.exclude2}" />
    7484            <exclude name="${source.exclude3}" />
     85            <exclude name="${source.exclude4}" />
    7586        </javac>
    7687    </target>
Note: See TracChangeset for help on using the changeset viewer.