Changeset 47beb82 for build.xml


Ignore:
Timestamp:
Jan 11, 2019 1:51:41 PM (15 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
24fd4881
Parents:
d4caafb5 (diff), 17228de (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 ff155397f79c33f8f6767c2c120e57cb7dd30d88)

to branch 'i2p.i2p.zzz.i2pcontrol' (head 9e68613e29f1a3bd5a4e2b3d8c5637b48f499e5e)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rd4caafb5 r47beb82  
    394394    </target>
    395395
    396     <target name="buildDesktopGui" depends="buildCore, buildrouter" >
    397 <!--
    398         <ant dir="apps/desktopgui" target="clean" />
    399 -->
     396    <target name="buildDesktopGui" depends="buildCore, buildrouter, buildSystray" >
    400397        <ant dir="apps/desktopgui" target="jar" />
    401398        <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
     
    831828            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    832829            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    833             <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:org.json.simple:org.json.simple.*" />
     830            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:org.json.simple:org.json.simple.*:com.southernstorm.noise.crypto.x25519" />
    834831            <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
    835832            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.*:com.southernstorm.noise.*" />
    836             <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.web.*:net.i2p.router.update:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" />
     833            <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.web.*:net.i2p.router.update:net.i2p.router.sybil:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" />
    837834            <!-- apps and bridges starting here, alphabetical please -->
    838835            <group title="Addressbook Application" packages="net.i2p.addressbook:net.i2p.router.naming:net.metanotion:net.metanotion.*" />
     
    13341331        <copy file="installer/resources/clients.config" todir="pkg-temp/" />
    13351332        <copy file="installer/resources/i2ptunnel.config" todir="pkg-temp/" />
    1336         <copy file="installer/resources/systray.config" todir="pkg-temp/" />
    13371333        <copy file="installer/resources/wrapper.config" todir="pkg-temp/" />
    13381334        <copy file="installer/resources/hosts.txt" todir="pkg-temp/" />
     
    14511447
    14521448    <!-- SSL Certs -->
    1453     <target name="prepCertificates">
     1449    <target name="prepCertificates" depends="buildCore">
    14541450        <copy todir="pkg-temp/certificates/" >
    14551451          <fileset dir="installer/resources/certificates/" />
    14561452        </copy>
     1453        <java classname="net.i2p.crypto.CertUtil" fork="true" failonerror="true">
     1454            <classpath>
     1455                <pathelement location="build/i2p.jar" />
     1456            </classpath>
     1457            <arg value="checkall" />
     1458            <arg value="pkg-temp/certificates" />
     1459        </java>
    14571460    </target>
    14581461
Note: See TracChangeset for help on using the changeset viewer.