Changeset b03f7536 for build.xml


Ignore:
Timestamp:
Jun 8, 2011 12:44:42 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d57925e8
Parents:
e18080c
Message:
  • Build: Add standard manifest to jbigi.jar
  • Update wrapper license
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    re18080c rb03f7536  
    241241    </target>
    242242
    243     <target name="jbigi">
     243    <target name="jbigi-list-changes">
     244        <exec executable="mtn" outputproperty="workspace.changes.jbigi" errorproperty="mtn.error.jbigi" failifexecutionfails="false" >
     245            <arg value="list" />
     246            <arg value="changed" />
     247            <arg value="installer/lib/jbigi" />
     248        </exec>
     249        <!-- \n in an attribute value generates an invalid manifest -->
     250        <exec executable="tr" inputstring="${workspace.changes.jbigi}" outputproperty="workspace.changes.jbigi.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
     251            <arg value="-s" />
     252            <arg value="[:space:]" />
     253            <arg value="," />
     254        </exec>
     255    </target>
     256
     257    <target name="jbigi" depends="buildProperties, jbigi-list-changes" >
    244258        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    245259            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
     260            <manifest>
     261                <attribute name="Build-Date" value="${build.timestamp}" />
     262                <attribute name="Base-Revision" value="${workspace.version}" />
     263                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     264            </manifest>
    246265        </jar>
    247266    </target>
    248267
    249     <target name="jbigi-windows-only" >
     268    <target name="jbigi-windows-only" depends="buildProperties, jbigi-list-changes" >
    250269        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    251270            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
     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>
    252276        </jar>
    253277    </target>
    254278
    255     <target name="jbigi-linux-only">
     279    <target name="jbigi-linux-only"  depends="buildProperties, jbigi-list-changes" >
    256280        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
    257281            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
     282            <manifest>
     283                <attribute name="Build-Date" value="${build.timestamp}" />
     284                <attribute name="Base-Revision" value="${workspace.version}" />
     285                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     286            </manifest>
    258287        </jar>
    259288    </target>
     
    461490        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    462491        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
    463         <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
     492        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    464493        <copy todir="pkg-temp/lib/wrapper/win32/">
    465494            <fileset dir="installer/lib/wrapper/win32/" />
     
    470499    <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
    471500        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     501        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    472502    </target>
    473503
Note: See TracChangeset for help on using the changeset viewer.