Changeset fda6730 for build.xml


Ignore:
Timestamp:
Mar 18, 2017 2:34:59 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
05aef9b
Parents:
2480155
Message:

Addressbook build changes (ticket #1966):

  • Build as jar, not war
  • Put empty war in updater
  • Move Servlet starter to SusiDNS
  • Skip war in RouterConsoleRunner?
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r2480155 rfda6730  
    311311    </target>
    312312
    313     <target name="buildSusiDNS" depends="buildCore, buildJetty, buildImagegen" >
     313    <target name="buildSusiDNS" depends="buildCore, buildJetty, buildImagegen, buildAddressbook" >
    314314        <ant dir="apps/susidns/src" target="all" />
    315315        <copy file="apps/susidns/src/susidns.war" todir="build/" />
     
    333333    </target>
    334334
    335     <target name="buildAddressbook" depends="buildCore, buildJetty" >
    336         <ant dir="apps/addressbook/" target="war" />
     335    <target name="buildAddressbook" depends="buildCore" >
     336        <ant dir="apps/addressbook/" target="all" />
     337        <copy file="apps/addressbook/dist/addressbook.jar" todir="build/" />
     338        <!-- war is empty, only for updates -->
    337339        <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
    338340    </target>
     
    735737            <group title="SAM Bridge" packages="net.i2p.sam" />
    736738            <group title="SAM Demos" packages="net.i2p.sam.client" />
    737             <group title="SusiDNS Application" packages="i2p.susi.dns" />
     739            <group title="SusiDNS Application" packages="i2p.susi.dns:net.i2p.addressbook.servlet" />
    738740            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
    739741            <group title="Systray Application" packages="net.i2p.apps.systray" />
     
    12061208        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
    12071209        <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
    1208         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
     1210        <copy file="build/addressbook.jar" todir="pkg-temp/lib/" />
    12091211        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    12101212        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
     
    14661468        <exec executable="sh" osfamily="unix" failonerror="true">
    14671469            <arg value="-c" />
    1468             <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
     1470            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar -o $i = pkg-temp/webapps/addressbook.war ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
    14691471        </exec>
    14701472        <exec executable="sh" osfamily="mac" failonerror="true">
    14711473            <arg value="-c" />
    1472             <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
     1474            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar -o $i = pkg-temp/webapps/addressbook.war ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
    14731475        </exec>
    14741476        <!-- windoz here : i admit, i hate escaped symbols in xml, indeed = =! -->
     
    15521554        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
    15531555        <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
     1556        <copy file="build/addressbook.jar" todir="pkg-temp/lib/" />
    15541557        <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
    15551558        <!-- decapitalized the file in 0.7.8 -->
     
    18991902            <arg value="build/BOB.jar"/>
    19001903            <arg value="build/addressbook.jar"/>
    1901             <arg value="build/addressbook.war"/>
    19021904            <arg value="build/i2p.jar"/>
    19031905            <arg value="build/i2psnark.jar"/>
Note: See TracChangeset for help on using the changeset viewer.