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

Fixes for building with libgetopt-java

Browse Source
This commit is contained in:
zzz
2016-04-29 19:15:41 +00:00
parent c3f5c04bea
commit 7ae1483cb3
8 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/i2psnark/java/build.xml
View File

@ -16,6 +16,7 @@
<!-- Depend on classes instead of jars where available -->
<classpath>
<pathelement location="../../../core/java/build/obj" />
<pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../ministreaming/java/build/obj" />
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
@ -43,6 +44,8 @@
<compilerarg line="${javac.compilerargs}" />
<classpath>
<pathelement location="../../../core/java/build/i2p.jar" />
<!-- gnu-getopt.jar only present for debian builds -->
<pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->

3
apps/i2ptunnel/java/build.xml
View File

@ -16,6 +16,7 @@
<!-- Depend on classes instead of jars where available -->
<classpath>
<pathelement location="../../../core/java/build/obj" />
<pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../ministreaming/java/build/obj" />
</classpath>
</depend>
@ -38,7 +39,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj"
includeAntRuntime="false"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>

3
apps/sam/java/build.xml
View File

@ -16,6 +16,7 @@
<!-- Depend on classes instead of jars where available -->
<classpath>
<pathelement location="../../../core/java/build/obj" />
<pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../ministreaming/java/build/obj" />
</classpath>
</depend>
@ -35,7 +36,7 @@
debug="true" deprecation="on" source="1.7" target="1.7"
includeAntRuntime="false"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs7}" />
</javac>
</target>

1
build.xml
View File

@ -1290,6 +1290,7 @@
<java classname="net.i2p.router.networkdb.kademlia.BundleRouterInfos" fork="true" failonerror="true">
<classpath>
<pathelement location="build/i2p.jar" />
<pathelement location="core/java/build/gnu-getopt.jar" />
<pathelement location="build/router.jar" />
<pathelement location="build/tools.jar" />
</classpath>

4
core/java/build.xml
View File

@ -25,14 +25,14 @@
<condition property="source.exclude1" value="gnu/gettext/GettextResource.java" else="NOTHING" >
<istrue value="${with-gettext-base}" />
</condition>
<condition property="javac.classpath.mod1" value="/usr/share/java/libintl.jar:" else="" >
<condition property="javac.classpath.mod1" value="build/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="" >
<condition property="javac.classpath.mod2" value="build/gnu-getopt.jar:" else="" >
<istrue value="${with-libgetopt-java}" />
</condition>
<condition property="translation.includes" value="NOTHING" else="gnu/getopt/*.properties" >

4
debian/rules vendored
View File

@ -141,9 +141,13 @@ endif
@# debian and ubuntu: everywhere
@/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties
@#mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar
@# debian and ubuntu: everywhere
@/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties
@#mkdir -p $(CURDIR)/core/java/build
ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
echo router.updateDisabled=true > $(I2P)/router.config

2
installer/tools/java/build.xml
View File

@ -26,7 +26,7 @@
<mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
includeAntRuntime="false"
destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../build/router.jar" >
destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>

2
router/java/build.xml
View File

@ -38,7 +38,7 @@
<javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="false"
destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar" >
destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>