[jsword-svn] r1190 - in trunk: bibledesktop bibledesktop/etc/installer/win32 bibledesktop-web/src/web/stable jsword-web/src/web

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2006-11-18 08:29:41 -0700 (Sat, 18 Nov 2006)
New Revision: 1190

Modified:
   trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
   trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
   trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
   trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
   trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
   trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
   trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
   trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
   trunk/bibledesktop-web/src/web/stable/jsword-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
   trunk/bibledesktop/ReleaseInstructions.txt
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
   trunk/jsword-web/src/web/passage.html
Log:
Preparing for 1.0.5 release

Modified: trunk/bibledesktop/ReleaseInstructions.txt
===================================================================
--- trunk/bibledesktop/ReleaseInstructions.txt	2006-11-18 13:22:36 UTC (rev 1189)
+++ trunk/bibledesktop/ReleaseInstructions.txt	2006-11-18 15:29:41 UTC (rev 1190)
@@ -26,8 +26,10 @@
 Re-execute the ant if any files changed.
 
 Step 4: Build the Windows installer
-Right click on bibledesktop/etc/installer/win32/BibleDesktop.nsi and compile the NSIS script.
-(You need to be in Windows with NSIS installed)
+Right click on bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi and compile the NSIS script.
+You need to be in Windows with NSIS installed.
+This installer also requires the InetLoad plugin available here:
+	http://nsis.sourceforge.net/InetLoad
 Verify that the installer works.
 You can perform part of step 7 now.
 

Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2006-11-18 13:22:36 UTC (rev 1189)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2006-11-18 15:29:41 UTC (rev 1190)
@@ -8,8 +8,8 @@
 !define CLASS "org.crosswire.bibledesktop.desktop.Desktop"
 !define JAVALIB "$EXEDIR"
 
-!define JRE_VERSION "1.4.2"
-!define JRE_URL "http://dlc.sun.com/jdk/j2re-1_4_2_07-windows-i586-p.exe"
+!define JRE_VERSION "1.5.0"
+!define JRE_URL "http://dlc.sun.com/jdk/jre-1_5_0_01-windows-i586-p.exe"
 
 SetCompressor lzma
 

Modified: trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jsword-1.0.5.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.5.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.5.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
===================================================================
(Binary files differ)

Modified: trunk/jsword-web/src/web/passage.html
===================================================================
--- trunk/jsword-web/src/web/passage.html	2006-11-18 13:22:36 UTC (rev 1189)
+++ trunk/jsword-web/src/web/passage.html	2006-11-18 15:29:41 UTC (rev 1190)
@@ -117,6 +117,7 @@
 <p>
 It is perfectly valid to write a range consisting of adjacent numbers as a Non-Contiguous Reference,
 e.g. Gen 1:4,5.
+</p>
 <h3>Passage Punctuation</h3>
 <p>
 In a passage, punctuation has the following meaning: