Changeset 01cfb7b

Timestamp:

Nov 20, 2016 6:07:00 AM (4 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'

Files:

• build.xml (modified) (7 diffs)
• router/java/build.xml (modified) (1 diff)

build.xml

@@ -959 +959 @@
         <delete file="${sloccount.report.file}" />
         <delete file="mavencentral-i2p.jar" />
+        <delete file="mavencentral-router.jar" />
         <delete file="mavencentral-mstreaming.jar" />
         <delete file="mavencentral-streaming.jar" />
@@ -2002 +2003 @@
     </target>
 
-    <target name="mavenCentral.deps" depends="buildStreaming">
+    <target name="mavenCentral.deps" depends="buildRouter, buildStreaming">
         <ant dir="core/java/" target="javadocJar" />
         <ant dir="core/java/" target="sourcesJar" />
+        <ant dir="router/java/" target="javadocJar" />
+        <ant dir="router/java/" target="sourcesJar" />
         <ant dir="apps/ministreaming/java/" target="javadocJar" />
         <ant dir="apps/ministreaming/java/" target="sourcesJar" />
@@ -2015 +2018 @@
         <!-- Libraries -->
         <copy file="build/i2p.jar" tofile="pkg-mavencentral/i2p-${release.number}.jar" />
+        <copy file="build/router.jar" tofile="pkg-mavencentral/router-${release.number}.jar" />
         <copy file="build/mstreaming.jar" tofile="pkg-mavencentral/mstreaming-${release.number}.jar" />
         <copy file="build/streaming.jar" tofile="pkg-mavencentral/streaming-${release.number}.jar" />
         <!-- JavaDocs -->
         <copy file="core/java/build/i2p-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
+        <copy file="router/java/build/router-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
         <copy file="apps/ministreaming/java/build/mstreaming-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
         <copy file="apps/streaming/java/build/streaming-${release.number}-javadoc.jar" todir="pkg-mavencentral/" />
         <!-- Sources -->
         <copy file="core/java/build/i2p-${release.number}-sources.jar" todir="pkg-mavencentral/" />
+        <copy file="router/java/build/router-${release.number}-sources.jar" todir="pkg-mavencentral/" />
         <copy file="apps/ministreaming/java/build/mstreaming-${release.number}-sources.jar" todir="pkg-mavencentral/" />
         <copy file="apps/streaming/java/build/streaming-${release.number}-sources.jar" todir="pkg-mavencentral/" />
@@ -2036 +2042 @@
                  developerConnection="scm:git:git@github.com:i2p/i2p.i2p.git"
                  url="git@github.com:i2p/i2p.i2p.git" />
+        </artifact:pom>
+        <artifact:pom id="routerpom" groupId="net.i2p" artifactId="router" version="${release.number}"
+                name="I2P Router"
+                description="The I2P router"
+                url="https://geti2p.net/">
+            <license name="Public Domain" url="http://en.wikipedia.org/wiki/Public_domain" />
+            <developer name="zzz" organization="I2P" organizationUrl="https://geti2p.net/" />
+            <developer name="str4d" email="str4d@i2pmail.org" organization="I2P" organizationUrl="https://geti2p.net/"/>
+            <scm connection="scm:git:git@github.com:i2p/i2p.i2p.git"
+                 developerConnection="scm:git:git@github.com:i2p/i2p.i2p.git"
+                 url="git@github.com:i2p/i2p.i2p.git" />
+            <dependency groupId="net.i2p" artifactId="i2p" version="${release.number}" />
         </artifact:pom>
         <artifact:pom id="mstreamingpom" groupId="net.i2p.client" artifactId="mstreaming" version="${release.number}"
@@ -2063 +2081 @@
         </artifact:pom>
         <artifact:writepom pomRefId="i2ppom" file="pkg-mavencentral/i2p-${release.number}.pom"/>
+        <artifact:writepom pomRefId="routerpom" file="pkg-mavencentral/router-${release.number}.pom"/>
         <artifact:writepom pomRefId="mstreamingpom" file="pkg-mavencentral/mstreaming-${release.number}.pom" />
         <artifact:writepom pomRefId="streamingpom" file="pkg-mavencentral/streaming-${release.number}.pom" />
@@ -2078 +2097 @@
         <gpgsignasc file="pkg-mavencentral/i2p-${release.number}-javadoc.jar" />
         <gpgsignasc file="pkg-mavencentral/i2p-${release.number}-sources.jar" />
+        <gpgsignasc file="pkg-mavencentral/router-${release.number}.jar" />
+        <gpgsignasc file="pkg-mavencentral/router-${release.number}.pom" />
+        <gpgsignasc file="pkg-mavencentral/router-${release.number}-javadoc.jar" />
+        <gpgsignasc file="pkg-mavencentral/router-${release.number}-sources.jar" />
         <gpgsignasc file="pkg-mavencentral/mstreaming-${release.number}.jar" />
         <gpgsignasc file="pkg-mavencentral/mstreaming-${release.number}.pom" />
@@ -2090 +2113 @@
             <fileset dir="./pkg-mavencentral">
                 <include name="i2p-*" />
+            </fileset>
+        </jar>
+        <jar destfile="mavencentral-router.jar">
+            <fileset dir="./pkg-mavencentral">
+                <include name="router-*" />
             </fileset>
         </jar>

router/java/build.xml

@@ -100 +100 @@
     </target>
 
+    <!-- for Maven Central -->
+    <target name="javadocJar" depends="javadoc">
+        <jar jarfile="./build/router-${release.number}-javadoc.jar">
+            <fileset dir="./build/javadoc" />
+        </jar>
+    </target>
+    <target name="sourcesJar">
+        <jar jarfile="./build/router-${release.number}-sources.jar">
+            <fileset dir="./src" />
+        </jar>
+    </target>
+
     <!-- scala paths -->
     <target name="scala.init">