Changeset 4802b1e2 for build.xml


Ignore:
Timestamp:
Aug 10, 2013 5:06:17 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f2857e8f
Parents:
0328304 (diff), 05396102 (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.0971' (head 6cb629b61e0177deda1e539b2f85a2473f3af7fb)

to branch 'i2p.i2p' (head 8e86ef70afbbbbdc2db06cec34f17dedd528c7e7)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r0328304 r4802b1e2  
    433433        <echo message="Setting environment variable LG2 to a lang code (eg: de,zh,nl etc)" />
    434434        <echo message=" will restrict language update to the language you specified, leaving other language untact." />
    435         <ant dir="apps/routerconsole/java/" target="poupdate" />
     435        <ant dir="apps/routerconsole/java/" >
     436            <target name="poupdate" />
     437            <target name="poupdate-news" />
     438        </ant>
    436439        <ant dir="apps/i2psnark/java/" target="poupdate" />
    437         <ant dir="apps/i2ptunnel/java/" target="poupdate" />
     440        <ant dir="apps/i2ptunnel/java/" >
     441            <target name="poupdate" />
     442            <target name="poupdate-proxy" />
     443        </ant>
    438444        <ant dir="apps/susidns/src/" target="poupdate" />
    439445        <ant dir="apps/susimail/" target="poupdate" />
     
    11221128        <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
    11231129        <!-- decapitalized the file in 0.7.8 -->
    1124        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
     1130        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
     1131        <!-- small enough to include for now -->
     1132        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    11251133    </target>
    11261134
     
    11381146    <target name="prepgeoupdate">
    11391147        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     1148        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    11401149        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    11411150        <copy todir="pkg-temp/docs/icons/flags" >
     
    12931302
    12941303    <!-- unit tests -->
    1295     <target name="updateTest" depends="prepupdate">
     1304    <target name="buildTest">
    12961305        <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>
     1306        <ant dir="router/java/" target="jarTest" />
     1307        <copy file="core/java/build/i2ptest.jar" todir="build" />
     1308        <copy file="router/java/build/routertest.jar" todir="build" />
     1309    </target>
     1310    <target name="prepTest" depends="prepupdate, buildTest">
     1311        <!-- overwrite i2p.jar and router.jar with the test versions -->
     1312        <copy file="build/i2ptest.jar" tofile="pkg-temp/lib/i2p.jar" overwrite="true" />
     1313        <copy file="build/routertest.jar" tofile="pkg-temp/lib/router.jar" overwrite="true" />
     1314    </target>
     1315    <target name="updateTest" depends="prepTest, zipit" />
    13001316    <target name="junit.test" depends="buildProperties, jbigi" >
    13011317        <ant dir="core/java/" target="junit.test" />
     
    13051321    <target name="scalatest.test" depends="buildProperties, jbigi" >
    13061322        <ant dir="core/java/" target="scalatest.test" />
     1323        <!-- note there are no router scala tests yet -->
    13071324        <ant dir="router/java/" target="scalatest.test" />
    13081325    </target>
    13091326    <target name="test" depends="buildProperties, jbigi" >
     1327        <!-- both junit and scala -->
    13101328        <ant dir="core/java/" target="test" />
    13111329        <ant dir="router/java/" target="test" />
Note: See TracChangeset for help on using the changeset viewer.