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

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

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

Log Message:
-----------
Use the NSIS Ant task to build the Windows installer

Modified Paths:
--------------
    jetrix/trunk/build.xml

Added Paths:
-----------
    jetrix/trunk/lib/nsisant-1.2.jar

Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml	2008-09-02 10:49:12 UTC (rev 758)
+++ jetrix/trunk/build.xml	2008-09-02 13:51:51 UTC (rev 759)
@@ -269,6 +269,11 @@
 
   <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">
+      <os family="windows"/>
+    </condition>
+
     <!-- Build the windows executable file jetrix.exe -->
     <mkdir dir="${build}/bin"/>
     <copy todir="${build}/bin" filtering="true">
@@ -276,14 +281,14 @@
     </copy>
     <copy file="${src}/etc/icons/jetrix.ico" todir="${build}/bin"/>
 
-    <exec executable="C:\Program Files\NSIS\makensis.exe">
-      <arg line="${build}/bin/launcher.nsi"/>
-    </exec>
+    <nsis verbosity="3" script="${build}/bin/launcher.nsi" path="${nsis.home}">
+      <define name="OUT_DIR" value="${build}/bin"/>
+    </nsis>
 
     <!-- Build the installer -->
-    <exec executable="C:\Program Files\NSIS\makensis.exe">
-      <arg line="${build}/bin/installer.nsi"/>
-    </exec>
+    <nsis verbosity="3" script="${build}/bin/installer.nsi" path="${nsis.home}">
+      <define name="OUT_DIR" value="${build}/bin"/>
+    </nsis>
     <move file="${build}/bin/jetrix-${version}-installer.exe" todir="${dist}/bin"/>
 
   </target>


Property changes on: jetrix/trunk/lib/nsisant-1.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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