Changeset e2c98ac for build.xml


Ignore:
Timestamp:
May 20, 2011 1:52:35 PM (10 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3d76354c
Parents:
d4fe76a (diff), 3352c45 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.jrobin159' (head 08df645290d8e156d88930ddaf71b3f3d8af419d)

to branch 'i2p.i2p' (head 69c9e6bd0c6894c335f7d9892aa28ac7d6389907)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rd4fe76a re2c98ac  
    207207        <!-- thazzit -->
    208208    </target>
    209     <target name="compile" />
     209
    210210    <target name="jar" depends="jarSmall" >
    211211        <copy file="apps/BOB/dist/BOB.jar" todir="build/" />
     
    215215        <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
    216216        <copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
    217     </target>
    218     <target name="jarSmall" depends="compile, buildJrobin" >
     217
     218    </target>
     219    <target name="jarSmall" depends="builddepSmall" >
    219220        <copy file="core/java/build/i2p.jar" todir="build/" />
    220221        <copy file="router/java/build/router.jar" todir="build/" />
     
    225226        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
    226227        <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
    227         <copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
    228228        <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
    229229    </target>
     230
     231    <target name="jbigi">
     232        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     233            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
     234        </jar>
     235    </target>
     236
     237    <target name="jbigi-windows-only" >
     238        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     239            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
     240        </jar>
     241    </target>
     242
     243    <target name="jbigi-linux-only">
     244        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
     245            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
     246        </jar>
     247    </target>
     248
    230249    <!-- the apps need to compile the jsps to poupdate -->
    231250    <target name="poupdate" depends="buildRouter, buildStreaming, buildSystray, buildJetty, buildDesktopGui" >
     
    398417    </target>
    399418
    400     <target name="preppkg" depends="preppkg-linux, preppkg-windows">
     419    <target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
    401420        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    402421        <copy todir="pkg-temp/lib/wrapper/freebsd/">
     
    421440        <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
    422441        <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
     442        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    423443        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
    424444        <copy todir="pkg-temp/lib/wrapper/win32/">
     
    428448
    429449    <!-- only what is needed for debian, etc. -->
    430     <target name="preppkg-linux-only" depends="preppkg-linux">
    431         <!-- rip the non-linux stuff out of jbigi.jar -->
    432         <mkdir dir="tmpextract" />
    433         <unjar src="build/jbigi.jar" dest="tmpextract/" />
    434         <jar destfile="pkg-temp/lib/jbigi.jar" >
    435             <fileset dir="tmpextract/" includes="*linux*" />
    436         </jar>
    437         <delete dir="tmpextract/" />
     450    <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
     451        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    438452    </target>
    439453
     
    848862            <arg value="build/i2ptunnel.jar"/>
    849863            <arg value="build/i2ptunnel.war"/>
    850             <arg value="build/jbigi.jar"/>
    851864            <arg value="build/mstreaming.jar"/>
    852865            <arg value="build/router.jar/"/>
     
    10661079                thus cleaning is required before each build-->
    10671080        <target name="buildSmallOnly" depends="pkg-portable-clean,buildSmall"/>
     1081
    10681082<!-- *1* preparing the jars by OS dependent de-bloating -->
    1069         <target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly">
    1070                 <!-- rip the non-windows stuff out of jbigi.jar -->
    1071                 <mkdir dir="tmpextract" />
    1072                 <unjar src="build/jbigi.jar" dest="tmpextract/" />
    1073                 <jar destfile="build/jbigi.jar" >
    1074                         <fileset dir="tmpextract/" includes="*windows*" />
    1075                 </jar>
    1076                 <delete dir="tmpextract/" />
    1077         </target>
    1078         <target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly">
    1079                 <!-- rip the non-linux stuff out of jbigi.jar -->
    1080                 <mkdir dir="tmpextract" />
    1081                 <unjar src="build/jbigi.jar" dest="tmpextract/" />
    1082                 <jar destfile="build/jbigi.jar" >
    1083                         <fileset dir="tmpextract/" includes="*linux*" />
    1084                 </jar>
    1085                 <delete dir="tmpextract/" />
    1086         </target>
     1083        <target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly, jbigi-windows-only" />
     1084
     1085        <target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly, jbigi-linux-only" />
    10871086
    10881087<!-- *2* os independent procedure  -->
Note: See TracChangeset for help on using the changeset viewer.