[jsword-svn] r1491 - in trunk: bibledesktop jsword-support/tools/nsis

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-07-09 15:10:32 -0700 (Mon, 09 Jul 2007)
New Revision: 1491

Modified:
   trunk/bibledesktop/build.xml
   trunk/jsword-support/tools/nsis/build.xml
Log:
build windows installer on linux, mac and windows.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2007-07-09 22:01:55 UTC (rev 1490)
+++ trunk/bibledesktop/build.xml	2007-07-09 22:10:32 UTC (rev 1491)
@@ -137,8 +137,8 @@
     </fixcrlf>
 
   	<!-- Build the Windows installers from the installed/signed jars -->
-  	<nsis script="${source.etc}/installer/win32/BibleDesktop.nsi"/>
-  	<nsis script="${source.etc}/installer/win32/BibleDesktopSetup.nsi"/>
+  	<nsis verbosity="4" script="${source.etc}/installer/win32/BibleDesktop.nsi"/>
+  	<nsis verbosity="4" script="${source.etc}/installer/win32/BibleDesktopSetup.nsi"/>
   </target>
 
   <target name="install.check">

Modified: trunk/jsword-support/tools/nsis/build.xml
===================================================================
--- trunk/jsword-support/tools/nsis/build.xml	2007-07-09 22:01:55 UTC (rev 1490)
+++ trunk/jsword-support/tools/nsis/build.xml	2007-07-09 22:10:32 UTC (rev 1491)
@@ -6,6 +6,11 @@
   <!-- this should be overridden by the parent file -->
   <property name="support.tools" value=".."/>
 
+  <!-- Make the ant task visible -->
+  <taskdef name="nsis" classname="net.sf.nsisant.Task">
+    <classpath location="${support.tools}/${support.nsis}/nsisant-${version.nsis}/nsisant-${version.nsis}.jar"/>
+  </taskdef>
+
   <!-- the only purpose of this is to provide a useful diagnostic. -->
   <target name="nsis">
     <echo>NSIS may fail if nsisant.jar is not visible to Ant and makensis is not in your path.
@@ -17,8 +22,8 @@
 
   <!-- This does not need to be done in Eclipse. Add it to Ant preferences instead -->
   <target name="nsis.antlibs" description="Copy required jars to ant/lib">
-    <echo message="copy ${basedir}/${support.nsis}/nsis-${version.nsis}/nsis-${version.nsis}.jar"/>
-    <copy file="${support.tools}/${support.nsis}/nsis-${version.nsis}/nsis-${version.nsis}.jar" todir="${ant.home}/lib"/>
+    <echo message="copy ${basedir}/${support.nsis}/nsisant-${version.nsis}/nsisant-${version.nsis}.jar"/>
+    <copy file="${support.tools}/${support.nsis}/nsisant-${version.nsis}/nsisant-${version.nsis}.jar" todir="${ant.home}/lib"/>
   </target>
 
 </project>