[jsword-svn] r1891 - trunk/bibledesktop

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2008-07-22 10:13:18 -0700 (Tue, 22 Jul 2008)
New Revision: 1891

Modified:
   trunk/bibledesktop/build.xml
Log:
Restore NSIS build for the release.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2008-07-09 12:15:15 UTC (rev 1890)
+++ trunk/bibledesktop/build.xml	2008-07-22 17:13:18 UTC (rev 1891)
@@ -12,9 +12,7 @@
   <property name="gener.root"        value="${target.root}/gener"/>
 
   <property name="support.tools" value="../jsword-support/tools"/>
-  <!-- Temporarily remove 
   <import file="${support.tools}/nsis/build.xml"/>
-  -->
 
   <!--=======================================================================-->
   <target name="testcompile.extra">
@@ -30,9 +28,8 @@
   </target>
 
   <!--=======================================================================-->
-  <!-- was depends "build, keygen, install.check, nsis" -->
   <target name="install"
-          depends="build, keygen, install.check"
+          depends="build, keygen, install.check, nsis"
           unless="install.uptodate"
           description="Prepares for web based jnlp deploy">
 
@@ -140,7 +137,6 @@
     </fixcrlf>
 
   	<!-- Build the Windows installers from the installed/signed jars -->
-    <!-- Figure out how to make this conditional on the availability of makensis
   	<copy todir="${target.installed}"
           filtering="true"
           preservelastmodified="true">
@@ -164,7 +160,6 @@
     <delete file="${target.installed}/BibleDesktop.nsi"/>
     <delete file="${target.installed}/PortableBibleDesktop.nsi"/>
     <delete file="${target.installed}/BibleDesktopSetup.nsi"/>
-    -->
   </target>
 
   <target name="install.check">