Changeset cdafab27 for build.xml


Ignore:
Timestamp:
May 4, 2016 1:40:50 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0839b46
Parents:
1368548
Message:

Wrapper: Update to wrapper 3.5.29
All binaries from Tanuki delta pack,
except for armhf, compiled on Raspberry Pi:

ant 1.8.2
javac 1.6.0_38
gcc 4.6.3-14+rpi1

Windows binaries remain unchanged as we must recompile them ourselves
(32 bit just to change the icon; 64 bit is not provided by Tanuki)
Old 3.5.25 wrapper.jar moved to win-all, use it in windows-only installer
so it will be consistent with the old binaries.
Fixes wrapper failure on FreeBSD 10 (ticket #1118)
Minor i2prouter script fixes for FreeBSD 10, from anonimal (ticket #1118)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r1368548 rcdafab27  
    10361036            <fileset dir="installer/lib/wrapper/solaris/" excludes="*.txt" />
    10371037        </copy>
     1038     <!-- Force using the new wrapper.jar.
     1039          The new jar with the old windows binaries will output a warning on windows.
     1040          We do not generate release files from this target.
     1041          See preppkg-windows-only target below.
     1042      -->
     1043        <copy overwrite="true" file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    10381044    </target>
    10391045
     
    11401146        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    11411147        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
    1142         <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    11431148        <copy file="build/utility.jar" todir="pkg-temp" />
    11441149        <copy todir="pkg-temp/lib/wrapper/win32/">
     
    11521157    <target name="preppkg-windows-only" depends="preppkg-windows, jbigi-windows-only">
    11531158        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     1159     <!-- Win binaries are down-rev from the others, so use the old jar.
     1160          This will not overwrite, so preppkg (for all OSes) will get the new jar with
     1161          the old binaries, which will probably work but will output a warning.
     1162          The windows-only installer will get the correct jar.
    11541163        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
     1164      -->
     1165        <copy overwrite="true" file="installer/lib/wrapper/win-all/wrapper.jar" todir="pkg-temp/lib" />
    11551166    </target>
    11561167
Note: See TracChangeset for help on using the changeset viewer.