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

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-03-30 20:03:43 -0700 (Fri, 30 Mar 2007)
New Revision: 1269

Added:
   trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.6.dmg
Removed:
   trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.5.dmg
Modified:
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_de.jnlp
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_fa.jnlp
   trunk/bibledesktop/ReleaseInstructions.txt
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
   trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
Log:
Windows and Mac Installers for v 1.0.6

Modified: trunk/bibledesktop/ReleaseInstructions.txt
===================================================================
--- trunk/bibledesktop/ReleaseInstructions.txt	2007-03-30 21:12:25 UTC (rev 1268)
+++ trunk/bibledesktop/ReleaseInstructions.txt	2007-03-31 03:03:43 UTC (rev 1269)
@@ -30,6 +30,7 @@
 You need to be in Windows with NSIS installed.
 This installer also requires the InetLoad plugin available here:
 	http://nsis.sourceforge.net/InetLoad
+	Out of that zip file, copy inetload.dll to the NSIS/plugins directory.
 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	2007-03-30 21:12:25 UTC (rev 1268)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2007-03-31 03:03:43 UTC (rev 1269)
@@ -48,12 +48,13 @@
   ; Use the following for USB/CD installs
   ;StrCpy $0 '"$R0" -classpath "$R1" -Djsword.home="$EXEDIR\JSword" -Dsword.home="$EXEDIR\.." ${CLASS}'
 
-;ClearErrors
-;FileOpen $1 $EXEDIR\java.log w
-;IfErrors done
-;FileWrite $1 $0
-;FileClose $1
-;done:
+  ; The following is for debugging
+  ClearErrors
+  FileOpen $1 $EXEDIR\java.log w
+  IfErrors done
+  FileWrite $1 $0
+  FileClose $1
+  done:
 
   SetOutPath $EXEDIR
   Exec $0
@@ -72,6 +73,7 @@
   StrCpy $R0 ""
   
   ; Iterate over all the jar files in JAVALIB
+  ClearErrors
   FindFirst $R1 $R2 "$JavaLib\*.jar"
   ${Unless} ${Errors}
     ${Do}

Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi	2007-03-30 21:12:25 UTC (rev 1268)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi	2007-03-31 03:03:43 UTC (rev 1269)
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0.5"
+!define PRODUCT_VERSION "1.0.6"
 !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"

Deleted: trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.5.dmg
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.6.dmg
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.6.dmg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp	2007-03-30 21:12:25 UTC (rev 1268)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6.jnlp	2007-03-31 03:03:43 UTC (rev 1269)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/release" href="bibledesktop-1.0.6.jnlp">
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.6.jnlp">
 
   <information>
     <title>Bible Desktop v.1.0.6</title>

Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_de.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_de.jnlp	2007-03-30 21:12:25 UTC (rev 1268)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_de.jnlp	2007-03-31 03:03:43 UTC (rev 1269)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/release" href="bibledesktop-1.0.6_de.jnlp">
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.6_de.jnlp">
 
   <information>
     <title>Bible Desktop v.1.0.6</title>

Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_fa.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_fa.jnlp	2007-03-30 21:12:25 UTC (rev 1268)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.6_fa.jnlp	2007-03-31 03:03:43 UTC (rev 1269)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/release" href="bibledesktop-1.0.6_fa.jnlp">
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.6_fa.jnlp">
 
   <information>
     <title>Bible Desktop v.1.0.6</title>