Changeset 4389f27 for build.xml


Ignore:
Timestamp:
Dec 28, 2012 8:59:17 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
3be5002
Parents:
cf10cb1c
Message:
  • windows installer fixes / improvements
    • move deprecated installer-only classes (Exec, Delete, and Copy) from i2p.jar into installer/
    • replace installer/resources/fixpaths.cmd with an improved method in java
    • combine the installer-only utility classes into a single jar and call the classes from within izpack
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rcf10cb1c r4389f27  
    621621        <ant dir="core/java/" target="distclean" />
    622622        <ant dir="router/java/" target="distclean" />
     623        <ant dir="installer/java" target="distclean" />
    623624        <ant dir="apps/ministreaming/java/" target="distclean" />
    624625        <ant dir="apps/streaming/java/" target="distclean" />
     
    803804        <copy file="installer/resources/i2prouter.bat" todir="pkg-temp/" />
    804805        <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
    805         <copy file="installer/resources/fixpaths.cmd" todir="pkg-temp/" />
    806806        <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
    807807        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
     
    11551155    </target>
    11561156
    1157     <target name="utility-jars" depends="buildCore" >
    1158         <mkdir dir="pkg-temp/installer" />
    1159         <!-- set if unset -->
    1160         <property name="workspace.changes.util.tr" value="" />
    1161         <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
    1162             <manifest>
    1163                 <attribute name="Main-Class" value="net.i2p.util.Copy" />
    1164                 <attribute name="Built-By" value="${build.built-by}" />
    1165                 <attribute name="Build-Date" value="${build.timestamp}" />
    1166                 <attribute name="Base-Revision" value="${workspace.version}" />
    1167                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1168             </manifest>
    1169         </jar>
    1170         <jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
    1171             <manifest>
    1172                 <attribute name="Main-Class" value="net.i2p.util.Delete" />
    1173                 <attribute name="Built-By" value="${build.built-by}" />
    1174                 <attribute name="Build-Date" value="${build.timestamp}" />
    1175                 <attribute name="Base-Revision" value="${workspace.version}" />
    1176                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1177             </manifest>
    1178         </jar>
    1179         <jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
    1180             <manifest>
    1181                 <attribute name="Main-Class" value="net.i2p.util.Exec" />
    1182                 <attribute name="Built-By" value="${build.built-by}" />
    1183                 <attribute name="Build-Date" value="${build.timestamp}" />
    1184                 <attribute name="Base-Revision" value="${workspace.version}" />
    1185                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1186             </manifest>
    1187         </jar>
    1188     </target>
    1189 
    1190     <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches, utility-jars" >
     1157    <target name="buildUtilityJar" depends="buildCore">
     1158        <ant dir="installer/java" target="build" />
     1159    </target>
     1160
     1161    <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches, buildUtilityJar" >
    11911162        <!--
    11921163          Force 1.5 pack200 output
     
    12911262    </target>
    12921263
    1293     <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, utility-jars" >
     1264    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, buildUtilityJar" >
    12941265        <fixcrlf srcdir="pkg-temp" includes="*.config *.bat *.cmd **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="crlf"/>
    12951266        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
Note: See TracChangeset for help on using the changeset viewer.