Changeset fcbee9d9


Ignore:
Timestamp:
Nov 12, 2011 1:55:46 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
66f25e8
Parents:
624badf
Message:
  • Installer: Fix Ukrainian translation (ticket #550) thx rndnick
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r624badf rfcbee9d9  
    226226        <ant target="doBuildEXE" />
    227227    </target>
     228
     229    <taskdef name="launch4j"
     230             classname="net.sf.launch4j.ant.Launch4jTask"
     231             classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
     232
    228233    <target name="doBuildEXE" depends="buildProperties" unless="noExe">
    229234        <jar destfile="./build/launchi2p.jar">
     
    236241        </jar>
    237242        <!-- now the standalone launcher exe -->
    238         <taskdef name="launch4j"
    239                  classname="net.sf.launch4j.ant.Launch4jTask"
    240                  classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
    241243        <launch4j configFile="./installer/i2pstandalone.xml" />
    242244        <!-- thazzit -->
     
    472474    <target name="clean" depends="pkgclean" >
    473475        <delete dir="./build" />
     476        <delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" />     
    474477        <delete file="i2pinstall.exe" failonerror="false" quiet="true" />       
    475478        <delete file="i2p.exe" failonerror="false" quiet="true" />
     
    486489        <delete file="debian/substvars"/>
    487490    </target>
     491
    488492    <target name="distclean" depends="clean">
    489493        <delete includeemptydirs="true" failonerror="false" >
     
    952956    </target>
    953957
    954     <target name="installer" depends="preppkg, buildProperties, util-list-changes" >
    955         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     958    <taskdef name="izpack"
     959             classpath="${basedir}/installer/lib/izpack/patches.jar:${basedir}/installer/lib/izpack/standalone-compiler.jar"
     960             classname="com.izforge.izpack.ant.IzPackTask" />
     961
     962    <target name="izpack-patches" >
     963        <jar destfile="${basedir}/installer/lib/izpack/patches.jar"
     964             basedir="${basedir}/installer/lib/izpack/patches" />
     965    </target>
     966
     967    <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches" >
    956968        <mkdir dir="pkg-temp/installer" />
    957969        <!-- set if unset -->
     
    9941006        <ant target="installerexe" />
    9951007    </target>
     1008
    9961009    <target name="installerexe">
    9971010        <condition property="noExe">
     
    10111024        <ant target="doInstallerEXE" />
    10121025    </target>
     1026
    10131027    <target name="doInstallerEXE" unless="noExe">
    10141028        <!-- now the installer exe -->
    1015         <taskdef name="launch4j"
    1016                  classname="net.sf.launch4j.ant.Launch4jTask"
    1017                  classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
    10181029        <launch4j configFile="./installer/i2pinstaller.xml" />
    10191030        <launch4j configFile="./installer/i2pstandalone.xml" />
     
    10231034    <!-- Custom installers -->
    10241035
    1025     <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes" >
    1026         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     1036    <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    10271037        <mkdir dir="pkg-temp/installer" />
    10281038        <!-- set if unset -->
     
    10311041    </target>
    10321042
    1033     <target name="installer-linux" depends="clean, preppkg-linux-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes" >
    1034         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     1043    <target name="installer-linux" depends="clean, preppkg-linux-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    10351044        <mkdir dir="pkg-temp/installer" />
    10361045        <!-- set if unset -->
     
    10401049
    10411050
    1042     <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes">
    1043         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     1051    <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches">
    10441052        <mkdir dir="pkg-temp/installer" />
    10451053        <mkdir dir="pkg-temp/osx" />
     
    10801088     and will fail if they don't exist. Thankfully these files are so very small there's not much harm in including them.
    10811089    -->
    1082     <target name="installer-windows" depends="clean, doBuildEXE, preppkg-windows-only, preppkg-unix, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes" >
    1083         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     1090    <target name="installer-windows" depends="clean, doBuildEXE, preppkg-windows-only, preppkg-unix, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    10841091        <mkdir dir="pkg-temp/installer" />
    10851092        <!-- set if unset -->
  • history.txt

    r624badf rfcbee9d9  
     12011-11-12 zzz
     2  * Installer: Fix Ukrainian translation (ticket #550) thx rndnick
     3
     42011-11-11 zzz
     5  * Console:
     6    - Less magic and fix img sizes, for speed and less artifacts while rendering
     7    - CSS tweaks
     8
    192011-11-09 zzz
    210  * Console: Add ability to hide news
  • router/java/src/net/i2p/router/RouterVersion.java

    r624badf rfcbee9d9  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 1;
     21    public final static long BUILD = 2;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.