Changeset 44498ca8 for build.xml


Ignore:
Timestamp:
Dec 31, 2012 6:00:42 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
adfc224
Parents:
a40566e
Message:

installer: extra checks & add to findbugs target

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    ra40566e r44498ca8  
    799799    </target>
    800800
    801     <target name="preppkg-windows" depends="preppkg-base, buildexe">
     801    <target name="preppkg-windows" depends="preppkg-base, buildUtilityJar, buildexe">
    802802        <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
    803803        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
     
    811811        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
    812812        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
     813        <copy file="build/utility.jar" todir="pkg-temp" />
    813814        <copy todir="pkg-temp/lib/wrapper/win32/">
    814815            <fileset dir="installer/lib/wrapper/win32/" excludes="*.txt" />
    815816        </copy>
    816         <copy todir="pkg-temp/lib/wrapper/win64/">
    817             <fileset dir="installer/lib/wrapper/win64/" excludes="*.txt" />
     817        <copy todir="pkg-temp/lib/wrapper/win64/">
     818            <fileset dir="installer/lib/wrapper/win64/" excludes="*.txt" />
    818819        </copy>
    819820    </target>
     
    821822    <target name="preppkg-windows-only" depends="preppkg-windows, jbigi-windows-only">
    822823        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    823         <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
     824        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    824825    </target>
    825826
     
    13501351    </target>
    13511352
    1352     <target name="findbugs" depends="build2">
     1353    <target name="findbugs" depends="build2, buildUtilityJar">
    13531354        <echo message="Starting findbugs, this will take a while..." />
    13541355        <exec executable="nice" failonerror="true">
     
    13641365            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    13651366            <arg value="-sourcepath"/>
    1366             <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/"/>
     1367            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/:installer/java/src"/>
    13671368            <!-- start of the files to be analyzed -->
    13681369            <arg value="build/BOB.jar"/>
     
    13831384            <arg value="build/susimail.war"/>
    13841385            <arg value="build/systray.jar"/>
     1386            <arg value="build/utility.jar"/>
    13851387        </exec>
    13861388        <echo message="Findbugs output stored in i2p.fba" />
Note: See TracChangeset for help on using the changeset viewer.