Changeset 2f1d9375


Ignore:
Timestamp:
Apr 7, 2009 1:49:12 PM (11 years ago)
Author:
mathiasdm <mathiasdm@…>
Branches:
master
Children:
0764e19
Parents:
91de396 (diff), f9efabb (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:

merge of '4e3d0e106395f9bbb24c33d6a980c707831ad40e'

and '578c30cf4a84f25eb899ab6d4278207bddeba259'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r91de396 r2f1d9375  
    3838        <ant dir="apps/susidns/src" target="all" />
    3939        <ant dir="apps/i2psnark/java/" target="war" />
    40         <ant dir="apps/desktopgui/" target="jar" />
    4140    </target>
    4241    <target name="builddepSmall">
     
    106105    <target name="jar" depends="jarSmall" >
    107106        <copy file="apps/BOB/dist/BOB.jar" todir="build/" />
    108         <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
    109107        <copy file="apps/sam/java/build/sam.jar" todir="build/" />
    110108        <copy file="apps/susimail/susimail.war" todir="build/" />
     
    217215        <copy file="build/sam.jar" todir="pkg-temp/lib/" />
    218216        <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
    219         <copy file="apps/desktopgui/dist/desktopgui.jar" todir="pkg-temp/lib/" />
    220         <copy file="apps/desktopgui/lib/swing-worker.jar" todir="pkg-temp/lib/" />
    221         <copy file="apps/desktopgui/lib/appframework.jar" todir="pkg-temp/lib/" />
    222         <mkdir dir="pkg-temp/desktopgui/resources/" />
    223         <copy todir="pkg-temp/desktopgui/resources/" >
    224           <fileset dir="apps/desktopgui/desktopgui/resources/" />
    225         </copy>
    226217        <copy file="build/systray.jar" todir="pkg-temp/lib" />
    227218        <!-- <copy file="build/sucker.jar" todir="pkg-temp/lib" /> -->
Note: See TracChangeset for help on using the changeset viewer.