[jetrix-cvs] SF.net SVN: jetrix:[760] jetrix/trunk

[<sm...@us...>]

Revision: 760
          http://jetrix.svn.sourceforge.net/jetrix/?rev=760&view=rev
Author:   smanux
Date:     2008-09-02 15:15:27 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
The Windows installer is now buildable on Linux
Slight improvement of the Windows installer compression

Modified Paths:
--------------
    jetrix/trunk/build.xml
    jetrix/trunk/src/bin/installer.nsi
    jetrix/trunk/src/bin/launcher.nsi

Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml	2008-09-02 13:51:51 UTC (rev 759)
+++ jetrix/trunk/build.xml	2008-09-02 15:15:27 UTC (rev 760)
@@ -270,7 +270,7 @@
   <target name="dist.win" depends="deploy" description="Build the Windows installer">
 
     <taskdef name="nsis" classname="net.sf.nsisant.Task" classpath="lib/nsisant-1.2.jar"/>
-    <condition property="nsis.home" value="C:\Program Files\NSIS">
+    <condition property="nsis.home" value="C:\Program Files\NSIS" else="/usr/bin">
       <os family="windows"/>
     </condition>
 

Modified: jetrix/trunk/src/bin/installer.nsi
===================================================================
--- jetrix/trunk/src/bin/installer.nsi	2008-09-02 13:51:51 UTC (rev 759)
+++ jetrix/trunk/src/bin/installer.nsi	2008-09-02 15:15:27 UTC (rev 760)
@@ -10,7 +10,7 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 !define BASE_PATH "..\.."
 
-SetCompressor lzma
+SetCompressor /SOLID lzma
 
 ; MUI 1.67 compatible ------
 !include "MUI.nsh"

Modified: jetrix/trunk/src/bin/launcher.nsi
===================================================================
--- jetrix/trunk/src/bin/launcher.nsi	2008-09-02 13:51:51 UTC (rev 759)
+++ jetrix/trunk/src/bin/launcher.nsi	2008-09-02 15:15:27 UTC (rev 760)
@@ -11,6 +11,7 @@
 Caption "Jetrix TetriNET Server"
 Icon "jetrix.ico"
 OutFile "jetrix.exe"
+SetCompressor lzma
 
 SilentInstall silent
 AutoCloseWindow true
@@ -68,6 +69,7 @@
         
  JreFound:
   Pop $R1
+  MessageBox MB_ICONEXCLAMATION|MB_YESNO 'exec: $R0' IDNO +2
   Exch $R0
 
 FunctionEnd


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.