Changeset 49118b8 for build.xml


Ignore:
Timestamp:
Sep 9, 2014 7:27:10 PM (6 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
12cc501e
Parents:
18e7e56 (diff), 09dfea7 (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 e606c473eb1e461a477e45419f6295b6430a7353)

to branch 'i2p.i2p.zzz.test2' (head 6212892778308db10a86e58f9f275c838f604973)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r18e7e56 r49118b8  
    961961    </target>
    962962
    963     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates">
     963    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos">
    964964        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    965965        <!-- Also remove deletelist.txt used for updater only -->
     
    10181018        </copy>
    10191019        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
     1020        <copy todir="pkg-temp/docs/icons/flags" >
     1021          <fileset dir="installer/resources/icons/flags" />
     1022        </copy>
    10201023    </target>
    10211024
     
    10501053          <fileset dir="installer/resources/certificates/" />
    10511054        </copy>
     1055    </target>
     1056
     1057    <condition property="no.bundle.routerInfos">
     1058        <isfalse value="${bundle.routerInfos}" />
     1059    </condition>
     1060
     1061    <target name="prepRouterInfos" depends="buildrouter" unless="no.bundle.routerInfos">
     1062        <mkdir dir="pkg-temp/netDb" />
     1063        <java classname="net.i2p.router.networkdb.kademlia.PersistentDataStore" fork="true" failonerror="true">
     1064            <classpath>
     1065                <pathelement location="build/i2p.jar" />
     1066                <pathelement location="build/router.jar" />
     1067            </classpath>
     1068            <arg value="-i" />
     1069            <arg value="${bundle.routerInfos.i2pConfigDir}" />
     1070            <arg value="-o" />
     1071            <arg value="pkg-temp/netDb" />
     1072            <arg value="-c" />
     1073            <arg value="${bundle.routerInfos.count}" />
     1074        </java>
    10521075    </target>
    10531076
     
    12381261        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    12391262        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    1240       <!--
    1241         <copy todir="pkg-temp/docs/icons/flags" >
    1242           <fileset dir="installer/resources/icons/flags" />
    1243         </copy>
    1244        -->
    12451263    </target>
    12461264
Note: See TracChangeset for help on using the changeset viewer.