forked from I2P_Developers/i2p.i2p
Debian:
Add dependency on libjetty8-java and libservlet3.0-java packages Remove those binaries in debian builds Prep for dependency on libservlet2.5-java package Prep for dependency on libtomcat6-java package Prep for dependency on libtomcat7-java package Prep for dependency on libjakarta-taglibs-standard-java package Prep for dependency on libjstl1.1-java package Add build properties for building with packages Rework of apps/jetty/build.xml for building with packages Redefine debian/ as the files for the jessie build Make debian-alt directories for ubuntu builds Move debian/changelog to debian-alt/trusty/changelog Move debian-alt/jessie/changelog to debian/changelog Add apps/jetty/jettylib/jsp-api.jar to classpath for jsp builds
This commit is contained in:
67
build.xml
67
build.xml
@@ -764,6 +764,7 @@
|
||||
</javadoc>
|
||||
<echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
|
||||
</target>
|
||||
|
||||
<target name="javadoc-zip" depends="javadoc">
|
||||
<zip destfile="javadoc.zip" basedir="build" level="9" includes="javadoc\**" />
|
||||
</target>
|
||||
@@ -1062,6 +1063,7 @@
|
||||
<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
|
||||
</target>
|
||||
|
||||
<!-- This is the target called by debian/rules -->
|
||||
<target name="preppkg-unix" depends="preppkg-base, prep-script-translation" >
|
||||
<copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/eepget" todir="pkg-temp/" />
|
||||
@@ -1140,7 +1142,8 @@
|
||||
<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
|
||||
</target>
|
||||
|
||||
<target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos">
|
||||
<!-- see targets below for conditional copying -->
|
||||
<target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty-unlesspkg, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
|
||||
<!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
|
||||
<!-- Also remove deletelist.txt used for updater only -->
|
||||
<delete>
|
||||
@@ -1148,10 +1151,6 @@
|
||||
</delete>
|
||||
<copy file="build/i2p.jar" todir="pkg-temp/lib/" />
|
||||
<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.*.jar" />
|
||||
</copy>
|
||||
<copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="build/streaming.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="build/router.jar" todir="pkg-temp/lib/" />
|
||||
@@ -1170,8 +1169,6 @@
|
||||
<copy file="build/susimail.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="build/susidns.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
|
||||
<copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
|
||||
<copy file="apps/i2psnark/i2psnark.config" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/blocklist.txt" todir="pkg-temp/" />
|
||||
@@ -1204,16 +1201,38 @@
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
|
||||
<copy todir="pkg-temp/lib" >
|
||||
<fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" >
|
||||
<copy todir="pkg-temp/lib" >
|
||||
<fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" >
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
|
||||
</target>
|
||||
|
||||
<target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" >
|
||||
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
|
||||
</target>
|
||||
|
||||
<!-- does NOT include launch4j licenses for Windows builds -->
|
||||
<target name="preplicenses">
|
||||
<target name="preplicenses" depends="preplicenses-unlesspkg" >
|
||||
<copy file="LICENSE.txt" todir="pkg-temp/" />
|
||||
<copy todir="pkg-temp/licenses/" >
|
||||
<fileset dir="licenses/" />
|
||||
</copy>
|
||||
<copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
|
||||
<copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
|
||||
</target>
|
||||
|
||||
<target name="preplicenses-unlesspkg" unless="${with-libjetty8-java}" >
|
||||
<copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
|
||||
</target>
|
||||
|
||||
<!-- DOES include launch4j licenses for Windows builds -->
|
||||
<target name="preplicenses-windows" depends="preplicenses">
|
||||
@@ -1989,6 +2008,14 @@
|
||||
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/Slackware" />
|
||||
<fileset dir="../i2p-${Extended.Version}/_MTN" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-release-tarball also -->
|
||||
</delete>
|
||||
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}">
|
||||
@@ -1998,6 +2025,12 @@
|
||||
<exclude name="**/*.sh"/>
|
||||
<exclude name="installer/resources/geoip.txt"/>
|
||||
<exclude name="installer/resources/geoipv6.dat.gz"/>
|
||||
<exclude name="apps/jetty/apache-tomcat/**"/>
|
||||
<exclude name="apps/jetty/apache-tomcat-deployer/**"/>
|
||||
<exclude name="apps/jetty/jetty-distribution-*/**"/>
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-release-tarball also -->
|
||||
</tarfileset>
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
|
||||
<exclude name="debian/**" />
|
||||
@@ -2033,6 +2066,14 @@
|
||||
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/Slackware" />
|
||||
<fileset dir="../i2p-${Extended.Version}/_MTN" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
|
||||
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
|
||||
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-tarball also -->
|
||||
</delete>
|
||||
<tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}">
|
||||
@@ -2040,6 +2081,14 @@
|
||||
<exclude name="debian/**"/>
|
||||
<exclude name="debian-alt/**"/>
|
||||
<exclude name="**/*.sh"/>
|
||||
<exclude name="installer/resources/geoip.txt"/>
|
||||
<exclude name="installer/resources/geoipv6.dat.gz"/>
|
||||
<exclude name="apps/jetty/apache-tomcat/**"/>
|
||||
<exclude name="apps/jetty/apache-tomcat-deployer/**"/>
|
||||
<exclude name="apps/jetty/jetty-distribution-*/**"/>
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
|
||||
<exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
|
||||
<!-- anything added above, add in debian-tarball also -->
|
||||
</tarfileset>
|
||||
<tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
|
||||
<exclude name="debian/**" />
|
||||
|
||||
Reference in New Issue
Block a user