Ignore:
Timestamp:
Jun 10, 2011 2:53:59 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
4e99c45
Parents:
cbaa62d (diff), 162c5bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '14e8f430d97e8e6a9926d59299775ca98d590c8d'

and '2b3daf42c48bc7b83cfa015b1dba87538ee2f8db'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installer/install.xml

    rcbaa62d r2c0e6a3  
    131131            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
    132132           
     133            <conditions>
     134                <condition type="variable" id="is64bit">
     135                    <name>SYSTEM_sun_arch_data_model</name>
     136                    <value>64</value>
     137                </condition>
     138            </conditions>
    133139            <!-- postinstall stuff for windows -->
     140            <!-- Wrapper for 32bit Windows JVM -->
    134141            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    135142                <args><arg value="$INSTALL_PATH\lib\wrapper\win32\I2Psvc.exe" /><arg value="$INSTALL_PATH" /></args></executable>
    136143            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    137144                <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
     145            <!-- wrapper for 64bit Windows JVM -->
     146            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
     147                condition="is64bit" > <os family="windows" />
     148                <args><arg value="$INSTALL_PATH\lib\wrapper\win64\I2Psvc.exe" /><arg value="$INSTALL_PATH" /></args></executable>
     149            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
     150                condition="is64bit" > <os family="windows" />
     151                <args><arg value="$INSTALL_PATH\lib\wrapper\win64\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
     152            <!-- Arch-indep wrapper.jar on Windows -->
    138153            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    139                 <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.jar" /><arg value="$INSTALL_PATH\lib" /></args></executable>
     154                <args><arg value="$INSTALL_PATH\lib\wrapper\all\wrapper.jar" /><arg value="$INSTALL_PATH\lib" /></args></executable>
    140155            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    141156                <args><arg value="$INSTALL_PATH\i2prouter" /></args></executable>
     
    148163            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    149164                <args><arg value="$INSTALL_PATH\postinstall.sh" /></args></executable>
    150             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    151                 <args><arg value="$INSTALL_PATH\postinstall.bat" /></args></executable>
    152165            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    153166                <args><arg value="$INSTALL_PATH\uninstall_i2p_service_unix" /></args></executable>
Note: See TracChangeset for help on using the changeset viewer.