Changeset 6ebd1f1 for build.xml


Ignore:
Timestamp:
Feb 26, 2012 11:05:21 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bda3fbb
Parents:
394943c3
Message:

installer build fixups

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r394943c3 r6ebd1f1  
    207207    </target>
    208208
     209    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup, if possible -->
    209210    <target name="buildexe">
    210211        <condition property="noExe">
     
    235236             classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
    236237
     238    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
    237239    <target name="doBuildEXE" depends="buildProperties" unless="noExe">
    238240        <jar destfile="./build/launchi2p.jar">
     
    573575        <delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" />     
    574576        <delete file="i2pinstall.exe" failonerror="false" quiet="true" />       
    575         <delete file="i2p.exe" failonerror="false" quiet="true" />
    576577        <delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
    577578        <delete>
     
    755756   
    756757    <target name="preppkg-windows" depends="preppkg-base, buildexe">
    757         <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
     758        <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
    758759        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
    759760        <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
     
    11701171    </target>
    11711172
     1173    <!-- this makes i2pinstall.exe from install.jar -->
    11721174    <target name="doInstallerEXE" unless="noExe">
    11731175        <!-- now the installer exe -->
    11741176        <launch4j configFile="./installer/i2pinstaller.xml" />
    1175         <launch4j configFile="./installer/i2pstandalone.xml" />
    11761177        <!-- thazzit -->
    11771178    </target>
    11781179
    11791180    <!-- Custom installers -->
    1180     <target name="installer-nowindows" depends="clean, preppkg-nowindows, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    1181         <mkdir dir="pkg-temp/installer" />
    1182         <!-- set if unset -->
    1183         <property name="workspace.changes.util.tr" value="" />
    1184         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}.jar" installerType="standard" basedir="${basedir}" />
    1185     </target>
    1186 
    1187 
    1188     <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    1189         <mkdir dir="pkg-temp/installer" />
    1190         <!-- set if unset -->
    1191         <property name="workspace.changes.util.tr" value="" />
    1192         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    1193     </target>
    1194 
    1195     <target name="installer-linux" depends="clean, preppkg-linux-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    1196         <mkdir dir="pkg-temp/installer" />
    1197         <!-- set if unset -->
    1198         <property name="workspace.changes.util.tr" value="" />
    1199         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    1200     </target>
    1201 
    1202 
    1203     <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches">
    1204         <mkdir dir="pkg-temp/installer" />
     1181    <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
     1182        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
     1183    </target>
     1184
     1185
     1186    <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
     1187        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     1188    </target>
     1189
     1190    <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
     1191        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     1192    </target>
     1193
     1194
     1195    <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, izpack-patches">
    12051196        <mkdir dir="pkg-temp/osx" />
    1206         <!-- set if unset -->
    1207         <property name="workspace.changes.util.tr" value="" />
    1208         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
     1197        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_osx-only.jar" installerType="standard" basedir="${basedir}" />
    12091198        <ant target="installer2app" />
    12101199        <delete dir="pkg-temp/osx" />
     
    12191208        <exec executable="python" failonerror="true">
    12201209            <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
    1221             <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" />
    1222             <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
     1210            <arg value="${basedir}/i2pinstall_${full.version}_osx-only.jar" />
     1211            <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app" />
    12231212        </exec>
    12241213        <exec executable="chmod" failonerror="true" osfamily="unix">
    12251214                <arg value="755" />
    1226                 <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
     1215                <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
    12271216        </exec>
    12281217        <exec executable="tar" osfamily="unix" failonerror="true">
     
    12301219                <arg value="--group=root" />
    12311220                <arg value="-cjvf" />
    1232                 <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx.tar.bz2" />
     1221                <arg value="${basedir}/i2pinstall_${full.version}_osx.tar.bz2" />
    12331222                <arg value="-C" />
    12341223                <arg value="${basedir}/pkg-temp/osx" />
    1235                 <arg value="i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
     1224                <arg value="i2p-${full.version}_osx-install.app" />
    12361225        </exec>
    12371226    </target>
    12381227
    1239     <!-- Yes, even though this makes an installer for Windows, we still need to depend on preppkg-unix (because the installer attempts to delete these files
    1240      and will fail if they don't exist. Thankfully these files are so very small there's not much harm in including them.
    1241     -->
    1242     <target name="installer-windows" depends="clean, doBuildEXE, preppkg-windows-only, preppkg-unix, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
     1228    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches" >
    12431229        <mkdir dir="pkg-temp/installer" />
    12441230        <!-- set if unset -->
     
    12681254            </manifest>
    12691255        </jar>
    1270         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
    1271         <delete dir="pkg-temp/win" />
     1256        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
     1257        <ant target="installerexe" />
     1258        <delete file="${basedir}/install.jar" />
     1259        <move file="${basedir}/i2pinstall.exe" tofile="${basedir}/i2pinstall_${full.version}_windows-only.exe" />
    12721260    </target>
    12731261
Note: See TracChangeset for help on using the changeset viewer.