Changeset 3240dac for build.xml


Ignore:
Timestamp:
Mar 5, 2012 12:52:21 AM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
ee22244
Parents:
76c0f56
Message:

remove dup utility jar building, build win and non-win installers for release

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r76c0f56 r3240dac  
    11421142    </target>
    11431143
    1144     <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches" >
     1144    <target name="utility-jars" depends="buildCore" >
    11451145        <mkdir dir="pkg-temp/installer" />
    11461146        <!-- set if unset -->
     
    11731173            </manifest>
    11741174        </jar>
     1175    </target>
     1176
     1177    <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches, utility-jars" >
    11751178        <!--
    11761179          Force 1.5 pack200 output
     
    12601263    </target>
    12611264
    1262     <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches" >
    1263         <mkdir dir="pkg-temp/installer" />
    1264         <!-- set if unset -->
    1265         <property name="workspace.changes.util.tr" value="" />
    1266         <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
    1267             <manifest>
    1268                 <attribute name="Main-Class" value="net.i2p.util.Copy" />
    1269                 <attribute name="Built-By" value="${build.built-by}" />
    1270                 <attribute name="Build-Date" value="${build.timestamp}" />
    1271                 <attribute name="Base-Revision" value="${workspace.version}" />
    1272                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1273             </manifest>
    1274         </jar>
    1275         <jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
    1276             <manifest>
    1277                 <attribute name="Main-Class" value="net.i2p.util.Delete" />
    1278                 <attribute name="Built-By" value="${build.built-by}" />
    1279                 <attribute name="Build-Date" value="${build.timestamp}" />
    1280                 <attribute name="Base-Revision" value="${workspace.version}" />
    1281                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1282             </manifest>
    1283         </jar>
    1284         <jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
    1285             <manifest>
    1286                 <attribute name="Main-Class" value="net.i2p.util.Exec" />
    1287                 <attribute name="Built-By" value="${build.built-by}" />
    1288                 <attribute name="Build-Date" value="${build.timestamp}" />
    1289                 <attribute name="Base-Revision" value="${workspace.version}" />
    1290                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1291             </manifest>
    1292         </jar>
     1265    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, utility-jars" >
    12931266        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
    12941267        <ant target="installerexe" />
     
    13891362    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    13901363-->
    1391     <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterRepack, updater200, preppkgRepack, installer" >
     1364    <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, preppkgRepack, installer-nowindows, installer-windows" >
    13921365        <echo message="================================================================" />
    13931366        <echo message="Did you update these files?" />
     
    14081381        <echo message="New version number is ${release.number}" />
    14091382        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
    1410         <copy file="i2pinstall.exe" tofile="i2pinstall_${release.number}.exe" />
     1383        <copy file="i2pinstall_${full.version}_windows-only.exe" tofile="i2pinstall_${release.number}.exe" />
     1384        <copy file="i2pinstall_${full.version}.jar" tofile="i2pinstall_${release.number}.jar" />
    14111385        <delete file="i2pupdate.sud" />
    14121386        <delete file="i2pupdate.su2" />
     
    15071481        <echo message="Sign the files:" />
    15081482        <delete file="i2pinstall_${release.number}.exe.sig" />
     1483        <delete file="i2pinstall_${release.number}.jar.sig" />
    15091484        <delete file="i2psource_${release.number}.tar.bz2.sig" />
    15101485        <delete file="i2pupdate_${release.number}.zip.sig" />
     
    15151490        <exec executable="gpg" failonerror="true">
    15161491            <arg value="-b" />
     1492            <arg value="i2pinstall_${release.number}.jar" />
     1493        </exec>
     1494        <exec executable="gpg" failonerror="true">
     1495            <arg value="-b" />
    15171496            <arg value="i2psource_${release.number}.tar.bz2" />
    15181497        </exec>
     
    15241503            <arg value="444" />
    15251504            <arg value="i2pinstall_${release.number}.exe" />
     1505            <arg value="i2pinstall_${release.number}.jar" />
    15261506            <arg value="i2psource_${release.number}.tar.bz2" />
    15271507            <arg value="i2pupdate_${release.number}.zip" />
     
    15291509            <arg value="i2pupdate.sud" />
    15301510            <arg value="i2pinstall_${release.number}.exe.sig" />
     1511            <arg value="i2pinstall_${release.number}.jar.sig" />
    15311512            <arg value="i2psource_${release.number}.tar.bz2.sig" />
    15321513            <arg value="i2pupdate_${release.number}.zip.sig" />
     
    15361517            <arg value="-l" />
    15371518            <arg value="i2pinstall_${release.number}.exe" />
     1519            <arg value="i2pinstall_${release.number}.jar" />
    15381520            <arg value="i2psource_${release.number}.tar.bz2" />
    15391521            <arg value="i2pupdate_${release.number}.zip" />
     
    15411523            <arg value="i2pupdate.sud" />
    15421524            <arg value="i2pinstall_${release.number}.exe.sig" />
     1525            <arg value="i2pinstall_${release.number}.jar.sig" />
    15431526            <arg value="i2psource_${release.number}.tar.bz2.sig" />
    15441527            <arg value="i2pupdate_${release.number}.zip.sig" />
     
    15471530        <exec executable="sha256sum" failonerror="true">
    15481531            <arg value="i2pinstall_${release.number}.exe" />
     1532            <arg value="i2pinstall_${release.number}.jar" />
    15491533            <arg value="i2psource_${release.number}.tar.bz2" />
    15501534            <arg value="i2pupdate_${release.number}.zip" />
Note: See TracChangeset for help on using the changeset viewer.