[jsword-svn] r1494 - in trunk/bibledesktop: . etc/installer/win32

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-07-09 17:14:17 -0700 (Mon, 09 Jul 2007)
New Revision: 1494

Modified:
   trunk/bibledesktop/build.xml
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
   trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
Log:
build windows installer on linux, mac and windows.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2007-07-09 23:52:35 UTC (rev 1493)
+++ trunk/bibledesktop/build.xml	2007-07-10 00:14:17 UTC (rev 1494)
@@ -137,13 +137,24 @@
     </fixcrlf>
 
   	<!-- Build the Windows installers from the installed/signed jars -->
-  	<nsis verbosity="4" script="${source.etc}/installer/win32/BibleDesktop.nsi"/>
-  	<nsis verbosity="4" script="${source.etc}/installer/win32/BibleDesktopSetup.nsi"/>
-    <copy todir="${target.installed}" preservelastmodified="true">
-      <fileset dir="${source.etc}/installer/win32">
-        <include name="**/*.exe"/>
+  	<copy todir="${target.installed}" preservelastmodified="true">
+      <fileset dir="${target.jar}">
+        <patternset refid="external.runtime.jars"/>
+        <patternset refid="internal.built.jars"/>
       </fileset>
     </copy>
+  	<copy todir="${target.installed}"
+          filtering="true"
+          preservelastmodified="true">
+      <fileset dir="${target.jar}">
+        <include name="*.nsi"/>
+      </fileset>
+      <filterset>
+        <filter token="release.version" value="${release.version}"/>
+      </filterset>
+    </copy>
+  	<nsis verbosity="4" script="${target.installed}/BibleDesktop.nsi"/>
+  	<nsis verbosity="4" script="${target.installed}/BibleDesktopSetup.nsi"/>
   </target>
 
   <target name="install.check">

Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2007-07-09 23:52:35 UTC (rev 1493)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2007-07-10 00:14:17 UTC (rev 1494)
@@ -4,7 +4,7 @@
 !include LogicLib.nsh
 
 !define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0.7"
+!define PRODUCT_VERSION "@release.version@"
 !define CLASS "org.crosswire.bibledesktop.desktop.Desktop"
 
 !define JRE_VERSION "1.5.0"

Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi	2007-07-09 23:52:35 UTC (rev 1493)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi	2007-07-10 00:14:17 UTC (rev 1494)
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0.7"
+!define PRODUCT_VERSION "@release.version@"
 !define PRODUCT_PUBLISHER "Crosswire Bible Society"
 !define PRODUCT_WEB_SITE "http://www.crosswire.org/bibledesktop/index.html"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
@@ -61,7 +61,7 @@
   ; remove all previous jars
   Delete   /REBOOTOK $INSTDIR\*.jar
   ; use the signed jars for Vista's sake
-  File ..\..\..\target\installed\*.jar
+  File *.jar
 SectionEnd
 
 Section -AdditionalIcons