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

Debian build fixes

Browse Source
This commit is contained in:
zzz
2017-03-03 19:44:39 +00:00
parent 15915afeb8
commit ec6c24429a
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jetty/build.xml
View File

@@ -238,7 +238,7 @@
-->
<target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
<target name="copyTomcatLib1" unless="${with-libjetty9-java}" >
<target name="copyTomcatLib1" >
<condition property="with-libtomcat-java" >
<or>
<istrue value="${with-libtomcat6-java}" />

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

@@ -76,6 +76,9 @@
<pathelement location="../../desktopgui/dist/desktopgui.jar" />
<pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
<pathelement location="../../jrobin/java/build/jrobin.jar" />
<!-- following jars only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
</classpath>
</javac>
</target>

10
build.xml
View File

@@ -70,8 +70,8 @@
<echo message="The following command will install the build dependencies for you:" />
<echo message=" " />
<echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
<echo message=" build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \" />
<echo message=" devscripts libjetty9-java glassfish-javaee" />
<echo message=" build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \" />
<echo message=" devscripts libjetty9-java libtomcat8-java glassfish-javaee libgetopt-java" />
<echo message=" " />
<echo message="The following command will install the additional runtime dependencies:" />
<echo message="sudo apt-get install libecj-java geoip-database" />
@@ -2206,7 +2206,7 @@
<arg value="w:" />
<arg value="../i2p-${Extended.Version}" />
</exec>
<delete includeemptydirs="true" quiet="false">
<delete includeemptydirs="true" quiet="false" failonerror="false">
<fileset dir="../i2p-${Extended.Version}/debian-alt/" />
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
<fileset dir="../i2p-${Extended.Version}/Slackware" />
@@ -2279,7 +2279,7 @@
<arg value="i2p.i2p" />
<arg value="../i2p-${Extended.Version}" />
</exec>
<delete includeemptydirs="true" quiet="false">
<delete includeemptydirs="true" quiet="false" failonerror="false">
<fileset dir="../i2p-${Extended.Version}/debian-alt/" />
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
<fileset dir="../i2p-${Extended.Version}/Slackware" />
@@ -2353,7 +2353,7 @@
<arg value="i2p.i2p" />
<arg value="../i2p-${Extended.Version}" />
</exec>
<delete includeemptydirs="true" quiet="false">
<delete includeemptydirs="true" quiet="false" failonerror="false">ilonerror="false">
<fileset dir="../i2p-${Extended.Version}/debian-alt/" />
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
<fileset dir="../i2p-${Extended.Version}/Slackware" />

6
debian/i2p-router.install vendored
View File

@@ -56,10 +56,10 @@ pkg-temp/lib/systray.jar usr/share/i2p/lib
# uncomment if not building with libtomcat8-java
pkg-temp/lib/commons-el.jar usr/share/i2p/lib
#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
# legacy name, contains only tomcat-juli, not commons-logging
pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java