Changeset 18119890 for build.xml


Ignore:
Timestamp:
Jan 11, 2011 12:44:36 AM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
08d24b0
Parents:
16509e59
Message:

unbundle jbigi.jar, create at build time

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r16509e59 r18119890  
    179179        <!-- thazzit -->
    180180    </target>
    181     <target name="compile" />
     181
    182182    <target name="jar" depends="jarSmall" >
    183183        <copy file="apps/BOB/dist/BOB.jar" todir="build/" />
     
    187187        <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
    188188        <copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
    189     </target>
    190     <target name="jarSmall" depends="compile" >
     189
     190    </target>
     191    <target name="jarSmall" depends="builddepSmall" >
    191192        <copy file="core/java/build/i2p.jar" todir="build/" />
    192193        <copy file="router/java/build/router.jar" todir="build/" />
     
    196197        <copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
    197198        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
    198         <copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
    199199        <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
    200200    </target>
     201
     202    <target name="jbigi">
     203        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     204            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
     205        </jar>
     206    </target>
     207
     208    <target name="jbigi-windows-only" >
     209        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     210            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
     211        </jar>
     212    </target>
     213
     214    <target name="jbigi-linux-only">
     215        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
     216            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
     217        </jar>
     218    </target>
     219
    201220    <!-- the apps need to compile the jsps to poupdate -->
    202221    <target name="poupdate" depends="buildRouter, buildStreaming, buildSystray, buildJetty" >
     
    362381    </target>
    363382
    364     <target name="preppkg" depends="preppkg-linux, preppkg-windows">
     383    <target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
    365384        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    366385        <copy todir="pkg-temp/lib/wrapper/freebsd/">
     
    392411
    393412    <!-- only what is needed for debian, etc. -->
    394     <target name="preppkg-linux-only" depends="preppkg-linux">
    395         <!-- rip the non-linux stuff out of jbigi.jar -->
    396         <mkdir dir="tmpextract" />
    397         <unjar src="build/jbigi.jar" dest="tmpextract/" />
    398         <jar destfile="pkg-temp/lib/jbigi.jar" >
    399             <fileset dir="tmpextract/" includes="*linux*" />
    400         </jar>
    401         <delete dir="tmpextract/" />
     413    <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
     414        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    402415    </target>
    403416
     
    756769    <target name="findbugs" depends="build2">
    757770        <echo message="Starting findbugs, this will take a while..." />
    758         <exec executable="nice">
     771        <exec executable="nice" failonerror="true">
    759772            <arg value="findbugs"/>
    760773            <arg value="-textui"/>
     
    777790            <arg value="build/i2ptunnel.jar"/>
    778791            <arg value="build/i2ptunnel.war"/>
    779             <arg value="build/jbigi.jar"/>
    780792            <arg value="build/mstreaming.jar"/>
    781793            <arg value="build/router.jar/"/>
     
    10221034                thus cleaning is required before each build-->
    10231035        <target name="buildSmallOnly" depends="pkg-portable-clean,buildSmall"/>
     1036
    10241037<!-- *1* preparing the jars by OS dependent de-bloating -->
    1025         <target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly">
    1026                 <!-- rip the non-windows stuff out of jbigi.jar -->
    1027                 <mkdir dir="tmpextract" />
    1028                 <unjar src="build/jbigi.jar" dest="tmpextract/" />
    1029                 <jar destfile="build/jbigi.jar" >
    1030                         <fileset dir="tmpextract/" includes="*windows*" />
    1031                 </jar>
    1032                 <delete dir="tmpextract/" />
    1033         </target>
    1034         <target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly">
    1035                 <!-- rip the non-linux stuff out of jbigi.jar -->
    1036                 <mkdir dir="tmpextract" />
    1037                 <unjar src="build/jbigi.jar" dest="tmpextract/" />
    1038                 <jar destfile="build/jbigi.jar" >
    1039                         <fileset dir="tmpextract/" includes="*linux*" />
    1040                 </jar>
    1041                 <delete dir="tmpextract/" />
    1042         </target>
     1038        <target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly, jbigi-windows-only" />
     1039
     1040        <target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly, jbigi-linux-only" />
    10431041
    10441042<!-- *2* os independent procedure  -->
Note: See TracChangeset for help on using the changeset viewer.