loveisgrief/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrapper: Update to wrapper 3.5.29

Browse Source 
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)
This commit is contained in:
zzz
2016-05-04 13:40:50 +00:00
parent 13685484f6
commit cdafab2734
27 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build.xml
View File

@@ -1035,6 +1035,12 @@
<copy todir="pkg-temp/lib/wrapper/solaris/">
<fileset dir="installer/lib/wrapper/solaris/" excludes="*.txt" />
</copy>
<!-- Force using the new wrapper.jar.
The new jar with the old windows binaries will output a warning on windows.
We do not generate release files from this target.
See preppkg-windows-only target below.
-->
<copy overwrite="true" file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
</target>
<target name="preppkg-nowindows" depends="preppkg-linux, preppkg-freebsd, preppkg-osx, jbigi-nowindows">
@@ -1139,7 +1145,6 @@
<copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
<copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
<copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
<copy file="build/utility.jar" todir="pkg-temp" />
<copy todir="pkg-temp/lib/wrapper/win32/">
<fileset dir="installer/lib/wrapper/win32/" excludes="*.txt" />
@@ -1151,7 +1156,13 @@
<target name="preppkg-windows-only" depends="preppkg-windows, jbigi-windows-only">
<copy file="build/jbigi.jar" todir="pkg-temp/lib" />
<!-- Win binaries are down-rev from the others, so use the old jar.
This will not overwrite, so preppkg (for all OSes) will get the new jar with
the old binaries, which will probably work but will output a warning.
The windows-only installer will get the correct jar.
<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
-->
<copy overwrite="true" file="installer/lib/wrapper/win-all/wrapper.jar" todir="pkg-temp/lib" />
</target>
<!-- see targets below for conditional copying -->