forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p' (head b7ee04ecc7a594239e977b25a52ebdabadce558e)
to branch 'i2p.i2p.zzz.jetty6' (head 2cd4a4dae8b87b9ed2128d83aff1b39e3a818556)
This commit is contained in:
38
build.xml
38
build.xml
@@ -34,6 +34,7 @@
|
||||
<echo message=" updater: Package the built files in i2pupdate.zip (extracts safely over existing installs)" />
|
||||
<echo message=" updater200: Updater compressed with pack200 (creates i2pupdate200.zip, 60% smaller)" />
|
||||
<echo message=" updaterWithJavadoc: updater including the javadocs, for display in the console" />
|
||||
<echo message=" updater200WithJavadoc: updater including the javadocs, for display in the console (creates i2pupdate200.zip)" />
|
||||
<echo message=" updaterWithJetty: Updater including Jetty" />
|
||||
<echo message=" updater200withJetty: Updater including Jetty" />
|
||||
<echo message=" updaterWithJettyFixes: updater including local jetty patches" />
|
||||
@@ -379,7 +380,7 @@
|
||||
packagenames="*"
|
||||
use="true"
|
||||
splitindex="true"
|
||||
doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}"
|
||||
doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
|
||||
windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
|
||||
<group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org.xlattice.crypto.filters:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
|
||||
<group title="Streaming Library" packages="net.i2p.client.streaming" />
|
||||
@@ -388,7 +389,7 @@
|
||||
<!-- apps and bridges starting here, alphabetical please -->
|
||||
<group title="Addressbook Application" packages="net.i2p.addressbook" />
|
||||
<group title="BOB Bridge" packages="net.i2p.BOB" />
|
||||
<group title="Desktopgui Application" packages="net.i2p.desktopgui.*" />
|
||||
<group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" />
|
||||
<group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
|
||||
<group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
|
||||
<group title="Jetty Logging" packages="org.mortbay.http" />
|
||||
@@ -475,7 +476,12 @@
|
||||
<arg value="-f1" />
|
||||
<arg value="-d;" />
|
||||
</exec>
|
||||
<echo message="Build number is ${build.number}" />
|
||||
<exec executable="awk" outputproperty="build.extra" failonerror="false">
|
||||
<arg value="-F"" />
|
||||
<arg value="/public final static String EXTRA/{print $2}" />
|
||||
<arg value="router/java/src/net/i2p/router/RouterVersion.java" />
|
||||
</exec>
|
||||
<echo message="Build number is ${build.number}${build.extra}" />
|
||||
</target>
|
||||
|
||||
<target name="clean" depends="pkgclean" >
|
||||
@@ -484,6 +490,9 @@
|
||||
<delete file="i2pinstall.exe" failonerror="false" quiet="true" />
|
||||
<delete file="i2p.exe" failonerror="false" quiet="true" />
|
||||
<delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
|
||||
<delete>
|
||||
<fileset dir="." includes="i2pinstall*jar i2pinstall*bz2" />
|
||||
</delete>
|
||||
<delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
|
||||
<delete file="BOB-one.jar" failonerror="false" quiet="true" />
|
||||
<delete dir="core/c/jbigi/bin" />
|
||||
@@ -792,8 +801,8 @@
|
||||
<copy todir="pkg-temp/docs/" >
|
||||
<fileset dir="installer/resources/readme/" includes="readme*.html" />
|
||||
<fileset dir="installer/resources/proxy/" includes="*.ht" />
|
||||
<!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10 -->
|
||||
<fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/a1.png icons/flags/a2.png" />
|
||||
<!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10; im.png added in 0.8.12 -->
|
||||
<fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/im.png icons/flags/a1.png icons/flags/a2.png" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
@@ -812,6 +821,7 @@
|
||||
<target name="updater200WithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, pack200, zipit200" />
|
||||
<target name="updater" depends="prepupdate, preplicenses, zipit" />
|
||||
<target name="updaterWithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, zipit" />
|
||||
<target name="updater200WithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, pack200, zipit200" />
|
||||
<target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
|
||||
<target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
|
||||
<target name="updater200WithJetty" depends="prepjupdate, preplicenses, pack200, zipit200" />
|
||||
@@ -1048,14 +1058,14 @@
|
||||
<mkdir dir="pkg-temp/installer" />
|
||||
<!-- set if unset -->
|
||||
<property name="workspace.changes.util.tr" value="" />
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-freebsd-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
</target>
|
||||
|
||||
<target name="installer-linux" depends="clean, preppkg-linux-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
|
||||
<mkdir dir="pkg-temp/installer" />
|
||||
<!-- set if unset -->
|
||||
<property name="workspace.changes.util.tr" value="" />
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-linux-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
</target>
|
||||
|
||||
|
||||
@@ -1064,7 +1074,7 @@
|
||||
<mkdir dir="pkg-temp/osx" />
|
||||
<!-- set if unset -->
|
||||
<property name="workspace.changes.util.tr" value="" />
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-osx-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
<ant target="installer2app" />
|
||||
<delete dir="pkg-temp/osx" />
|
||||
</target>
|
||||
@@ -1077,21 +1087,21 @@
|
||||
<mkdir dir="pkg-temp/osx" />
|
||||
<exec executable="python" failonerror="true">
|
||||
<arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
|
||||
<arg value="${basedir}/i2pinstall_${release.number}-osx-only.jar" />
|
||||
<arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app" />
|
||||
<arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" />
|
||||
<arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
|
||||
</exec>
|
||||
<exec executable="chmod" failonerror="true" osfamily="unix">
|
||||
<arg value="755" />
|
||||
<arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app/Contents/MacOS/JavaApplicationStub" />
|
||||
<arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
|
||||
</exec>
|
||||
<exec executable="tar" osfamily="unix" failonerror="true">
|
||||
<arg value="--owner=root" />
|
||||
<arg value="--group=root" />
|
||||
<arg value="-cjvf" />
|
||||
<arg value="${basedir}/i2pinstall_${release.number}-osx.tar.bz2" />
|
||||
<arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx.tar.bz2" />
|
||||
<arg value="-C" />
|
||||
<arg value="${basedir}/pkg-temp/osx" />
|
||||
<arg value="i2p-${release.number}-osx-install.app" />
|
||||
<arg value="i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
@@ -1126,7 +1136,7 @@
|
||||
<attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
|
||||
</manifest>
|
||||
</jar>
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-windows-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
|
||||
<delete dir="pkg-temp/win" />
|
||||
</target>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user