[jsword-svn] r1125 - in trunk: bibledesktop/etc/installer/win32 bibledesktop-web/src/web/stable
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sun Aug 27 14:56:17 MST 2006
Author: dmsmith
Date: 2006-08-27 14:53:55 -0700 (Sun, 27 Aug 2006)
New Revision: 1125
Added:
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp
trunk/bibledesktop-web/src/web/stable/jsword-1.0.4.jar
trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.4.jar
trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.4.jar
Removed:
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jar
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp
trunk/bibledesktop-web/src/web/stable/jsword-1.0.3.jar
trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.3.jar
trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.3.jar
Modified:
trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat
trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh
trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
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/lucene-core-2.0.0.jar
trunk/bibledesktop/etc/installer/win32/BibleDesktop.exe
trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.exe
trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
Log:
Preparing for 1.0.4 release
Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktop.exe
===================================================================
(Binary files differ)
Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi 2006-08-27 21:46:45 UTC (rev 1124)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi 2006-08-27 21:53:55 UTC (rev 1125)
@@ -4,7 +4,7 @@
!include LogicLib.nsh
!define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0"
+!define PRODUCT_VERSION "1.0.4"
!define CLASS "org.crosswire.bibledesktop.desktop.Desktop"
!define JAVALIB "$EXEDIR"
Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.exe
===================================================================
(Binary files differ)
Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi 2006-08-27 21:46:45 UTC (rev 1124)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi 2006-08-27 21:53:55 UTC (rev 1125)
@@ -2,7 +2,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0.3"
+!define PRODUCT_VERSION "1.0.4"
!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"
@@ -59,7 +59,7 @@
; remove all previous jars
Delete /REBOOTOK $INSTDIR\*.jar
; use the unsigned jars
- File ..\..\target\uninstalled\*.jar
+ File ..\..\..\target\uninstalled\*.jar
SectionEnd
Section -AdditionalIcons
Modified: trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat
===================================================================
--- trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat 2006-08-27 21:46:45 UTC (rev 1124)
+++ trunk/bibledesktop-web/src/web/stable/BibleDesktop.bat 2006-08-27 21:53:55 UTC (rev 1125)
@@ -3,17 +3,22 @@
REM @echo off
if "%OS%"=="Windows_NT" @setlocal
+REM Win98 does not define ProgramFiles, XP, 2000, do...
+if "%ProgramFiles%"=="" set ProgramFiles="C:\Program~1"
+
REM STEP 2 - Check we know where we are installed
set DEFAULT_JSWORD=%~dp0
if "%JSWORD%"=="" set JSWORD=%DEFAULT_JSWORD%
set DEFAULT_JSWORD=
if exist "%JSWORD%" goto DoneFindJSword
REM have a blind guess ...
-if not exist "C:\Progra~1\JSword" goto FailedFindJSword
-set JSWORD=C:\Progra~1\JSword
+if not exist "%ProgramFiles%\CrossW~1\BibleD~1" goto FailedFindJSword
+set JSWORD=%ProgramFiles%\CrossW~1\BibleD~1
:DoneFindJSword
echo "Using JSWORD=%JSWORD%"
+cd %JSWORD%
+
REM STEP 3 - Setup the classpath
set LOCALCLASSPATH=%CLASSPATH%
for %%i in ("%JSWORD%\*.jar") do call "%JSWORD%\lcp.bat" %%i
@@ -22,11 +27,11 @@
REM -Xmx256M
REM "-Djava.endorsed.dirs=%JSWORD%\lib"
REM -classpath "%JSWORD%\resource"
-"%JAVA_HOME%\bin\java.exe" -classpath "%LOCALCLASSPATH%" org.crosswire.bibledesktop.desktop.Desktop
+"%JAVA_HOME%\bin\java.exe" -classpath "%LOCALCLASSPATH%" -Dsword.home="%SWORD_HOME%" org.crosswire.bibledesktop.desktop.Desktop
goto End
:FailedFindJSword
-echo "Can't find install directory. Please use C:\Progra~1\JSword or set the JSWORD variable"
+echo "Can't find install directory. Please use C:\Program Files\CrossWire\BibleDesktop or set the JSWORD variable"
:End
set LOCALCLASSPATH=
Modified: trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
===================================================================
(Binary files differ)
Modified: trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh
===================================================================
--- trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh 2006-08-27 21:46:45 UTC (rev 1124)
+++ trunk/bibledesktop-web/src/web/stable/BibleDesktop.sh 2006-08-27 21:53:55 UTC (rev 1125)
@@ -43,6 +43,8 @@
JSWORD=`cd "$JSWORD" && pwd`
fi
+cd $JSWORD
+
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$JSWORD" ] &&
Modified: trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
===================================================================
(Binary files differ)
Deleted: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jar
===================================================================
(Binary files differ)
Deleted: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp 2006-08-27 21:46:45 UTC (rev 1124)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.3.jnlp 2006-08-27 21:53:55 UTC (rev 1125)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.3.jnlp">
-
- <information>
- <title>Bible Desktop v.1.0.3</title>
- <vendor>Crosswire Bible Society</vendor>
- <homepage href="http://www.crosswire.org/bibledesktop"/>
- <description>Bible Desktop - Bible Study Software based on the Sword project</description>
- <description kind="short">Bible Desktop is a Bible study package available over the internet</description>
- <description kind="tooltip">Bible Desktop Application</description>
- <icon href="icon32.gif"/>
- <icon kind="splash" href="icon64.gif"/>
- <offline-allowed/>
- <shortcut online="false">
- <desktop/>
- <menu submenu="Bible Desktop"/>
- </shortcut>
- </information>
-
- <security>
- <!--
- We need disk io to read installed Sword Bibles,
- network access to install new ones, and the ability to read system vars
- I'm not sure there is much point in asking for less that everything
- -->
- <all-permissions/>
- </security>
-
- <resources>
- <j2se version="1.4+"/>
- <jar href="bibledesktop-1.0.3.jar"/>
- <jar href="jsword-1.0.3.jar"/>
- <jar href="jsword-common-1.0.3.jar"/>
- <jar href="jsword-common-swing-1.0.3.jar"/>
- <jar href="javatar-2.5.jar"/>
- <jar href="jdom-1.0.jar"/>
- <jar href="commons-codec-1.3.jar"/>
- <jar href="commons-httpclient-3.0.1.jar"/>
- <jar href="commons-logging-1.1.jar"/>
- <jar href="commons-net-1.4.1.jar"/>
- <jar href="lucene-core-2.0.0.jar"/>
- <jar href="jlfgr-1_0.jar"/>
- <property name="apple.laf.useScreenMenuBar" value="true"/>
- <property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
- </resources>
-
- <application-desc main-class="org.crosswire.bibledesktop.desktop.Desktop"/>
-
-</jnlp>
Added: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp 2006-08-27 21:46:45 UTC (rev 1124)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp 2006-08-27 21:53:55 UTC (rev 1125)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.4.jnlp">
+
+ <information>
+ <title>Bible Desktop v.1.0.4</title>
+ <vendor>Crosswire Bible Society</vendor>
+ <homepage href="http://www.crosswire.org/bibledesktop"/>
+ <description>Bible Desktop - Bible Study Software based on the Sword project</description>
+ <description kind="short">Bible Desktop is a Bible study package available over the internet</description>
+ <description kind="tooltip">Bible Desktop Application</description>
+ <icon href="icon32.gif"/>
+ <icon kind="splash" href="icon64.gif"/>
+ <offline-allowed/>
+ <shortcut online="false">
+ <desktop/>
+ <menu submenu="Bible Desktop"/>
+ </shortcut>
+ </information>
+
+ <security>
+ <!--
+ We need disk io to read installed Sword Bibles,
+ network access to install new ones, and the ability to read system vars
+ I'm not sure there is much point in asking for less that everything
+ -->
+ <all-permissions/>
+ </security>
+
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="bibledesktop-1.0.4.jar"/>
+ <jar href="jsword-1.0.4.jar"/>
+ <jar href="jsword-common-1.0.4.jar"/>
+ <jar href="jsword-common-swing-1.0.4.jar"/>
+ <jar href="javatar-2.5.jar"/>
+ <jar href="jdom-1.0.jar"/>
+ <jar href="commons-codec-1.3.jar"/>
+ <jar href="commons-httpclient-3.0.1.jar"/>
+ <jar href="commons-logging-1.1.jar"/>
+ <jar href="commons-net-1.4.1.jar"/>
+ <jar href="lucene-core-2.0.0.jar"/>
+ <jar href="jlfgr-1_0.jar"/>
+ <property name="apple.laf.useScreenMenuBar" value="true"/>
+ <property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
+ </resources>
+
+ <application-desc main-class="org.crosswire.bibledesktop.desktop.Desktop"/>
+
+</jnlp>
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)
Deleted: trunk/bibledesktop-web/src/web/stable/jsword-1.0.3.jar
===================================================================
(Binary files differ)
Added: trunk/bibledesktop-web/src/web/stable/jsword-1.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-1.0.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.3.jar
===================================================================
(Binary files differ)
Added: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.3.jar
===================================================================
(Binary files differ)
Added: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
===================================================================
(Binary files differ)
More information about the jsword-svn
mailing list