Changeset e0cd710 for build.xml


Ignore:
Timestamp:
Jun 14, 2013 2:46:08 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
34b7081
Parents:
36e898d (diff), 378c5a0d (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:

propagate from branch 'i2p.i2p' (head 1acb4077a56ccb4079538caa28648e27f0bf5b8b)

to branch 'i2p.i2p.zzz.ipv6' (head f87d396c445dc58e677a56d8ed69544c7f5ecab1)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r36e898d re0cd710  
    11221122        <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
    11231123        <!-- decapitalized the file in 0.7.8 -->
    1124        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
     1124        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
     1125        <!-- small enough to include for now -->
     1126        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    11251127    </target>
    11261128
     
    11381140    <target name="prepgeoupdate">
    11391141        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     1142        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    11401143        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    11411144        <copy todir="pkg-temp/docs/icons/flags" >
     
    12931296
    12941297    <!-- unit tests -->
    1295     <target name="updateTest" depends="prepupdate">
     1298    <target name="buildTest">
    12961299        <ant dir="core/java/" target="jarTest" />
    1297         <copy file="core/java/build/i2ptest.jar" todir="pkg-temp/lib" />
    1298         <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
    1299     </target>
     1300        <ant dir="router/java/" target="jarTest" />
     1301        <copy file="core/java/build/i2ptest.jar" todir="build" />
     1302        <copy file="router/java/build/routertest.jar" todir="build" />
     1303    </target>
     1304    <target name="prepTest" depends="prepupdate, buildTest">
     1305        <!-- overwrite i2p.jar and router.jar with the test versions -->
     1306        <copy file="build/i2ptest.jar" tofile="pkg-temp/lib/i2p.jar" overwrite="true" />
     1307        <copy file="build/routertest.jar" tofile="pkg-temp/lib/router.jar" overwrite="true" />
     1308    </target>
     1309    <target name="updateTest" depends="prepTest, zipit" />
    13001310    <target name="junit.test" depends="buildProperties, jbigi" >
    13011311        <ant dir="core/java/" target="junit.test" />
     
    13041314    <target name="scalatest.test" depends="buildProperties, jbigi" >
    13051315        <ant dir="core/java/" target="scalatest.test" />
     1316        <!-- note there are no router scala tests yet -->
    13061317        <ant dir="router/java/" target="scalatest.test" />
    13071318    </target>
    13081319    <target name="test" depends="buildProperties, jbigi" >
     1320        <!-- both junit and scala -->
    13091321        <ant dir="core/java/" target="test" />
    13101322        <ant dir="router/java/" target="test" />
Note: See TracChangeset for help on using the changeset viewer.