Changeset 06a3417 for build.xml


Ignore:
Timestamp:
Jun 5, 2009 12:59:44 AM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
1538ba0c
Parents:
8ff2724
Message:

Add some licenses for launch4j includes, clean up build.xml some more

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r8ff2724 r06a3417  
    203203    </target>
    204204    <target name="pkg" depends="distclean, updaterWithJettyFixes, tarball, installer" />
    205     <target name="pkgclean">
    206         <delete dir="pkg-temp" />
     205    <target name="pkgclean" depends="deletepkg-temp">
    207206        <delete>
    208207            <fileset dir="." includes="i2p.tar.bz2 install.jar i2pupdate.zip" />
    209208        </delete>
    210209    </target>
    211     <target name="preppkg" depends="build, buildexe">
    212         <delete dir="pkg-temp" />
     210    <target name="preppkg" depends="build, buildexe, preplicenses, prepconsoleDocs">
    213211        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    214212        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
     
    285283        <copy file="core/perl/i2pbench.sh" todir="pkg-temp/scripts/" />
    286284        <copy file="core/perl/i2ptest.sh" todir="pkg-temp/scripts/" />
    287         <mkdir dir="pkg-temp/docs" />
    288         <copy todir="pkg-temp/docs/" >
    289           <fileset dir="." includes="readme*.html" />
    290         </copy>
    291285        <!-- polecat: please put your modified toolbar.html in installer/resources/toolbar.html
    292286             and uncomment the following -->
     
    297291        <copy file="installer/resources/console.ico" todir="pkg-temp/docs/" />
    298292        <copy file="installer/resources/uninstall.ico" todir="pkg-temp/docs/" />
    299         <copy file="installer/resources/dnf-header.ht" todir="pkg-temp/docs/" />
    300         <copy file="installer/resources/dnfp-header.ht" todir="pkg-temp/docs/" />
    301         <copy file="installer/resources/dnfb-header.ht" todir="pkg-temp/docs/" />
    302         <copy file="installer/resources/dnfh-header.ht" todir="pkg-temp/docs/" />
    303         <copy file="installer/resources/ahelper-conflict-header.ht" todir="pkg-temp/docs/" />
    304293        <mkdir dir="pkg-temp/docs/themes/" />
    305294        <copy todir="pkg-temp/docs/themes/" >
     
    314303        <copy file="installer/resources/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
    315304        <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
     305    </target>
     306    <target name="preplicenses">
    316307        <copy file="LICENSE.txt" todir="pkg-temp/" />
    317         <mkdir dir="pkg-temp/licenses/" />
    318308        <copy todir="pkg-temp/licenses/" >
    319309          <fileset dir="licenses/" />
     310        </copy>
     311        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     312        <copy file="installer/lib/launch4j/lib/JGoodies.Forms.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Forms.txt" />
     313        <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
     314        <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
     315    </target>
     316    <target name="tarball" depends="preppkg">
     317        <tar compression="bzip2" destfile="i2p.tar.bz2">
     318            <tarfileset dir="pkg-temp" includes="**/*" prefix="i2p" />
     319        </tar>
     320    </target>
     321    <target name="deletepkg-temp">
     322        <delete dir="pkg-temp" />
     323    </target>
     324    <target name="prepconsoleDocs">
     325        <copy todir="pkg-temp/docs/" >
     326          <fileset dir="." includes="readme*.html" />
     327          <fileset dir="installer/resources/" includes="*-header.ht" />
    320328        </copy>
    321329        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     
    325333        </copy>
    326334    </target>
    327     <target name="tarball" depends="preppkg">
    328         <tar compression="bzip2" destfile="i2p.tar.bz2">
    329             <tarfileset dir="pkg-temp" includes="**/*" prefix="i2p" />
    330         </tar>
    331     </target>
    332     <target name="consoleDocs">
    333         <delete dir="pkg-temp" />
    334         <copy todir="pkg-temp/docs/" >
    335           <fileset dir="." includes="readme*.html" />
    336           <fileset dir="installer/resources/" includes="*-header.ht" />
    337         </copy>
    338         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    339         <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    340         <copy todir="pkg-temp/docs/icons/flags" >
    341           <fileset dir="installer/resources/icons/flags" />
    342         </copy>
    343         <zip destfile="docs.zip" basedir="pkg-temp" />
    344     </target>
    345     <target name="updater" depends="prepupdate, zipit" />
    346     <target name="updaterWithGeoIP" depends="prepgeoupdate, zipit" />
    347     <target name="updaterWithJetty" depends="prepjupdate, zipit" />
    348     <target name="updaterWithJettyFixes" depends="prepjupdatefixes, zipit" />
     335    <target name="consoleDocs" depends="deletepkg-temp, prepconsoleDocs">
     336        <zip destfile="docs.zip" basedir="pkg-temp" whenempty="fail" />
     337    </target>
     338    <target name="updater" depends="prepupdate, preplicenses, zipit" />
     339    <target name="updaterWithGeoIP" depends="prepgeoupdate, preplicenses, zipit" />
     340    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
     341    <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />
    349342    <target name="updaterSmall" depends="prepupdateSmall, zipit" />
    350343    <target name="updaterRouter" depends="prepupdateRouter, zipit" />
    351344    <target name="zipit">
    352         <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
     345        <zip destfile="i2pupdate.zip" basedir="pkg-temp" whenempty="fail" />
    353346    </target>
    354347    <target name="updateTest" depends="prepupdate">
     
    367360        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    368361        <copy file="history.txt" todir="pkg-temp/" />
    369         <mkdir dir="pkg-temp/docs/" />
    370362        <copy file="news.xml" todir="pkg-temp/docs/" />
    371         <copy file="LICENSE.txt" todir="pkg-temp/" />
    372         <mkdir dir="pkg-temp/licenses/" />
    373         <copy todir="pkg-temp/licenses/" >
    374           <fileset dir="licenses/" />
    375         </copy>
    376     </target>
    377     <target name="prepupdateSmall" depends="buildSmall">
    378         <delete dir="pkg-temp" />
    379         <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
     363    </target>
     364    <target name="prepupdateSmall" depends="buildSmall, prepupdateRouter">
    380365        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    381366        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    382367        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    383         <copy file="build/router.jar" todir="pkg-temp/lib/" />
    384368        <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
    385369        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
     
    387371        <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
    388372        <!-- New readme_*.html files - For one release only -->
    389         <mkdir dir="pkg-temp/docs" />
    390373        <copy file="readme_zh.html" todir="pkg-temp/docs/" />
    391374    </target>
    392     <target name="prepupdateRouter" depends="buildrouter">
    393         <delete dir="pkg-temp" />
     375    <target name="prepupdateRouter" depends="buildrouter, deletepkg-temp">
    394376        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    395377        <copy file="build/router.jar" todir="pkg-temp/lib/" />
Note: See TracChangeset for help on using the changeset viewer.