[jsword-svn] r1492 - in trunk: bibledesktop bibledesktop-web/src/web

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-07-09 16:40:38 -0700 (Mon, 09 Jul 2007)
New Revision: 1492

Modified:
   trunk/bibledesktop-web/src/web/download.html
   trunk/bibledesktop/build.xml
Log:
build windows installer on linux, mac and windows.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2007-07-09 22:10:32 UTC (rev 1491)
+++ trunk/bibledesktop/build.xml	2007-07-09 23:40:38 UTC (rev 1492)
@@ -80,7 +80,7 @@
         <patternset refid="external.runtime.jars"/>
         <patternset refid="internal.built.jars"/>
       </fileset>
-    </copy> 		
+    </copy>
     <signjar
           storepass="${keystore.pswd}"
           alias="${keystore.alias}"
@@ -112,7 +112,7 @@
 
   	<!-- Copy and filter to make it work -->
   	<copy file="${source.etc}/jnlp/bibledesktop.jnlp"
-          tofile="${target.installed}/bibledesktop-${release.version}.jnlp"
+          tofile="${target.installed}/bibledesktop.jnlp"
           filtering="true"
           preservelastmodified="true">
       <filterset>
@@ -139,6 +139,11 @@
   	<!-- 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"/>
+      </fileset>
+    </copy>
   </target>
 
   <target name="install.check">

Modified: trunk/bibledesktop-web/src/web/download.html
===================================================================
--- trunk/bibledesktop-web/src/web/download.html	2007-07-09 22:10:32 UTC (rev 1491)
+++ trunk/bibledesktop-web/src/web/download.html	2007-07-09 23:40:38 UTC (rev 1492)
@@ -31,7 +31,8 @@
       <td>Windows 95/98/98SE/ME<br/>NT/2000/XP/Vista Installer</td>
       <td>Just download to your desktop and run the program.
           If you don't have Java that's ok.
-          Our installer will get it for you.</td>
+          Our installer will get it for you.
+          <br/><br/>See note below if you are runing Vista.</td>
   </tr>
   <tr>
       <td><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0.7-bin.tar.gz"><img src="images/duke.png" width="40" height="36" border="0"/></a></td>
@@ -71,12 +72,25 @@
       <td>Just download and unzip, moving the application to the location of your choice.</td>
   </tr>
   <tr>
-      <td><a href="nightly/bibledesktop-1.0.7.jnlp"><img src="images/webstart.png" width="40" height="40" border="0"/></a></td>
+      <td><a href="nightly/BibleDesktopSetup.exe"><img src="images/win32.png" width="40" height="36" border="0"/></a></td>
+      <td>Windows 95/98/98SE/ME<br/>NT/2000/XP/Vista Installer</td>
+      <td>Just download to your desktop and run the program.
+          If you don't have Java that's ok.
+          Our installer will get it for you.
+          <br/><br/>See note below if you are runing Vista.</td>
+  </tr>
+  <tr>
+      <td><a href="nightly/bibledesktop.jnlp"><img src="images/webstart.png" width="40" height="40" border="0"/></a></td>
       <td>WebStart</td>
       <td>See below for note on WebStart</td>
   </tr>
 </table>
 
+<h2>Note on Windows Vista</h2>
+<p>
+  We are trying to fix the Vista problem of it repeatedly asking you permission to run BibleDesktop.
+</p>
+
 <h2>Note on WebStart</h2>
 <p>
   WebStart works on all platforms and does not require an active connection to the internet after the program