Changeset e42b78e for build.xml


Ignore:
Timestamp:
May 20, 2011 2:12:07 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2f2e0e5
Parents:
4b19801 (diff), 3d76354c (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:

propagate from branch 'i2p.i2p.zzz.naming' (head 9626e0df682c8d5f706d2c814158ba451f3ebeb5)

to branch 'i2p.i2p' (head a3969e6c9c4fd5bfd69cd716ce0df191ad2af634)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r4b19801 re42b78e  
    136136    </target>
    137137
     138    <target name="buildJrobin" depends="buildProperties" >
     139        <!-- take only what we need from the jrobin jar -->
     140        <jar destfile="build/jrobin.jar" >
     141            <zipfileset src="apps/jrobin/jrobin-1.5.9.1.jar"
     142                        excludes="org/jrobin/cmd/ org/jrobin/convertor/ org/jrobin/inspector/" />
     143            <manifest>
     144                <attribute name="Build-Date" value="${build.timestamp}" />
     145                <attribute name="Base-Revision" value="${workspace.version}" />
     146            </manifest>
     147        </jar>
     148    </target>
     149
    138150    <target name="buildProperties" >
    139151        <exec executable="mtn" outputproperty="workspace.version" errorproperty="mtn.error1" failifexecutionfails="false" >
     
    195207        <!-- thazzit -->
    196208    </target>
    197     <target name="compile" />
     209
    198210    <target name="jar" depends="jarSmall" >
    199211        <copy file="apps/BOB/dist/BOB.jar" todir="build/" />
     
    203215        <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
    204216        <copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
    205     </target>
    206     <target name="jarSmall" depends="compile" >
     217
     218    </target>
     219    <target name="jarSmall" depends="builddepSmall, buildJrobin" >
    207220        <copy file="core/java/build/i2p.jar" todir="build/" />
    208221        <copy file="router/java/build/router.jar" todir="build/" />
     
    213226        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
    214227        <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
    215         <copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
    216228        <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
    217229    </target>
     230
     231    <target name="jbigi">
     232        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     233            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
     234        </jar>
     235    </target>
     236
     237    <target name="jbigi-windows-only" >
     238        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     239            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
     240        </jar>
     241    </target>
     242
     243    <target name="jbigi-linux-only">
     244        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
     245            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
     246        </jar>
     247    </target>
     248
    218249    <!-- the apps need to compile the jsps to poupdate -->
    219250    <target name="poupdate" depends="buildRouter, buildStreaming, buildSystray, buildJetty, buildDesktopGui" >
     
    294325                <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
    295326                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    296                 <pathelement location="apps/jrobin/jrobin-1.4.0.jar" />
     327                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
    297328                <pathelement location="installer/lib/wrapper/win32/wrapper.jar" />
    298329                <pathelement location="core/lib/junit.jar" />               
     
    386417    </target>
    387418
    388     <target name="preppkg" depends="preppkg-linux, preppkg-windows">
     419    <target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
    389420        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    390421        <copy todir="pkg-temp/lib/wrapper/freebsd/">
     
    409440        <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
    410441        <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
     442        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    411443        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
    412444        <copy todir="pkg-temp/lib/wrapper/win32/">
     
    416448
    417449    <!-- only what is needed for debian, etc. -->
    418     <target name="preppkg-linux-only" depends="preppkg-linux">
    419         <!-- rip the non-linux stuff out of jbigi.jar -->
    420         <mkdir dir="tmpextract" />
    421         <unjar src="build/jbigi.jar" dest="tmpextract/" />
    422         <jar destfile="pkg-temp/lib/jbigi.jar" >
    423             <fileset dir="tmpextract/" includes="*linux*" />
    424         </jar>
    425         <delete dir="tmpextract/" />
     450    <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
     451        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    426452    </target>
    427453
     
    463489        <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
    464490        <!-- pulled out of routerconsole.jar in 0.7.12; name without version so we can overwrite if we upgrade  -->
    465         <copy file="apps/jrobin/jrobin-1.4.0.jar" tofile="pkg-temp/lib/jrobin.jar" />
     491        <copy file="build/jrobin.jar" tofile="pkg-temp/lib/jrobin.jar" />
    466492        <copy file="build/sam.jar" todir="pkg-temp/lib/" />
    467493        <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
     
    666692        <!-- pulled out of routerconsole.jar in 0.7.12, someday we can take out of updater -->
    667693        <!-- name without version so we can overwrite if we upgrade  -->
    668         <copy file="apps/jrobin/jrobin-1.4.0.jar" tofile="pkg-temp/lib/jrobin.jar" />
     694        <copy file="build/jrobin.jar" tofile="pkg-temp/lib/jrobin.jar" />
    669695        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
    670696        <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
     
    825851            <arg value="i2p.fba"/>
    826852            <arg value="-auxclasspath"/>
    827             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.4.0.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/linux/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.4.0.jar"/>
     853            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/linux/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    828854            <arg value="-sourcepath"/>
    829855            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/"/>
     
    836862            <arg value="build/i2ptunnel.jar"/>
    837863            <arg value="build/i2ptunnel.war"/>
    838             <arg value="build/jbigi.jar"/>
    839864            <arg value="build/mstreaming.jar"/>
    840865            <arg value="build/router.jar/"/>
     
    10541079                thus cleaning is required before each build-->
    10551080        <target name="buildSmallOnly" depends="pkg-portable-clean,buildSmall"/>
     1081
    10561082<!-- *1* preparing the jars by OS dependent de-bloating -->
    1057         <target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly">
    1058                 <!-- rip the non-windows stuff out of jbigi.jar -->
    1059                 <mkdir dir="tmpextract" />
    1060                 <unjar src="build/jbigi.jar" dest="tmpextract/" />
    1061                 <jar destfile="build/jbigi.jar" >
    1062                         <fileset dir="tmpextract/" includes="*windows*" />
    1063                 </jar>
    1064                 <delete dir="tmpextract/" />
    1065         </target>
    1066         <target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly">
    1067                 <!-- rip the non-linux stuff out of jbigi.jar -->
    1068                 <mkdir dir="tmpextract" />
    1069                 <unjar src="build/jbigi.jar" dest="tmpextract/" />
    1070                 <jar destfile="build/jbigi.jar" >
    1071                         <fileset dir="tmpextract/" includes="*linux*" />
    1072                 </jar>
    1073                 <delete dir="tmpextract/" />
    1074         </target>
     1083        <target name="preppkg-portable-win32-jbigi" depends="buildSmallOnly, jbigi-windows-only" />
     1084
     1085        <target name="preppkg-portable-linux-jbigi"  depends="buildSmallOnly, jbigi-linux-only" />
    10751086
    10761087<!-- *2* os independent procedure  -->
     
    11211132                        <!-- 3rd party jars from apps/  -->
    11221133                                <!-- jrobin - without jobin , you lost graph and get a lot error entry in logs -->
    1123                         <copy file="apps/jrobin/jrobin-1.4.0.jar" tofile="pkg-temp/lib/jrobin.jar" />
     1134                        <copy file="build/jrobin.jar" tofile="pkg-temp/lib/jrobin.jar" />
    11241135        </target>
    11251136<!-- *3* os dependent procedure/commands -->
Note: See TracChangeset for help on using the changeset viewer.