propagate from branch 'i2p.i2p' (head 1b82a3bfd792b71321bcbd8f3b8344664db2dc45)

to branch 'i2p.i2p.mathiasdm.desktopgui' (head 4e485a19a83a3e30425e1b1a03836f35fa4ebb50)
This commit is contained in:
mathiasdm
2011-01-10 06:41:39 +00:00
73 changed files with 972 additions and 6668 deletions

View File

@@ -32,6 +32,7 @@
<echo message=" updaterRouter: updater with the i2p.jar and router.jar only" />
<echo message=" distclean: clean up all derived files" />
<echo message=" syndie: generate a standalone syndie install" />
<echo message=" desktopgui: generate a standalone desktopgui install" />
<echo message=" i2psnark: generate a standalone i2psnark install" />
<echo message=" justBOB: generate a standalone BOB-one.jar" />
<echo message=" javadoc: generate javadoc for the entire project into ./build/javadoc" />
@@ -40,10 +41,6 @@
<echo message=" debian: generate Debian packages in ./debian/packages" />
<echo message=" (libc6-i686 and libc6-amd64 required, ant>=1.8 required)" />
<echo message=" debianrepo: build a Debian repository (reprepro required)" />
<echo message=" updaterWithDesktopgui: tar the built files and desktopgui in an i2pupdate.zip" />
<echo message=" pkgWithDesktopgui: distclean then package everything up with the desktopgui" />
<echo message=" distWithDesktopgui: pkgWithDesktopgui and javadoc" />
<echo message=" distcleanWithDesktopgui: clean up all derived files (including desktopgui files)" />
<echo message=" poupdate: update the .po files for translators" />
</target>
<target name="debianhowto">
@@ -736,6 +733,10 @@
<ant dir="core/java/" target="fullclovertest" />
<ant dir="router/java/" target="fullclovertest" />
</target>
<target name="desktopgui" depends="builddepSmall">
<ant dir="apps/desktopgui" target="jar" />
<copy file="apps/desktopgui/dist/desktopgui.jar" todir="." />
</target>
<target name="syndie" >
<ant dir="apps/syndie/java/" target="standalone" />
<copy file="apps/syndie/java/syndie-standalone.zip" todir="." />
@@ -790,34 +791,6 @@
<echo message="Findbugs output stored in i2p.fba" />
<echo message="Now run: findbugs i2p.fba" />
</target>
<target name="buildWithDesktopgui" depends="buildrouter,builddepSmall">
<ant dir="apps/desktopgui" target="build_jar" />
</target>
<target name="preppkgWithDesktopgui" depends="buildWithDesktopgui,preppkg">
<copy file="apps/desktopgui/dist/desktopgui.jar" todir="pkg-temp/lib/" />
<copy file="apps/desktopgui/lib/swing-worker.jar" todir="pkg-temp/lib/" />
<copy file="apps/desktopgui/lib/appframework.jar" todir="pkg-temp/lib/" />
<mkdir dir="pkg-temp/desktopgui/resources/" />
<copy todir="pkg-temp/desktopgui/resources/">
<fileset dir="apps/desktopgui/desktopgui/resources/" />
</copy>
</target>
<target name="installerWithDesktopgui" depends="preppkgWithDesktopgui,installer" />
<target name="prepupdateWithDesktopgui" depends="buildWithDesktopgui,prepupdate">
<copy file="apps/desktopgui/dist/desktopgui.jar" todir="pkg-temp/lib/" />
<copy file="apps/desktopgui/lib/swing-worker.jar" todir="pkg-temp/lib/" />
<copy file="apps/desktopgui/lib/appframework.jar" todir="pkg-temp/lib/" />
<mkdir dir="pkg-temp/desktopgui/resources/" />
<copy todir="pkg-temp/desktopgui/resources/">
<fileset dir="apps/desktopgui/desktopgui/resources/" />
</copy>
</target>
<target name="updaterWithDesktopgui" depends="prepupdateWithDesktopgui,updater" />
<target name="pkgWithDesktopgui" depends="distclean, updaterWithDesktopgui, installerWithDesktopgui, preppkg" />
<target name="distWithDesktopgui" depends="pkgWithDesktopgui, javadoc" />
<target name="distcleanWithDesktopgui" depends="distclean">
<ant dir="apps/desktopgui" target="build_clean" />
</target>
<!-- this is the same dependency as pkg, but with updater200 in the middle,
since preppkg puts too much stuff in pkg-temp -->