forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p.zzz.jrobin159' (head 08df645290d8e156d88930ddaf71b3f3d8af419d)
to branch 'i2p.i2p' (head 69c9e6bd0c6894c335f7d9892aa28ac7d6389907)
This commit is contained in:
61
build.xml
61
build.xml
@@ -206,7 +206,7 @@
|
||||
<launch4j configFile="./installer/i2pstandalone.xml" />
|
||||
<!-- thazzit -->
|
||||
</target>
|
||||
<target name="compile" />
|
||||
|
||||
<target name="jar" depends="jarSmall" >
|
||||
<copy file="apps/BOB/dist/BOB.jar" todir="build/" />
|
||||
<copy file="apps/sam/java/build/sam.jar" todir="build/" />
|
||||
@@ -214,8 +214,9 @@
|
||||
<copy file="apps/susidns/src/susidns.war" todir="build/" />
|
||||
<copy file="apps/i2psnark/i2psnark.war" todir="build/" />
|
||||
<copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
|
||||
|
||||
</target>
|
||||
<target name="jarSmall" depends="compile, buildJrobin" >
|
||||
<target name="jarSmall" depends="builddepSmall" >
|
||||
<copy file="core/java/build/i2p.jar" todir="build/" />
|
||||
<copy file="router/java/build/router.jar" todir="build/" />
|
||||
<copy file="apps/ministreaming/java/build/mstreaming.jar" todir="build/" />
|
||||
@@ -224,9 +225,27 @@
|
||||
<copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
|
||||
<copy file="apps/systray/java/build/systray.jar" todir="build/" />
|
||||
<copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
|
||||
<copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
|
||||
<copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
|
||||
</target>
|
||||
|
||||
<target name="jbigi">
|
||||
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
|
||||
<fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="jbigi-windows-only" >
|
||||
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
|
||||
<fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="jbigi-linux-only">
|
||||
<jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
|
||||
<fileset dir="installer/lib/jbigi" includes="*linux*.so" />
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<!-- the apps need to compile the jsps to poupdate -->
|
||||
<target name="poupdate" depends="buildRouter, buildStreaming, buildSystray, buildJetty, buildDesktopGui" >
|
||||
<echo message="Setting environment variable LG2 to a lang code (eg: de,zh,nl etc)" />
|
||||
@@ -397,7 +416,7 @@
|
||||
</delete>
|
||||
</target>
|
||||
|
||||
<target name="preppkg" depends="preppkg-linux, preppkg-windows">
|
||||
<target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
|
||||
<copy file="build/jbigi.jar" todir="pkg-temp/lib" />
|
||||
<copy todir="pkg-temp/lib/wrapper/freebsd/">
|
||||
<fileset dir="installer/lib/wrapper/freebsd/" />
|
||||
@@ -420,6 +439,7 @@
|
||||
<copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
|
||||
<copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
|
||||
<copy todir="pkg-temp/lib/wrapper/win32/">
|
||||
<fileset dir="installer/lib/wrapper/win32/" />
|
||||
@@ -427,14 +447,8 @@
|
||||
</target>
|
||||
|
||||
<!-- only what is needed for debian, etc. -->
|
||||
<target name="preppkg-linux-only" depends="preppkg-linux">
|
||||
<!-- rip the non-linux stuff out of jbigi.jar -->
|
||||
<mkdir dir="tmpextract" />
|
||||
<unjar src="build/jbigi.jar" dest="tmpextract/" />
|
||||
<jar destfile="pkg-temp/lib/jbigi.jar" >
|
||||
<fileset dir="tmpextract/" includes="*linux*" />
|
||||
</jar>
|
||||
<delete dir="tmpextract/" />
|
||||
<target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
|
||||
<copy file="build/jbigi.jar" todir="pkg-temp/lib" />
|
||||
</target>
|
||||
|
||||
<target name="preppkg-linux" depends="preppkg-base">
|
||||
@@ -847,7 +861,6 @@
|
||||
<arg value="build/i2psnark.war"/>
|
||||
<arg value="build/i2ptunnel.jar"/>
|
||||
<arg value="build/i2ptunnel.war"/>
|
||||
<arg value="build/jbigi.jar"/>
|
||||
<arg value="build/mstreaming.jar"/>
|
||||
<arg value="build/router.jar/"/>
|
||||
<arg value="build/desktopgui.jar"/>
|
||||
@@ -1065,25 +1078,11 @@
|
||||
we need to make sure its small, with NO redundent jars or wars.
|
||||
thus cleaning is required before each build-->
|
||||
<target name="buildSmallOnly" depends="pkg-portable-clean,buildSmall"/>
|
||||
|
||||
<!-- *1* preparing the jars by OS dependent de-bloating -->
|
||||
<target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly">
|
||||
<!-- rip the non-windows stuff out of jbigi.jar -->
|
||||
<mkdir dir="tmpextract" />
|
||||
<unjar src="build/jbigi.jar" dest="tmpextract/" />
|
||||
<jar destfile="build/jbigi.jar" >
|
||||
<fileset dir="tmpextract/" includes="*windows*" />
|
||||
</jar>
|
||||
<delete dir="tmpextract/" />
|
||||
</target>
|
||||
<target name="preppkg-portable-linux-jbigi" depends="buildSmallOnly">
|
||||
<!-- rip the non-linux stuff out of jbigi.jar -->
|
||||
<mkdir dir="tmpextract" />
|
||||
<unjar src="build/jbigi.jar" dest="tmpextract/" />
|
||||
<jar destfile="build/jbigi.jar" >
|
||||
<fileset dir="tmpextract/" includes="*linux*" />
|
||||
</jar>
|
||||
<delete dir="tmpextract/" />
|
||||
</target>
|
||||
<target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly, jbigi-windows-only" />
|
||||
|
||||
<target name="preppkg-portable-linux-jbigi" depends="buildSmallOnly, jbigi-linux-only" />
|
||||
|
||||
<!-- *2* os independent procedure -->
|
||||
<target name="preppkg-portable-basic" >
|
||||
|
Reference in New Issue
Block a user