Changeset b2e8d3c for build.xml


Ignore:
Timestamp:
Jun 7, 2011 2:53:10 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
f5026a9
Parents:
57fc896
Message:

Here is the long awaited upgrade of the wrapper.

The aging v3.1.x of the java wrapper is being replaced in this
checkin with the latest (current) stable release, 3.5.9.

There is now only one copy of wrapper.jar, located in wrapper/all.
The build.xml scripts have been changed to reflect this new path.

All binaries—with the exception of solaris (I don't have
SPARC hardware)—have been stripped.

FreeBSD x64 is being included in this release.

I have only included the x86 macosx wrapper due to not having a
system to test the x64 code on. On the plus side, the wrapper is
universal (a FAT powerpc & Intel Mac) binary. No more prompting
to install Rosetta!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r57fc896 rb2e8d3c  
    338338                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    339339                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
    340                 <pathelement location="installer/lib/wrapper/win32/wrapper.jar" />
     340                <pathelement location="installer/lib/wrapper/all/wrapper.jar" />
    341341                <pathelement location="core/lib/junit.jar" />               
    342342            </classpath>
     
    435435            <fileset dir="installer/lib/wrapper/freebsd/" />
    436436        </copy>
     437        <copy todir="pkg-temp/lib/wrapper/freebsd64/">
     438            <fileset dir="installer/lib/wrapper/freebsd64" />
     439        </copy>
    437440        <copy todir="pkg-temp/lib/wrapper/macosx/">
    438441            <fileset dir="installer/lib/wrapper/macosx/" />
     
    455458        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    456459        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
     460        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    457461        <copy todir="pkg-temp/lib/wrapper/win32/">
    458462            <fileset dir="installer/lib/wrapper/win32/" />
     
    874878            <arg value="i2p.fba"/>
    875879            <arg value="-auxclasspath"/>
    876             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/linux/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
     880            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    877881            <arg value="-sourcepath"/>
    878882            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/"/>
     
    11801184                        <!--wrapper - dont even think about it. i2p cosumes appreantly more mem without it on win32-->
    11811185                <copy file="installer/lib/wrapper/win32/wrapper.dll" todir="pkg-temp/lib" />
    1182                 <copy file="installer/lib/wrapper/win32/wrapper.jar" todir="pkg-temp/lib" />
     1186                <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    11831187                <copy file="installer/lib/wrapper/win32/I2Psvc.exe" tofile="pkg-temp/i2psvc.ex_" />
    11841188                        <!--  copy the unpack/start batchfiles -->
Note: See TracChangeset for help on using the changeset viewer.