Changeset dcaa059


Ignore:
Timestamp:
Jun 7, 2009 2:13:01 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
4975d30, 9b0e553
Parents:
1202a303
Message:

Add updaterWithJettyFixesAndGeoIP, use it for pkg for one release

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r1202a303 rdcaa059  
    1919        <echo message="  updaterWithJettyFixes: updater including local jetty patches" />
    2020        <echo message="  updaterWithGeoIP: updater including GeoIP Files" />
     21        <echo message="  updaterWithJettyFixesAndGeoIP" />
    2122        <echo message="  updaterSmall:   updater with the essentials only - no SAM, i2psnark, SusiMail, SusiDNS, news.xml, or history.txt" />
    2223        <echo message="  updaterRouter:  updater with the i2p.jar and router.jar only" />
     
    202203        </delete>
    203204    </target>
    204     <target name="pkg" depends="distclean, updaterWithJettyFixes, tarball, installer" />
     205    <!-- one release only, then back to updaterWithJettyFixes -->
     206    <target name="pkg" depends="distclean, updaterWithJettyFixesAndGeoIP, tarball, installer" />
    205207    <target name="pkgclean" depends="deletepkg-temp">
    206208        <delete>
     
    322324        <delete dir="pkg-temp" />
    323325    </target>
    324     <target name="prepconsoleDocs">
     326    <target name="prepconsoleDocs" depends="prepgeoupdate">
    325327        <copy todir="pkg-temp/docs/" >
    326328          <fileset dir="." includes="readme*.html" />
    327329          <fileset dir="installer/resources/" includes="*-header.ht" />
    328330        </copy>
    329         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    330         <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    331         <copy todir="pkg-temp/docs/icons/flags" >
    332           <fileset dir="installer/resources/icons/flags" />
    333         </copy>
    334331    </target>
    335332    <target name="consoleDocs" depends="deletepkg-temp, prepconsoleDocs">
     
    337334    </target>
    338335    <target name="updater" depends="prepupdate, preplicenses, zipit" />
    339     <target name="updaterWithGeoIP" depends="prepgeoupdate, preplicenses, zipit" />
     336    <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
    340337    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
    341338    <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />
     339    <target name="updaterWithJettyFixesAndGeoIP" depends="prepjupdatefixes, prepgeoupdate, preplicenses, zipit" />
    342340    <target name="updaterSmall" depends="prepupdateSmall, zipit" />
    343341    <target name="updaterRouter" depends="prepupdateRouter, zipit" />
     
    377375        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    378376    </target>
    379     <target name="prepgeoupdate" depends="prepupdate">
     377    <target name="prepgeoupdate">
    380378        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    381379        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
Note: See TracChangeset for help on using the changeset viewer.