Changeset b2e8d3c


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!

Files:
9 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • apps/desktopgui/build.xml

    r57fc896 rb2e8d3c  
    3030            <classpath>
    3131                <pathelement location="../../core/java/build/i2p.jar" />
    32                 <!-- doesn't matter if we're not on win32, we just need the java classes, not the platform-dependent code -->
    33                 <pathelement location="../../installer/lib/wrapper/win32/wrapper.jar" />
     32                <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
    3433                <pathelement location="../../router/java/build/router.jar" />
    3534            </classpath>
  • apps/routerconsole/java/build.xml

    r57fc896 rb2e8d3c  
    2626                <pathelement location="../../systray/java/lib/systray4j.jar" />
    2727                <pathelement location="../../desktopgui/build" />
    28                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
     28                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    2929                <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
    3030            </classpath>
     
    5858                <pathelement location="../../systray/java/lib/systray4j.jar" />
    5959                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    60                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
     60                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    6161                <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
    6262            </classpath>
     
    212212                <pathelement location="../../systray/java/lib/systray4j.jar" />
    213213                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    214                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" />
     214                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    215215                <pathelement location="build/routerconsole.jar" />
    216216                <pathelement location="build/" />
     
    244244                <pathelement location="../../systray/java/lib/systray4j.jar" />
    245245                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    246                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" />
     246                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    247247                <pathelement location="build/routerconsole.jar" />
    248248                <pathelement location="build" />
  • 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 -->
  • installer/resources/postinstall.bat

    r57fc896 rb2e8d3c  
    2222copy "%INSTALL_PATH%lib\wrapper\win32\I2Psvc.exe" "%INSTALL_PATH%"
    2323copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.dll" "%INSTALL_PATH%lib"
    24 copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.jar" "%INSTALL_PATH%lib"
     24copy "%INSTALL_PATH%lib\wrapper\all\wrapper.jar" "%INSTALL_PATH%lib"
    2525
    2626if "%OS%"=="Windows_NT" (
  • installer/resources/postinstall.sh

    r57fc896 rb2e8d3c  
    1717fi
    1818
    19 chmod 744 ./i2prouter
    20 # chmod 744 ./install_i2p_service_unix
    21 chmod 744 ./osid
    22 chmod 744 ./runplain.sh
    23 # chmod 744 ./uninstall_i2p_service_unix
     19chmod 755 ./i2prouter
     20# chmod 755 ./install_i2p_service_unix
     21chmod 755 ./osid
     22chmod 755 ./runplain.sh
     23# chmod 755 ./uninstall_i2p_service_unix
    2424
    2525ERROR_MSG="Cannot determine operating system type. From the subdirectory in lib/wrapper matching your operating system, please move i2psvc to your base I2P directory, and move the remaining two files to the lib directory."
     
    3333
    3434OS_ARCH=`uname -m`
    35 X86_64=`echo "$OS_ARCH" | grep x86_64`
     35X86_64=`echo "${OS_ARCH}" | grep x86_64`
    3636
    3737case $HOST_OS in
     
    3939        if [ "X$X86_64" = "X" ]; then
    4040            wrapperpath="./lib/wrapper/linux"
    41             cp $wrapperpath/libwrapper.so ./lib/
     41            cp ${wrapperpath}/libwrapper.so ./lib/
    4242        else
    4343            wrapperpath="./lib/wrapper/linux64"
    44             cp $wrapperpath/libwrapper.so ./lib
     44            cp ${wrapperpath}/libwrapper.so ./lib
    4545        fi
    4646        ;;
    4747    freebsd )
    48         wrapperpath="./lib/wrapper/freebsd"
    49         cp $wrapperpath/libwrapper.so ./lib/
     48        if [ ! `uname -m |grep amd64` ]; then
     49            wrapperpath="./lib/wrapper/freebsd"
     50            cp ${wrapperpath}/libwrapper.so ./lib/
     51        else
     52            wrapperpath="./lib/wrapper/freebsd64"
     53            cp ${wrapperpath}/libwrapper.so ./lib/
     54        fi
    5055        ;;
    5156    osx )
    5257        wrapperpath="./lib/wrapper/macosx"
    53         cp $wrapperpath/libwrapper.jnilib ./lib/
     58        cp ${wrapperpath}/libwrapper.jnilib ./lib/
    5459        ;;
    5560    solaris )
    5661        wrapperpath="./lib/wrapper/solaris"
    57         cp $wrapperpath/libwrapper.so ./lib/
     62        cp ${wrapperpath}/libwrapper.so ./lib/
    5863        ;;
    5964    * )
    60         echo "$ERROR_MSG"
     65        echo "${ERROR_MSG}"
    6166        exit 1
    6267        ;;
    6368esac
    6469
    65 cp $wrapperpath/wrapper.jar ./lib/
     70#cp $wrapperpath/wrapper.jar ./lib/
    6671cp $wrapperpath/i2psvc .
    67 chmod 744 ./eepget
    68 chmod 744 ./i2psvc
     72chmod 755 ./eepget
     73chmod 755 ./i2psvc
    6974rm -rf ./icons
    7075rm -rf ./lib/wrapper
Note: See TracChangeset for help on using the changeset viewer.