Convert install.xml to use new utility.jar Main.main()

(ticket #912)
This commit is contained in:
zzz
2013-04-20 19:03:38 +00:00
parent 4976e52389
commit 0c22af9578

View File

@@ -145,26 +145,28 @@
<!-- postinstall stuff for windows --> <!-- postinstall stuff for windows -->
<!-- Wrapper for 32bit Windows JVM --> <!-- Wrapper for 32bit Windows JVM -->
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Copy" type="jar"
stage="postinstall" stage="postinstall"
keep="true" keep="true"
failure="warn" failure="warn"
condition="!is64bit"> condition="!is64bit">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="copy" />
<arg value="$INSTALL_PATH\lib\wrapper\win32\I2Psvc.exe" /> <arg value="$INSTALL_PATH\lib\wrapper\win32\I2Psvc.exe" />
<arg value="$INSTALL_PATH" /> <arg value="$INSTALL_PATH" />
</args> </args>
</executable> </executable>
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Copy" type="jar"
stage="postinstall" stage="postinstall"
keep="true" keep="true"
failure="warn" failure="warn"
condition="!is64bit"> condition="!is64bit">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="copy" />
<arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" /> <arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" />
<arg value="$INSTALL_PATH\lib" /> <arg value="$INSTALL_PATH\lib" />
</args> </args>
@@ -172,26 +174,28 @@
<!-- wrapper for 64bit Windows JVM --> <!-- wrapper for 64bit Windows JVM -->
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Copy" type="jar"
stage="postinstall" stage="postinstall"
keep="true" keep="true"
failure="warn" failure="warn"
condition="is64bit"> condition="is64bit">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="copy" />
<arg value="$INSTALL_PATH\lib\wrapper\win64\I2Psvc.exe" /> <arg value="$INSTALL_PATH\lib\wrapper\win64\I2Psvc.exe" />
<arg value="$INSTALL_PATH" /> <arg value="$INSTALL_PATH" />
</args> </args>
</executable> </executable>
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Copy" type="jar"
stage="postinstall" stage="postinstall"
keep="true" keep="true"
failure="warn" failure="warn"
condition="is64bit"> condition="is64bit">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="copy" />
<arg value="$INSTALL_PATH\lib\wrapper\win64\wrapper.dll" /> <arg value="$INSTALL_PATH\lib\wrapper\win64\wrapper.dll" />
<arg value="$INSTALL_PATH\lib" /> <arg value="$INSTALL_PATH\lib" />
</args> </args>
@@ -203,13 +207,14 @@
nothing breaks. nothing breaks.
--> -->
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Copy" type="jar"
stage="postinstall" stage="postinstall"
keep="true" keep="true"
failure="warn" failure="warn"
condition="is64bit"> condition="is64bit">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="copy" />
<arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" /> <arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" />
<arg value="$INSTALL_PATH\lib\wrapper-windows-x86-32.dll" /> <arg value="$INSTALL_PATH\lib\wrapper-windows-x86-32.dll" />
</args> </args>
@@ -217,20 +222,22 @@
<!-- workaround for bad default path for wrapper.log in Windows. --> <!-- workaround for bad default path for wrapper.log in Windows. -->
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.FixWinPaths" type="jar"
stage="postinstall" keep="true"> stage="postinstall" keep="true">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="fixwinpaths" />
<arg value="$INSTALL_PATH\wrapper.config" /> <arg value="$INSTALL_PATH\wrapper.config" />
</args> </args>
</executable> </executable>
<!-- Now we'll get rid of the UNIX-only stuff --> <!-- Now we'll get rid of the UNIX-only stuff -->
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Delete" type="jar"
stage="postinstall" keep="true" failure="warn"> stage="postinstall" keep="true" failure="warn">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="delete" />
<arg value="$INSTALL_PATH\i2prouter" /> <arg value="$INSTALL_PATH\i2prouter" />
<arg value="$INSTALL_PATH\install_i2p_service_unix" /> <arg value="$INSTALL_PATH\install_i2p_service_unix" />
<arg value="$INSTALL_PATH\install-headless.txt" /> <arg value="$INSTALL_PATH\install-headless.txt" />
@@ -262,20 +269,22 @@
</executable> </executable>
<!-- else delete it --> <!-- else delete it -->
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Delete" type="jar"
stage="postinstall" keep="true" failure="warn" condition="izpack.windowsinstall.xp|izpack.windowsinstall.2003"> stage="postinstall" keep="true" failure="warn" condition="izpack.windowsinstall.xp|izpack.windowsinstall.2003">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="delete" />
<arg value="$INSTALL_PATH\fixperms.bat" /> <arg value="$INSTALL_PATH\fixperms.bat" />
</args> </args>
</executable> </executable>
<!-- <!--
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Exec" type="jar"
stage="postinstall" keep="true" failure="warn"> stage="postinstall" keep="true" failure="warn">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="exec" />
<arg value="$INSTALL_PATH" /> <arg value="$INSTALL_PATH" />
<arg value="$INSTALL_PATH\I2Psvc.exe" /> <arg value="$INSTALL_PATH\I2Psvc.exe" />
<arg value="-c" /> <arg value="-c" />
@@ -293,10 +302,11 @@
This, however, works fine. This, however, works fine.
--> -->
<executable targetfile="$INSTALL_PATH/utility.jar" <executable targetfile="$INSTALL_PATH/utility.jar"
type="jar" class="net.i2p.installer.Delete" type="jar"
stage="postinstall" keep="false" failure="warn"> stage="postinstall" keep="false" failure="warn">
<os family="windows" /> <os family="windows" />
<args> <args>
<arg value="delete" />
<arg value="$INSTALL_PATH/utility.jar" /> <arg value="$INSTALL_PATH/utility.jar" />
</args> </args>
</executable> </executable>