I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 84e4558d authored by kytv's avatar kytv
Browse files

Updated packaging scripts to work with Debian's (and Ubuntu's) Jetty packages.

parent b5f97d08
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/jetty/build.xml
+ 0
− 1
View file @ 84e4558d
......@@ -82,7 +82,6 @@
jetty-sslengine-xxx.jar: SSL NIO Connector for console
jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
commons-logging.jar: JspC compiler
TODO which of these are available in the Ubuntu packages?
-->
<copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
<copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
......
build.xml
+ 40
− 38
View file @ 84e4558d
......@@ -50,26 +50,28 @@
<echo message=" javadoc: generate javadoc for the entire project into ./build/javadoc" />
<echo message=" slackpkg: generate Slackware packages in ./Slackware/i2p and ./Slackware/i2p-base" />
<echo message=" debianhowto: instructions on building Debian packages" />
<echo message=" debian: generate Debian packages in ../" />
<echo message=" run &quot;ant debianhowto&quot; for instructions" />
<echo message=" debian-clean: rollback debian specific patches and run the &quot;distclean&quot; target (done automatically at the end of the &quot;debian&quot; target)" />
<!-- <echo message=" debianrepo: build a Debian repository (reprepro required)" /> -->
<echo message=" debian: generate Debian packages in ../" />
<echo message=" run &quot;ant debianhowto&quot; for instructions" />
<echo message=" debian-clean: rollback debian specific patches and run the &quot;distclean&quot; target (done automatically at the end of the &quot;debian&quot; target)" />
<!-- <echo message=" debianrepo: build a Debian repository (reprepro required)" /> -->
<echo message=" poupdate: update the .po files for translators" />
<echo message=" pkg-portable-win32: build a minimum portable version for win32" />
</target>
<target name="debianhowto">
<echo message="To build debian packages, you must make sure that you have" />
<echo message="the necessary build-dependencies installed." />
<echo message="The packages required to build can be found in the file "/>
<echo message="&quot;debian/control&quot; in both the Build-Depends and Build-Depends-Indep fields."/>
<echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
<echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
<echo message="" />
<echo message="The following command will install all dependencies for you:" />
<echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential quilt" />
<echo message=" " />
<echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
<echo message="to patch the source and build the packages." />
<echo message="To build debian packages, you must make sure that you have" />
<echo message="the necessary build-dependencies installed." />
<echo message="The packages required to build can be found in the file "/>
<echo message="&quot;debian/control&quot; in the &quot;Build-Depends&quot; field."/>
<echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
<echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
<echo message="" />
<echo message="The following command will install all of the dependencies for you:" />
<echo message=" " />
<echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
<echo message=" quilt libcommons-el-java libcommons-logging-java libjetty-extra-java libjetty-java" />
<echo message=" " />
<echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
<echo message="to patch the source and build the packages." />
</target>
<target name="dist" depends="pkg, javadoc">
</target>
......@@ -1379,33 +1381,33 @@
<target name="debian-binary" >
<echo message="Did you update the version using dch -i?" />
<echo message=" " />
<echo message="If the changelog was not updated with dch -i, press" />
<echo message="press CTRL+C to abort building this Debian package." />
<echo message="" />
<echo message="Pausing build for ten seconds to give enough time to read this notice." />
<exec executable="sleep" failonerror="true">
<arg value="10" />
</exec>
<echo message=" " />
<echo message="If the changelog was not updated with dch -i, press" />
<echo message="press CTRL+C to abort building this Debian package." />
<echo message="" />
<echo message="Pausing build for ten seconds to give enough time to read this notice." />
<exec executable="sleep" failonerror="true">
<arg value="10" />
</exec>
<echo message="====================" />
<!-- bundle the jetty 5 lib since there isn't a deb for it -->
<ant dir="apps/jetty" target="ensureJettylib" />
<exec executable="fakeroot" failonerror="true">
<arg value="debian/rules" />
<arg value="patch" />
<arg value="binary" />
<arg value="clean" />
<exec executable="fakeroot" failonerror="true">
<arg value="debian/rules" />
<arg value="patch" />
<arg value="binary" />
<arg value="clean" />
</exec>
<delete dir=".pc" />
<delete dir=".pc" />
</target>
<target name="debian-clean" depends="buildProperties" >
<exec executable="fakeroot" failonerror="true">
<arg value="debian/rules" />
<arg value="clean" />
<arg value="debian/rules" />
<arg value="clean" />
</exec>
<delete dir="./.pc" />
<delete dir="./.pc" />
</target>
<target name="debian-patch" depends="buildProperties" >
<exec executable="quilt" failonerror="true">
<arg value="-a" />
......@@ -1415,8 +1417,8 @@
</target>
<target name="debian-unpatch" depends="buildProperties">
<exec executable="quilt" failonerror="false">
<arg value="-a" />
<arg value="pop" />
<arg value="-a" />
<arg value="pop" />
</exec>
</target>
......
debian/control
+ 10
− 2
View file @ 84e4558d
......@@ -10,9 +10,12 @@ Build-Depends: debhelper (>= 7.0.50~),
debconf,
default-jdk,
gettext,
libcommons-el-java,
libcommons-logging-java,
libgmp3-dev,
libjetty-extra-java,
libjetty-java,
po-debconf
##Build-Depends-Indep: tor-geoipdb
Package: i2p
Architecture: all
......@@ -65,7 +68,11 @@ Package: i2p-router
Architecture: all
Section: net
Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre-headless | java5-runtime-headless | java6-runtime-headless
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
default-jre-headless | java5-runtime-headless | java6-runtime-headless,
libcommons-logging-java,
libjetty-java,
libtomcat6-java
Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni (>= ${source:Version}), libjbigi-jni (<< ${source:Version}.1~), ttf-dejavu
......@@ -76,6 +83,7 @@ Suggests: tor,
imule,
i2pfox,
irc-client,
itoopie,
jircii,
mail-client,
mail-reader,
......
debian/i2p-router.install
+ 28
− 1
View file @ 84e4558d
# history.txt is installed to /usr/share/i2p because
# it's shown in the router console at http://127.0.0.1:7657
# (this is also why I don't use dh_installchangelogs -k for it)
history.txt usr/share/i2p
pkg-temp/blocklist.txt usr/share/i2p
pkg-temp/certificates usr/share/i2p
pkg-temp/clients.config usr/share/i2p
......@@ -10,7 +14,30 @@ pkg-temp/hosts.txt usr/share/i2p
pkg-temp/i2prouter-nowrapper usr/bin
pkg-temp/i2psnark.config usr/share/i2p
pkg-temp/i2ptunnel.config usr/share/i2p
pkg-temp/lib/*.jar usr/share/i2p/lib
pkg-temp/router.config usr/share/i2p
pkg-temp/systray.config usr/share/i2p
pkg-temp/webapps usr/share/i2p
# We'll selectively copy things from pkg-temp
# to ensure that potential Jetty jars aren't
# duplicated
pkg-temp/lib/BOB.jar usr/share/i2p/lib
pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
pkg-temp/lib/i2p.jar usr/share/i2p/lib
pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
pkg-temp/lib/jrobin.jar usr/share/i2p/lib
pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
pkg-temp/lib/router.jar usr/share/i2p/lib
pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
pkg-temp/lib/sam.jar usr/share/i2p/lib
pkg-temp/lib/standard.jar usr/share/i2p/lib
pkg-temp/lib/streaming.jar usr/share/i2p/lib
pkg-temp/lib/systray.jar usr/share/i2p/lib
pkg-temp/lib/systray4j.jar usr/share/i2p/lib
# These two are copied over to avoid depending on libjetty-extra-java
# and pulling in dependencies that we don't care about
pkg-temp/lib/commons-el.jar usr/share/i2p/lib
pkg-temp/lib/jetty-threadpool.jar usr/share/i2p/lib
debian/i2p-router.links
+ 18
− 0
View file @ 84e4558d
......@@ -2,3 +2,21 @@ usr/share/common-licenses/GPL-2 usr/share/doc/i2p-router/licenses/LICENSE-GPLv2.
usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGPLv2.1.txt
usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
# From libcommons-logging-java
usr/share/java/commons-logging.jar usr/share/i2p/lib/commons-logging.jar
# From libtomcat6-java
usr/share/java/jasper.jar usr/share/i2p/lib/jasper.jar
usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
usr/share/java/tomcat-juli.jar usr/share/i2p/lib/tomcat-juli.jar
# From libjetty-java
usr/share/java/jetty.jar usr/share/i2p/lib/jetty.jar
usr/share/java/jetty-util.jar usr/share/i2p/lib/jetty-util.jar
usr/share/java/jetty-sslengine.jar usr/share/i2p/lib/jetty-sslengine.jar
usr/share/java/jetty-start.jar usr/share/i2p/lib/jetty-start.jar
# From libservlet2.5-java
usr/share/java/servlet-api-2.5.jar usr/share/i2p/lib/servlet-api.jar
usr/share/java/jsp-api-2.1.jar usr/share/i2p/lib/jsp-api.jar
usr/share/java/el-api-2.1.jar usr/share/i2p/lib/el-api.jar
debian/patches/0004-jetty6.patch 0 → 100644
+ 266
− 0
View file @ 84e4558d
From: Kill Your TV <killyourtv@i2pmail.org>
Date: Sun, 1 Jan 2011 22:30:32 +0000
Subject: Jetty 6
This patch updates
apps/i2ptunnel/java/build.xml
apps/jetty/build.xml
apps/routerconsole/java/build.xml
apps/susidns/src/build.xml
so that I2P can be built using Jetty packages from Debian/Ubuntu
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -2,76 +2,18 @@
<project basedir="." default="all" name="jetty">
<property name="jetty.ver" value="6.1.26" />
- <property name="jetty.base" value="jetty-${jetty.ver}" />
- <property name="jetty.sha1" value="9485913f1a1945a849a90f1a34853d22350bc524" />
- <property name="jetty.filename" value="${jetty.base}.zip" />
- <property name="jetty.url" value="http://dist.codehaus.org/jetty/${jetty.base}/${jetty.filename}" />
- <property name="verified.filename" value="verified.txt" />
<property name="javac.compilerargs" value="" />
<target name="all" depends="build" />
-
<target name="ensureJettylib" >
- <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
- <available property="jetty.zip.extracted" file="jettylib" type="dir" />
<ant target="fetchJettylib" />
<ant target="verifyJettylib" />
<ant target="extractJettylib" />
</target>
- <target name="fetchJettylib" unless="jetty.zip.available" >
- <echo message="It seems that you don't have '${jetty.filename}' deployed." />
- <echo message="The build script can download this file for you automatically," />
- <echo message="or alternatively you can obtain it manually from:" />
- <echo message="${jetty.url}" />
- <echo message="" />
- <echo message="The libraries contained in the fetched file provide the Jetty web server" />
- <echo message="(http://jetty.mortbay.org/). They are not absolutely necessary" />
- <echo message="but strongly recommended, since they are used by some applications" />
- <echo message="on top of I2P, like the router console." />
- <echo message="" />
- <echo message="Even if you deploy the Jetty archive manually into directory apps/jetty/," />
- <echo message="the build script will still attempt to verify its checksums, which must be:" />
- <echo message="SHA1 ${jetty.sha1}" />
- <echo message="" />
- <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
- <fail message="Aborting as requested. Please deploy the Jetty archive manually." >
- <condition>
- <equals arg1="${jetty.download}" arg2="n"/>
- </condition>
- </fail>
- <get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
- </target>
-
- <condition property="verified.already" >
- <and>
- <available file="${jetty.filename}" />
- <uptodate property="foo.bar.baz" srcfile="${jetty.filename}" targetfile="${verified.filename}" />
- </and>
- </condition>
-
- <target name="verifyJettylib" unless="verified.already" >
- <condition property="jetty.zip.verified" >
- <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
- </condition>
- <fail message="Jetty archive does not match its checksum!" >
- <condition>
- <not>
- <istrue value="${jetty.zip.verified}" />
- </not>
- </condition>
- </fail>
- <touch file="${verified.filename}" />
- </target>
-
- <target name="extractJettylib" unless="jetty.zip.extracted" >
- <!-- for .tgz -->
- <!--
- <gunzip src="${jetty.filename}" dest="jetty.tar" />
- <untar src="jetty.tar" dest="." />
- -->
- <!-- for .zip -->
- <unzip src="${jetty.filename}" dest="." />
+ <target name="verifyJettylib" />
+ <target name="fetchJettylib" />
+ <target name="extractJettylib">
<mkdir dir="jettylib" />
<!-- We copy everything to names without the version numbers so we
can update them later. Where there was something similar in Jetty 5,
@@ -83,29 +25,26 @@
jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
commons-logging.jar: JspC compiler
-->
- <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-threadpool.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-compiler-5.5.15.jar" tofile="jettylib/jasper-compiler.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
- <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
- <delete file="jetty.tar" />
- <delete dir="${jetty.base}" />
- <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
- for org.apache.jasper.JspC compiler
- -->
- <copy preservelastmodified="true" file="../../installer/lib/launch4j/lib/commons-logging.jar" todir="jettylib/" />
+ <copy preservelastmodified="true" file="/usr/share/java/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/commons-logging.jar" todir="jettylib/" />
+ <copy preservelastmodified="true" file="/usr/share/java/el-api-2.1.jar" tofile="jettylib/el-api.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/jasper-el.jar" todir="jettylib/" />
+ <copy preservelastmodified="true" file="/usr/share/java/jetty-java5-threadpool.jar" tofile="jettylib/jetty-threadpool.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/jetty-sslengine.jar" tofile="jettylib/jetty-sslengine.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/jetty-start.jar" tofile="jettylib/jetty-start.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/jetty-util.jar" tofile="jettylib/jetty-util.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/jetty.jar" tofile="jettylib/org.mortbay.jetty.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/servlet-api.jar" tofile="jettylib/javax.servlet.jar" />
+ <copy preservelastmodified="true" file="/usr/share/java/tomcat-juli.jar" tofile="jettylib/tomcat-juli.jar" />
+ <copy preservelastmodified="true" file="/usr/share/jetty/lib/jsp-2.1/ant.jar" tofile="jettylib/ant.jar" />
+ <copy preservelastmodified="true" file="/usr/share/jetty/lib/jsp-2.1/jasper.jar" tofile="jettylib/jasper.jar" />
+ <copy preservelastmodified="true" file="/usr/share/jetty/lib/jsp-2.1/jsp-api.jar" tofile="jettylib/jsp-api.jar" />
</target>
<target name="build" depends="jar" />
<target name="builddep" />
- <target name="compile" depends="builddep, ensureJettylib" >
+ <target name="compile" depends="builddep,extractJettylib" >
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<javac
@@ -169,7 +108,6 @@
<target name="cleandep" depends="clean" />
<target name="distclean" depends="clean">
<delete dir="./jettylib" />
- <echo message="Not actually deleting the jetty libs (since they're so large)" />
</target>
<target name="reallyclean" depends="distclean">
</target>
@@ -177,22 +115,10 @@
<delete dir="./jettylib" />
<delete file="${jetty.filename}" />
</target>
- <target name="javadoc" >
- <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
- <available property="jetty.zip.javadocExtracted" file="build/javadoc" type="dir" />
- <ant target="fetchJettylib" />
- <ant target="verifyJettylib" />
- <ant target="extractJavadoc" />
- </target>
- <target name="extractJavadoc" unless="jetty.zip.javadocExtracted" >
- <mkdir dir="./build" />
- <mkdir dir="./build/javadoc" />
- <unzip src="${jetty.filename}" dest="./build/javadoc" >
- <patternset>
- <include name="${jetty.base}/javadoc/" />
- </patternset>
- <mapper type="glob" from="${jetty.base}/javadoc/*" to="javadoc/*" />
- </unzip>
+ <target name="javadoc">
+ <echo message="Javadocs are available in the package &quot;libjetty-java-doc&quot;" />
</target>
+ <target name="extractJavadoc" />
+
</project>
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -164,13 +164,15 @@
<!-- there are various jspc ant tasks, but they all seem a bit flakey -->
<java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
<classpath>
- <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
- <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
- <pathelement location="../../jetty/jettylib/commons-logging.jar" />
+ <pathelement location="../../jetty/jettylib/ant.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
+ <pathelement location="../../jetty/jettylib/commons-logging.jar" />
+ <pathelement location="../../jetty/jettylib/el-api.jar" />
+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
+ <pathelement location="../../jetty/jettylib/jasper.jar" />
+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
- <pathelement location="../../jetty/jettylib/ant.jar" />
+ <pathelement location="../../jetty/jettylib/tomcat-juli.jar" />
<pathelement location="build/i2ptunnel.jar" />
</classpath>
<arg value="-d" />
@@ -187,10 +189,12 @@
destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
<compilerarg line="${javac.compilerargs}" />
<classpath>
- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
- <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
- <pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
+ <pathelement location="../../jetty/jettylib/commons-logging.jar" />
+ <pathelement location="../../jetty/jettylib/el-api.jar" />
+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
+ <pathelement location="../../jetty/jettylib/jasper.jar" />
+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<pathelement location="build/i2ptunnel.jar" />
</classpath>
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -238,8 +238,10 @@
-->
<java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
<classpath>
- <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
+ <pathelement location="../../jetty/jettylib/jasper.jar" />
+ <pathelement location="../../jetty/jettylib/tomcat-juli.jar" />
+ <pathelement location="../../jetty/jettylib/el-api.jar" />
+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
@@ -273,7 +275,10 @@
srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
<compilerarg line="${javac.compilerargs}" />
<classpath>
- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
+ <pathelement location="../../jetty/jettylib/jasper.jar" />
+ <pathelement location="../../jetty/jettylib/el-api.jar" />
+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
+ <pathelement location="../../jetty/jettylib/tomcat-juli.jar" />
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -14,8 +14,10 @@
<pathelement location="${lib}/org.mortbay.jetty.jar"/>
<pathelement location="WEB-INF/lib/jstl.jar" />
<pathelement location="WEB-INF/lib/standard.jar" />
- <pathelement location="${lib}/jasper-compiler.jar" />
- <pathelement location="${lib}/jasper-runtime.jar" />
+ <pathelement location="${lib}/jasper.jar" />
+ <pathelement location="${lib}/tomcat-juli.jar" />
+ <pathelement location="${lib}/el-api.jar" />
+ <pathelement location="${lib}/jasper-el.jar" />
<pathelement location="${lib}/javax.servlet.jar" />
<pathelement location="${lib}/jsp-api.jar" />
<pathelement location="${lib}/commons-logging.jar" />
--- a/build.xml
+++ b/build.xml
@@ -679,7 +679,7 @@
<copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
<!-- all jetty stuff -->
<copy todir="pkg-temp/lib" >
- <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
+ <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar el-api.jar tomcat-juli.jar" />
</copy>
<copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
<copy file="build/streaming.jar" todir="pkg-temp/lib/" />
debian/patches/series
+ 2
− 1
View file @ 84e4558d
0001-path-substitution.patch
0002-jbigi-soname.patch
0003-renaming-jcpuid.patch
debian-version.patch
#debian-version.patch
0004-jetty6.patch
debian/rules
+ 3
− 5
View file @ 84e4558d
......@@ -37,10 +37,9 @@ clean: createcopyright
override_dh_auto_clean:
dh_auto_clean
ant distclean
# The next line is used by KYTV when building from source packages
#rm -f apps/jetty/jetty-5.1.15.tgz
rm -f core/c/jbigi/*.[s]o
rm -rf core/c/jcpuid/lib/
#rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
debconf-updatepo
override_dh_auto_build:
......@@ -48,12 +47,11 @@ override_dh_auto_build:
binary-indep: build-indep
build-indep:
dh_prep
# The next line is used by KYTV when building from source packages
#[ -r jetty/jetty-5.1.15.tgz ] && ln -sf $(CURDIR)/jetty/jetty-5.1.15.tgz $(CURDIR)/apps/jetty/jetty-5.1.15.tgz
#mkdir -p $(CURDIR)/installer/lib/wrapper/all
#ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
ant preppkg-unix javadoc
echo router.updateDisabled=true > $(I2P)/router.config
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
#-cp -fv /usr/share/tor/geoip $(CURDIR)/pkg-temp/geoip/geoip.txt
binary-arch: build-arch
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]