Changeset 884a42b for build.xml


Ignore:
Timestamp:
May 30, 2018 12:52:30 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
04a9f561
Parents:
278a814
Message:

Build: Remove more files from Debian source tarballs
Don't need to both delete and exclude for tarballs
Restore commons-logging.jar to build classpath where needed for deb builds
Add classpath entries to fix Debian javadoc build

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r278a814 r884a42b  
    855855            </sourcepath>
    856856            <classpath>
     857                <!-- warning, some entries are needed for Debian builds only -->
    857858                <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
    858859                <pathelement location="apps/jetty/jettylib/jasper-runtime.jar" />
     
    861862                <pathelement location="apps/jetty/jettylib/jetty-security.jar" />
    862863                <pathelement location="apps/jetty/jettylib/jetty-servlet.jar" />
     864                <pathelement location="apps/jetty/jettylib/jetty-servlets.jar" />
    863865                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
    864866                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
    865867                <pathelement location="apps/jetty/jettylib/jetty-webapp.jar" />
    866868                <pathelement location="apps/jetty/jettylib/jetty-xml.jar" />
     869                <pathelement location="apps/jetty/jettylib/tomcat-api.jar" />
    867870                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
    868871                <pathelement location="installer/lib/wrapper/all/wrapper.jar" />
     
    23612364        <delete includeemptydirs="true" quiet="false" failonerror="false">
    23622365            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2366            <fileset dir="../i2p-${Extended.Version}/installer/" includes="*.xml" />
     2367            <fileset dir="../i2p-${Extended.Version}/installer/c/" />
     2368            <fileset dir="../i2p-${Extended.Version}/installer/doc/" />
    23632369            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2370            <fileset dir="../i2p-${Extended.Version}/installer/resources" includes="checklist.md deletelist.txt install_* geoipv6-extras.csv makegeoip* po4a.config uninstall_* *.bat net.i2p.router.plist.template" />
     2371            <fileset dir="../i2p-${Extended.Version}/installer/resources/Start I2P Router.app/" />
     2372            <fileset dir="../i2p-${Extended.Version}/installer/resources/portable/" />
     2373            <fileset dir="../i2p-${Extended.Version}/installer/resources/small/" />
    23642374            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    23652375            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     
    23692379            <fileset dir="../i2p-${Extended.Version}/" includes="Docker*" />
    23702380            <file name="../i2p-${Extended.Version}/Makefile.gcj" />
     2381            <fileset dir="../i2p-${Extended.Version}/docs" />
     2382            <fileset dir="../i2p-${Extended.Version}/launchers" />
     2383            <file name="../i2p-${Extended.Version}/.travis.yml" />
     2384            <file name="../i2p-${Extended.Version}/.gitignore" />
    23712385            <!-- gradle files -->
    23722386            <fileset dir="../i2p-${Extended.Version}/" includes="**/build.gradle" />
    23732387            <fileset dir="../i2p-${Extended.Version}/gradle" />
     2388            <file name="../i2p-${Extended.Version}/gradlew" />
    23742389            <file name="../i2p-${Extended.Version}/gradlew.bat" />
    23752390            <file name="../i2p-${Extended.Version}/gradle.properties" />
     
    24002415                <include name="**/**" />
    24012416                <exclude name="debian/**"/>
    2402                 <exclude name="debian-alt/**"/>
    24032417                <exclude name="**/*.sh"/>
    2404                 <exclude name="installer/resources/geoip.txt"/>
    2405                 <exclude name="installer/resources/geoipv6.dat.gz"/>
    2406                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
    2407                 <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2408                 <exclude name="apps/susidns/src/lib/jstl.jar" />
    2409                 <exclude name="apps/susidns/src/lib/standard.jar" />
    24102418                <!-- anything added above, add in debian-release-tarball also -->
    24112419            </tarfileset>
     
    24362444        <delete includeemptydirs="true" quiet="false" failonerror="false">
    24372445            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2446            <fileset dir="../i2p-${Extended.Version}/installer/" includes="*.xml" />
     2447            <fileset dir="../i2p-${Extended.Version}/installer/c/" />
     2448            <fileset dir="../i2p-${Extended.Version}/installer/doc/" />
    24382449            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2450            <fileset dir="../i2p-${Extended.Version}/installer/resources" includes="checklist.md deletelist.txt install_* geoipv6-extras.csv makegeoip* po4a.config uninstall_* *.bat net.i2p.router.plist.template" />
     2451            <fileset dir="../i2p-${Extended.Version}/installer/resources/Start I2P Router.app/" />
     2452            <fileset dir="../i2p-${Extended.Version}/installer/resources/portable/" />
     2453            <fileset dir="../i2p-${Extended.Version}/installer/resources/small/" />
    24392454            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    24402455            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     
    24442459            <fileset dir="../i2p-${Extended.Version}/" includes="Docker*" />
    24452460            <file name="../i2p-${Extended.Version}/Makefile.gcj" />
     2461            <fileset dir="../i2p-${Extended.Version}/docs" />
     2462            <fileset dir="../i2p-${Extended.Version}/launchers" />
     2463            <file name="../i2p-${Extended.Version}/.travis.yml" />
     2464            <file name="../i2p-${Extended.Version}/.gitignore" />
    24462465            <!-- gradle files -->
    24472466            <fileset dir="../i2p-${Extended.Version}/" includes="**/build.gradle" />
     
    24792498                <include name="**/**" />
    24802499                <exclude name="debian/**"/>
    2481                 <exclude name="debian-alt/**"/>
    24822500                <exclude name="**/*.sh"/>
    2483                 <exclude name="installer/resources/geoip.txt"/>
    2484                 <exclude name="installer/resources/geoipv6.dat.gz"/>
    2485           <!--
    2486                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
    2487                 <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2488            -->
    2489           <!--
    2490                 <exclude name="apps/susidns/src/lib/jstl.jar" />
    2491            -->
    2492                 <exclude name="apps/susidns/src/lib/standard.jar" />
    24932501                <!-- anything added above, add in debian-release-tarball also -->
    24942502            </tarfileset>
     
    25212529        <delete includeemptydirs="true" quiet="false" failonerror="false">
    25222530            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2531            <fileset dir="../i2p-${Extended.Version}/installer/" includes="*.xml" />
     2532            <fileset dir="../i2p-${Extended.Version}/installer/c/" />
     2533            <fileset dir="../i2p-${Extended.Version}/installer/doc/" />
    25232534            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2535            <fileset dir="../i2p-${Extended.Version}/installer/resources" includes="checklist.md deletelist.txt install_* geoipv6-extras.csv makegeoip* po4a.config uninstall_* *.bat net.i2p.router.plist.template" />
     2536            <fileset dir="../i2p-${Extended.Version}/installer/resources/Start I2P Router.app/" />
     2537            <fileset dir="../i2p-${Extended.Version}/installer/resources/portable/" />
     2538            <fileset dir="../i2p-${Extended.Version}/installer/resources/small/" />
    25242539            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    25252540            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     
    25292544            <fileset dir="../i2p-${Extended.Version}/" includes="Docker*" />
    25302545            <file name="../i2p-${Extended.Version}/Makefile.gcj" />
     2546            <fileset dir="../i2p-${Extended.Version}/docs" />
     2547            <fileset dir="../i2p-${Extended.Version}/launchers" />
     2548            <file name="../i2p-${Extended.Version}/.travis.yml" />
     2549            <file name="../i2p-${Extended.Version}/.gitignore" />
    25312550            <!-- gradle files -->
    25322551            <fileset dir="../i2p-${Extended.Version}/" includes="**/build.gradle" />
     
    25552574                <include name="**/**" />
    25562575                <exclude name="debian/**"/>
    2557                 <exclude name="debian-alt/**"/>
    25582576                <exclude name="**/*.sh"/>
    2559                 <exclude name="installer/resources/geoip.txt"/>
    2560                 <exclude name="installer/resources/geoipv6.dat.gz"/>
    2561                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
    2562                 <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2563               <!--
    2564                 <exclude name="apps/susidns/src/lib/jstl.jar" />
    2565                -->
    2566                 <exclude name="apps/susidns/src/lib/standard.jar" />
    25672577                <!-- anything added above, add in debian-tarball also -->
    25682578            </tarfileset>
     
    25912601        <delete includeemptydirs="true" quiet="false" failonerror="false">
    25922602            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2603            <fileset dir="../i2p-${Extended.Version}/installer/" includes="*.xml" />
     2604            <fileset dir="../i2p-${Extended.Version}/installer/c/" />
     2605            <fileset dir="../i2p-${Extended.Version}/installer/doc/" />
    25932606            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2607            <fileset dir="../i2p-${Extended.Version}/installer/resources" includes="checklist.md deletelist.txt install_* geoipv6-extras.csv makegeoip* po4a.config uninstall_* *.bat net.i2p.router.plist.template" />
     2608            <fileset dir="../i2p-${Extended.Version}/installer/resources/Start I2P Router.app/" />
     2609            <fileset dir="../i2p-${Extended.Version}/installer/resources/portable/" />
     2610            <fileset dir="../i2p-${Extended.Version}/installer/resources/small/" />
    25942611            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    25952612            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     
    25992616            <fileset dir="../i2p-${Extended.Version}/" includes="Docker*" />
    26002617            <file name="../i2p-${Extended.Version}/Makefile.gcj" />
     2618            <fileset dir="../i2p-${Extended.Version}/docs" />
     2619            <fileset dir="../i2p-${Extended.Version}/launchers" />
     2620            <file name="../i2p-${Extended.Version}/.travis.yml" />
     2621            <file name="../i2p-${Extended.Version}/.gitignore" />
    26012622            <!-- gradle files -->
    26022623            <fileset dir="../i2p-${Extended.Version}/" includes="**/build.gradle" />
     
    26232644                <include name="**/**" />
    26242645                <exclude name="debian/**"/>
    2625                 <exclude name="debian-alt/**"/>
    26262646                <exclude name="**/*.sh"/>
    2627                 <exclude name="installer/resources/geoip.txt"/>
    2628                 <exclude name="installer/resources/geoipv6.dat.gz"/>
    2629                 <exclude name="apps/jetty/jetty-distribution-*/**"/>
    2630                 <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2631                 <exclude name="apps/susidns/src/lib/jstl.jar" />
    2632                 <exclude name="apps/susidns/src/lib/standard.jar" />
    26332647                <!-- anything added above, add in debian-tarball also -->
    26342648            </tarfileset>
Note: See TracChangeset for help on using the changeset viewer.