Changeset 01cfb7b for build.xml


Ignore:
Timestamp:
Nov 20, 2016 6:07:00 AM (3 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
11579b9
Parents:
81bbf55 (diff), e744793 (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:

merge of '348832602d6528cc162d427742d0910df3db76ef'

and 'd51aa134c2f1b0fe533f79663f1e79dade41bde1'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r81bbf55 r01cfb7b  
    959959        <delete file="${sloccount.report.file}" />
    960960        <delete file="mavencentral-i2p.jar" />
     961        <delete file="mavencentral-router.jar" />
    961962        <delete file="mavencentral-mstreaming.jar" />
    962963        <delete file="mavencentral-streaming.jar" />
     
    20022003    </target>
    20032004
    2004     <target name="mavenCentral.deps" depends="buildStreaming">
     2005    <target name="mavenCentral.deps" depends="buildRouter, buildStreaming">
    20052006        <ant dir="core/java/" target="javadocJar" />
    20062007        <ant dir="core/java/" target="sourcesJar" />
     2008        <ant dir="router/java/" target="javadocJar" />
     2009        <ant dir="router/java/" target="sourcesJar" />
    20072010        <ant dir="apps/ministreaming/java/" target="javadocJar" />
    20082011        <ant dir="apps/ministreaming/java/" target="sourcesJar" />
     
    20152018        <!-- Libraries -->
    20162019        <copy file="build/i2p.jar" tofile="pkg-mavencentral/i2p-${release.number}.jar" />
     2020        <copy file="build/router.jar" tofile="pkg-mavencentral/router-${release.number}.jar" />
    20172021        <copy file="build/mstreaming.jar" tofile="pkg-mavencentral/mstreaming-${release.number}.jar" />
    20182022        <copy file="build/streaming.jar" tofile="pkg-mavencentral/streaming-${release.number}.jar" />
    20192023        <!-- JavaDocs -->
    20202024        <copy file="core/java/build/i2p-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
     2025        <copy file="router/java/build/router-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
    20212026        <copy file="apps/ministreaming/java/build/mstreaming-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
    20222027        <copy file="apps/streaming/java/build/streaming-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
    20232028        <!-- Sources -->
    20242029        <copy file="core/java/build/i2p-${release.number}-sources.jar" todir="pkg-mavencentral/" />
     2030        <copy file="router/java/build/router-${release.number}-sources.jar" todir="pkg-mavencentral/" />
    20252031        <copy file="apps/ministreaming/java/build/mstreaming-${release.number}-sources.jar" todir="pkg-mavencentral/" />
    20262032        <copy file="apps/streaming/java/build/streaming-${release.number}-sources.jar" todir="pkg-mavencentral/" />
     
    20362042                 developerConnection="scm:git:git@github.com:i2p/i2p.i2p.git"
    20372043                 url="git@github.com:i2p/i2p.i2p.git" />
     2044        </artifact:pom>
     2045        <artifact:pom id="routerpom" groupId="net.i2p" artifactId="router" version="${release.number}"
     2046                name="I2P Router"
     2047                description="The I2P router"
     2048                url="https://geti2p.net/">
     2049            <license name="Public Domain" url="http://en.wikipedia.org/wiki/Public_domain" />
     2050            <developer name="zzz" organization="I2P" organizationUrl="https://geti2p.net/" />
     2051            <developer name="str4d" email="str4d@i2pmail.org" organization="I2P" organizationUrl="https://geti2p.net/"/>
     2052            <scm connection="scm:git:git@github.com:i2p/i2p.i2p.git"
     2053                 developerConnection="scm:git:git@github.com:i2p/i2p.i2p.git"
     2054                 url="git@github.com:i2p/i2p.i2p.git" />
     2055            <dependency groupId="net.i2p" artifactId="i2p" version="${release.number}" />
    20382056        </artifact:pom>
    20392057        <artifact:pom id="mstreamingpom" groupId="net.i2p.client" artifactId="mstreaming" version="${release.number}"
     
    20632081        </artifact:pom>
    20642082        <artifact:writepom pomRefId="i2ppom" file="pkg-mavencentral/i2p-${release.number}.pom"/>
     2083        <artifact:writepom pomRefId="routerpom" file="pkg-mavencentral/router-${release.number}.pom"/>
    20652084        <artifact:writepom pomRefId="mstreamingpom" file="pkg-mavencentral/mstreaming-${release.number}.pom" />
    20662085        <artifact:writepom pomRefId="streamingpom" file="pkg-mavencentral/streaming-${release.number}.pom" />
     
    20782097        <gpgsignasc file="pkg-mavencentral/i2p-${release.number}-javadoc.jar" />
    20792098        <gpgsignasc file="pkg-mavencentral/i2p-${release.number}-sources.jar" />
     2099        <gpgsignasc file="pkg-mavencentral/router-${release.number}.jar" />
     2100        <gpgsignasc file="pkg-mavencentral/router-${release.number}.pom" />
     2101        <gpgsignasc file="pkg-mavencentral/router-${release.number}-javadoc.jar" />
     2102        <gpgsignasc file="pkg-mavencentral/router-${release.number}-sources.jar" />
    20802103        <gpgsignasc file="pkg-mavencentral/mstreaming-${release.number}.jar" />
    20812104        <gpgsignasc file="pkg-mavencentral/mstreaming-${release.number}.pom" />
     
    20902113            <fileset dir="./pkg-mavencentral">
    20912114                <include name="i2p-*" />
     2115            </fileset>
     2116        </jar>
     2117        <jar destfile="mavencentral-router.jar">
     2118            <fileset dir="./pkg-mavencentral">
     2119                <include name="router-*" />
    20922120            </fileset>
    20932121        </jar>
Note: See TracChangeset for help on using the changeset viewer.