echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debian: Add runtime dependency on libgetopt-java,

Browse Source 
link to /usr/share/java/gnu-getopt.jar,
don't build gnu/getopt source
This commit is contained in:
zzz
2016-04-29 18:40:02 +00:00
parent f2239ba7d1
commit 2e154881ef
6 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/build.xml
View File

@ -22,22 +22,36 @@
<property name="javac.version" value="1.6" />
<!-- fixups if we're using libintl.jar for GettextResource.java -->
<condition property="source.exclude" value="src/gnu/gettext/GettextResource.java" else="" >
<condition property="source.exclude1" value="gnu/gettext/GettextResource.java" else="NOTHING" >
<istrue value="${with-gettext-base}" />
</condition>
<condition property="javac.classpath.mod" value="/usr/share/java/libintl.jar ${javac.classpath}" else="${javac.classpath}" >
<condition property="javac.classpath.mod1" value="/usr/share/java/libintl.jar:" else="" >
<istrue value="${with-gettext-base}" />
</condition>
<!-- fixups if we're using gnu-getopt.jar for gnu/getopt/* -->
<condition property="source.exclude2" value="gnu/getopt/**" else="NOTHING" >
<istrue value="${with-libgetopt-java}" />
</condition>
<condition property="javac.classpath.mod2" value="/usr/share/java/gnu-getopt.jar:" else="" >
<istrue value="${with-libgetopt-java}" />
</condition>
<condition property="translation.includes" value="NOTHING" else="gnu/getopt/*.properties" >
<istrue value="${with-libgetopt-java}" />
</condition>
<property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath}" />
<target name="compile" depends="depend">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
<!-- sourcepath="" necessary for excludes to work, see ant manual for javac -->
<javac sourcepath="" srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="false"
excludes="${source.exclude}"
destdir="./build/obj" classpath="${javac.classpath.mod}" >
<compilerarg line="${javac.compilerargs}" />
<include name="**/*.java" />
<exclude name="${source.exclude1}" />
<exclude name="${source.exclude2}" />
</javac>
</target>
@ -61,7 +75,7 @@
<jar destfile="./build/i2p.jar" >
<fileset dir="./build/obj" includes="**/*.class" />
<!-- the getopt translation files -->
<fileset dir="src" includes="gnu/getopt/*.properties" />
<fileset dir="src" includes="${translation.includes}" />
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
<attribute name="Built-By" value="${build.built-by}" />