Changeset 6cc39a2


Ignore:
Timestamp:
Apr 7, 2019 6:09:04 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
6aeb89c
Parents:
cca68f9
Message:

Build: Fix up javadoc targets in sub-build.xml files for maven central

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • apps/jetty/build.xml

    rcca68f9 r6cc39a2  
    529529        </jar>
    530530    </target>   
     531
    531532    <target name="servletJavadoc">
    532533        <mkdir dir="./build" />
    533534        <mkdir dir="./build/servlet-i2p-javadoc" />
    534         <javadoc
    535             sourcepath="./java/src:../../core/java/src" destdir="./build/servlet-i2p-javadoc"
    536             packagenames="net.i2p.servlet.filters.*"
     535        <javadoc access="package"
     536            source="${javac.version}"
     537            destdir="./build/servlet-i2p-javadoc"
     538            packagenames="*"
    537539            use="true"
    538540            splitindex="true"
    539             windowtitle="I2P Servlet classes" />
    540     </target>
     541            failonerror="true"
     542            additionalparam="-notimestamp"
     543            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
     544            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
     545            <group title="Jetty Utilities" packages="*" />
     546            <sourcepath>
     547                <pathelement location="./java/src" />
     548            </sourcepath>
     549            <classpath>
     550                <pathelement location="../../core/java/build/i2p.jar" />
     551                <pathelement location="./jettylib/org.mortbay.jetty.jar" />
     552                <pathelement location="./jettylib/javax.servlet.jar" />
     553                <pathelement location="./jettylib/jetty-http.jar" />
     554                <pathelement location="./jettylib/jetty-io.jar" />
     555                <pathelement location="./jettylib/jetty-security.jar" />
     556                <pathelement location="./jettylib/jetty-servlet.jar" />
     557                <pathelement location="./jettylib/jetty-util.jar" />
     558                <pathelement location="./jettylib/jetty-xml.jar" />
     559                <!-- following are only for debian builds -->
     560                <pathelement location="../../core/java/build/libintl.jar" />
     561                <pathelement location="../../core/java/build/gnu-getopt.jar" />
     562                <pathelement location="../../core/java/build/json-simple.jar" />
     563            </classpath>
     564            <!-- These variables are stored in build.properties.
     565                  End-users can override by creating the file override.properties -->
     566            <link offline="true" href="${javasedocs.url}" packagelistLoc="../../installer/resources/package-lists/java/" />
     567            <link offline="true" href="${javaeedocs.url}" packagelistLoc="../../installer/resources/package-lists/javaee/" />
     568            <link offline="true" href="${jettydocs.url}" packagelistLoc="../../installer/resources/package-lists/jetty/" />
     569            <link offline="true" href="${wrapperdocs.url}" packagelistLoc="../../installer/resources/package-lists/wrapper/" />
     570        </javadoc>
     571    </target>
     572
    541573    <target name="servletJavadocJar" depends="servletJavadoc">
    542574        <jar jarfile="./build/servlet-i2p-${release.number}-javadoc.jar">
    … …  
    544576        </jar>
    545577    </target>
     578
    546579    <target name="servletSourcesJar">
    547580        <jar jarfile="./build/servlet-i2p-${release.number}-sources.jar">

  • apps/ministreaming/java/build.xml

    rcca68f9 r6cc39a2  
    152152        <mkdir dir="./build" />
    153153        <mkdir dir="./build/javadoc" />
    154         <javadoc
    155             sourcepath="./src:../../../core/java/src:../../../core/java/test" destdir="./build/javadoc"
    156             packagenames="*"
    157             use="true"
    158             splitindex="true"
    159             windowtitle="I2P ministreaming library" />
     154        <javadoc access="package"
     155            source="${javac.version}"
     156            destdir="./build/javadoc"
     157            packagenames="*"
     158            use="true"
     159            splitindex="true"
     160            failonerror="true"
     161            additionalparam="-notimestamp"
     162            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
     163            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
     164            <group title="Streaming Library API" packages="*" />
     165            <sourcepath>
     166                <pathelement location="./src" />
     167            </sourcepath>
     168            <classpath>
     169                <pathelement location="../../../core/java/build/i2p.jar" />
     170                <!-- following are only for debian builds -->
     171                <pathelement location="../../../core/java/build/libintl.jar" />
     172                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
     173            </classpath>
     174            <!-- These variables are stored in build.properties.
     175                  End-users can override by creating the file override.properties -->
     176            <link offline="true" href="${javasedocs.url}" packagelistLoc="../../../installer/resources/package-lists/java/" />
     177            <link offline="true" href="${javaeedocs.url}" packagelistLoc="../../../installer/resources/package-lists/javaee/" />
     178            <link offline="true" href="${jettydocs.url}" packagelistLoc="../../../installer/resources/package-lists/jetty/" />
     179            <link offline="true" href="${wrapperdocs.url}" packagelistLoc="../../../installer/resources/package-lists/wrapper/" />
     180        </javadoc>
    160181    </target>
    161182

  • apps/streaming/java/build.xml

    rcca68f9 r6cc39a2  
    238238        <jar destfile="./build/streaming.jar" basedir="./build/obj" includes="**/*Test*.class" update="true" />
    239239    </target>
     240
    240241    <target name="javadoc">
    241242        <mkdir dir="./build" />
    242243        <mkdir dir="./build/javadoc" />
    243         <javadoc
    244             sourcepath="./src:../../../core/java/src:../../ministreaming/java/src" destdir="./build/javadoc"
     244        <javadoc access="package"
     245            source="${javac.version}"
     246            destdir="./build/javadoc"
    245247            packagenames="*"
    246248            use="true"
    247249            splitindex="true"
    248             windowtitle="Streaming" />
     250            failonerror="true"
     251            additionalparam="-notimestamp"
     252            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
     253            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
     254            <group title="Streaming Library Implementation" packages="*" />
     255            <sourcepath>
     256                <pathelement location="./src" />
     257            </sourcepath>
     258            <classpath>
     259                <pathelement location="../../../core/java/build/i2p.jar" />
     260                <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
     261                <!-- following are only for debian builds -->
     262                <pathelement location="../../../core/java/build/libintl.jar" />
     263                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
     264            </classpath>
     265            <!-- These variables are stored in build.properties.
     266                  End-users can override by creating the file override.properties -->
     267            <link offline="true" href="${javasedocs.url}" packagelistLoc="../../../installer/resources/package-lists/java/" />
     268            <link offline="true" href="${javaeedocs.url}" packagelistLoc="../../../installer/resources/package-lists/javaee/" />
     269            <link offline="true" href="${jettydocs.url}" packagelistLoc="../../../installer/resources/package-lists/jetty/" />
     270            <link offline="true" href="${wrapperdocs.url}" packagelistLoc="../../../installer/resources/package-lists/wrapper/" />
     271        </javadoc>
    249272    </target>
    250273
    … …  
    255278        </jar>
    256279    </target>
     280
    257281    <target name="sourcesJar">
    258282        <jar jarfile="./build/streaming-${release.number}-sources.jar">

  • build.xml

    rcca68f9 r6cc39a2  
    19261926
    19271927    <!-- unit tests -->
    1928     <target name="buildTest">
     1928    <target name="buildCoreTest">
    19291929        <ant dir="core/java/" target="jarTest" />
     1930    </target>
     1931    <target name="buildRouterTest" depends="buildCoreTest">
    19301932        <ant dir="router/java/" target="jarTest" />
     1933    </target>
     1934    <target name="buildTest" depends="buildRouterTest">
    19311935        <copy file="core/java/build/i2ptest.jar" todir="build" />
    19321936        <copy file="router/java/build/routertest.jar" todir="build" />
    … …  
    22092213    </target>
    22102214
    2211     <target name="mavenCentral.deps" depends="buildRouter, buildStreaming">
     2215    <!-- depends on buildCoreTest so that the router unit test javadocs can find the core unit test classes -->
     2216    <target name="mavenCentral.deps" depends="buildRouter, buildStreaming, buildCoreTest">
    22122217        <ant dir="core/java/">
    22132218            <target name="javadocJar" />
    … …  
    22532258        <copy file="apps/streaming/java/build/streaming-${release.number}-sources.jar" todir="pkg-mavencentral/" />
    22542259        <copy file="apps/jetty/build/servlet-i2p-${release.number}-sources.jar" todir="pkg-mavencentral/" />
     2260        <echo message="This requires the Maven Ant Tasks to be installed." />
     2261        <echo message="If this fails, on Debian jessie or, Ubuntu trusty/xenial:" />
     2262        <echo message="sudo apt-get install libmaven-ant-tasks-java" />
     2263        <echo message="Sorry, not available on more recent distributions" />
    22552264        <!-- POMs -->
    22562265        <artifact:pom id="i2ppom" groupId="net.i2p" artifactId="i2p" version="${release.number}"

  • core/java/build.xml

    rcca68f9 r6cc39a2  
    136136        <mkdir dir="./build" />
    137137        <mkdir dir="./build/javadoc" />
    138         <javadoc sourcepath="./src:./test/junit" destdir="./build/javadoc" packagenames="*" use="true" splitindex="true" windowtitle="I2P SDK" />
     138        <javadoc access="package"
     139            source="${javac.version}"
     140            destdir="./build/javadoc"
     141            packagenames="*"
     142            use="true"
     143            splitindex="true"
     144            failonerror="true"
     145            additionalparam="-notimestamp"
     146            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
     147            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
     148            <group title="Core SDK (i2p.jar)" packages="*" />
     149            <sourcepath>
     150                <pathelement location="./src" />
     151                <pathelement location="./test/junit" />
     152            </sourcepath>
     153            <classpath>
     154                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
     155                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
     156                <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
     157                <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
     158                <pathelement location="${junit.home}/junit4.jar" />
     159                <!-- following are only for debian builds -->
     160                <pathelement location="build/libintl.jar" />
     161                <pathelement location="build/gnu-getopt.jar" />
     162                <pathelement location="build/json-simple.jar" />
     163            </classpath>
     164            <!-- These variables are stored in build.properties.
     165                  End-users can override by creating the file override.properties -->
     166            <link offline="true" href="${javasedocs.url}" packagelistLoc="../../installer/resources/package-lists/java/" />
     167            <link offline="true" href="${javaeedocs.url}" packagelistLoc="../../installer/resources/package-lists/javaee/" />
     168            <link offline="true" href="${jettydocs.url}" packagelistLoc="../../installer/resources/package-lists/jetty/" />
     169            <link offline="true" href="${wrapperdocs.url}" packagelistLoc="../../installer/resources/package-lists/wrapper/" />
     170        </javadoc>
    139171    </target>
    140172

  • core/java/src/net/i2p/client/package.html

    rcca68f9 r6cc39a2  
    2828<li>{@link net.i2p.client.naming} - for applications that want to resolve
    2929    readable names into {@link net.i2p.data.Destination}s</li>
    30 <li>{@link net.i2p.client.streaming} - for applications that want to use
     30<li>net.i2p.client.streaming - for applications that want to use
    3131    a streaming API to provide reliable in order message delivery (<b>note</b>:
    3232    the streaming library is packaged seperate from the main SDK - in the

  • router/java/build.xml

    rcca68f9 r6cc39a2  
    9595        <mkdir dir="./build" />
    9696        <mkdir dir="./build/javadoc" />
    97         <javadoc
    98             sourcepath="./src:./test/junit:../../core/java/src:../../core/java/test/junit" destdir="./build/javadoc"
    99             packagenames="*"
    100             use="true"
    101             splitindex="true"
    102             windowtitle="I2P Router" />
     97        <javadoc access="package"
     98            source="${javac.version}"
     99            destdir="./build/javadoc"
     100            packagenames="*"
     101            use="true"
     102            splitindex="true"
     103            failonerror="true"
     104            additionalparam="-notimestamp"
     105            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
     106            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
     107            <group title="Router" packages="*" />
     108            <sourcepath>
     109                <pathelement location="./src" />
     110                <pathelement location="./test/junit" />
     111            </sourcepath>
     112            <classpath>
     113                <pathelement location="../../core/java/build/i2p.jar" />
     114                <pathelement location="../../core/java/build/i2ptest.jar" />
     115                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
     116                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
     117                <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
     118                <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
     119                <pathelement location="${junit.home}/junit4.jar" />
     120                <!-- following are only for debian builds -->
     121                <pathelement location="../../core/java/build/libintl.jar" />
     122                <pathelement location="../../core/java/build/gnu-getopt.jar" />
     123                <pathelement location="../../core/java/build/json-simple.jar" />
     124            </classpath>
     125            <!-- These variables are stored in build.properties.
     126                  End-users can override by creating the file override.properties -->
     127            <link offline="true" href="${javasedocs.url}" packagelistLoc="../../installer/resources/package-lists/java/" />
     128            <link offline="true" href="${javaeedocs.url}" packagelistLoc="../../installer/resources/package-lists/javaee/" />
     129            <link offline="true" href="${jettydocs.url}" packagelistLoc="../../installer/resources/package-lists/jetty/" />
     130            <link offline="true" href="${wrapperdocs.url}" packagelistLoc="../../installer/resources/package-lists/wrapper/" />
     131        </javadoc>
    103132    </target>
    104133
Note: See TracChangeset for help on using the changeset viewer.