Changeset 2c0e6a3 for build.xml


Ignore:
Timestamp:
Jun 10, 2011 2:53:59 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
4e99c45
Parents:
cbaa62d (diff), 162c5bc (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 '14e8f430d97e8e6a9926d59299775ca98d590c8d'

and '2b3daf42c48bc7b83cfa015b1dba87538ee2f8db'

File:
1 edited

Legend:

Unmodified
Added
Removed

  • build.xml

    rcbaa62d r2c0e6a3  
    160160    </target>
    161161
    162     <target name="buildProperties" >
     162    <target name="checkForMtn" >
     163        <available property="mtn.available" file="_MTN" type="dir" />
     164    </target>
     165
     166    <target name="getMtnRev" depends="checkForMtn" if="mtn.available" >
    163167        <exec executable="mtn" outputproperty="workspace.version" errorproperty="mtn.error1" failifexecutionfails="false" >
    164168            <arg value="automate" />
    165169            <arg value="get_base_revision_id" />
    166170        </exec>
     171    </target>
     172
     173    <target name="buildProperties" depends="getMtnRev" >
     174        <!-- default if not set above -->
     175        <property name="workspace.version" value="unknown" />
    167176        <tstamp>
    168177            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
    … …  
    241250    </target>
    242251
    243     <target name="jbigi">
     252    <target name="jbigi-list-changes" depends="checkForMtn" if="mtn.available" >
     253        <exec executable="mtn" outputproperty="workspace.changes.jbigi" errorproperty="mtn.error.jbigi" failifexecutionfails="false" >
     254            <arg value="list" />
     255            <arg value="changed" />
     256            <arg value="installer/lib/jbigi" />
     257        </exec>
     258        <!-- \n in an attribute value generates an invalid manifest -->
     259        <exec executable="tr" inputstring="${workspace.changes.jbigi}" outputproperty="workspace.changes.jbigi.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
     260            <arg value="-s" />
     261            <arg value="[:space:]" />
     262            <arg value="," />
     263        </exec>
     264    </target>
     265
     266    <target name="jbigi" depends="buildProperties, jbigi-list-changes" >
     267        <!-- set if unset -->
     268        <property name="workspace.changes.jbigi.tr" value="" />
    244269        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    245270            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
     271            <manifest>
     272                <attribute name="Build-Date" value="${build.timestamp}" />
     273                <attribute name="Base-Revision" value="${workspace.version}" />
     274                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     275            </manifest>
    246276        </jar>
    247277    </target>
    248278
    249     <target name="jbigi-windows-only" >
     279    <target name="jbigi-windows-only" depends="buildProperties, jbigi-list-changes" >
     280        <!-- set if unset -->
     281        <property name="workspace.changes.jbigi.tr" value="" />
    250282        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    251283            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
     284            <manifest>
     285                <attribute name="Build-Date" value="${build.timestamp}" />
     286                <attribute name="Base-Revision" value="${workspace.version}" />
     287                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     288            </manifest>
    252289        </jar>
    253290    </target>
    254291
    255     <target name="jbigi-linux-only">
     292    <target name="jbigi-linux-only"  depends="buildProperties, jbigi-list-changes" >
     293        <!-- set if unset -->
     294        <property name="workspace.changes.jbigi.tr" value="" />
    256295        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
    257296            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
     297            <manifest>
     298                <attribute name="Build-Date" value="${build.timestamp}" />
     299                <attribute name="Base-Revision" value="${workspace.version}" />
     300                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     301            </manifest>
    258302        </jar>
    259303    </target>
    … …  
    338382                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    339383                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
    340                 <pathelement location="installer/lib/wrapper/win32/wrapper.jar" />
     384                <pathelement location="installer/lib/wrapper/all/wrapper.jar" />
    341385                <pathelement location="core/lib/junit.jar" />               
    342386            </classpath>
    … …  
    353397        <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
    354398        <delete file="BOB-one.jar" failonerror="false" quiet="true" /> 
     399        <delete dir="core/c/jbigi/bin" />
     400        <delete dir="core/c/jbigi/lib" />
     401        <delete dir="core/c/jcpuid/lib" />
    355402        <delete dir="debian/tmp" />
    356403        <delete dir="debian/db" />
    … …  
    435482            <fileset dir="installer/lib/wrapper/freebsd/" />
    436483        </copy>
     484        <copy todir="pkg-temp/lib/wrapper/freebsd64/">
     485            <fileset dir="installer/lib/wrapper/freebsd64" />
     486        </copy>
    437487        <copy todir="pkg-temp/lib/wrapper/macosx/">
    438488            <fileset dir="installer/lib/wrapper/macosx/" />
    … …  
    452502        <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
    453503        <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
    454         <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
    455504        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    456505        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
     506        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    457507        <copy todir="pkg-temp/lib/wrapper/win32/">
    458508            <fileset dir="installer/lib/wrapper/win32/" />
     509        </copy>
     510        <copy todir="pkg-temp/lib/wrapper/win64/">
     511            <fileset dir="installer/lib/wrapper/win64/" />
    459512        </copy>
    460513    </target>
    … …  
    463516    <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
    464517        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     518        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    465519    </target>
    466520
    467521    <target name="preppkg-linux" depends="preppkg-base">
    468522        <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
    469         <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" />
     523        <!-- <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" /> old feature that per zzz isn't used-->
    470524        <copy file="installer/resources/eepget" todir="pkg-temp/" />
    471525        <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
    … …  
    747801        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    748802    </target>
    749     <target name="installer" depends="preppkg, buildProperties">
    750         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
    751         <mkdir dir="pkg-temp/installer" />
     803
     804    <target name="util-list-changes" depends="checkForMtn" if="mtn.available" >
    752805        <exec executable="mtn" outputproperty="workspace.changes.util" errorproperty="mtn.error.util" failifexecutionfails="false" >
    753806            <arg value="list" />
    … …  
    761814            <arg value="," />
    762815        </exec>
     816    </target>
     817
     818    <target name="installer" depends="preppkg, buildProperties, util-list-changes" >
     819        <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     820        <mkdir dir="pkg-temp/installer" />
     821        <!-- set if unset -->
     822        <property name="workspace.changes.util.tr" value="" />
    763823        <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
    764824            <manifest>
    … …  
    874934            <arg value="i2p.fba"/>
    875935            <arg value="-auxclasspath"/>
    876             <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"/>
     936            <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/all/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"/>
    877937            <arg value="-sourcepath"/>
    878938            <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/"/>
    … …  
    11801240                        <!--wrapper - dont even think about it. i2p cosumes appreantly more mem without it on win32-->
    11811241                <copy file="installer/lib/wrapper/win32/wrapper.dll" todir="pkg-temp/lib" />
    1182                 <copy file="installer/lib/wrapper/win32/wrapper.jar" todir="pkg-temp/lib" />
     1242                <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    11831243                <copy file="installer/lib/wrapper/win32/I2Psvc.exe" tofile="pkg-temp/i2psvc.ex_" />
    11841244                        <!--  copy the unpack/start batchfiles -->
Note: See TracChangeset for help on using the changeset viewer.