[jsword-svn] r1081 - trunk/bibledesktop/etc/bin

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2006-04-09 15:53:42 -0700 (Sun, 09 Apr 2006)
New Revision: 1081

Added:
   trunk/bibledesktop/etc/bin/BibleDesktop.bat
   trunk/bibledesktop/etc/bin/BibleDesktop.sh
Removed:
   trunk/bibledesktop/etc/bin/jsword.bat
   trunk/bibledesktop/etc/bin/jsword.sh
Log:
preparing for 1.0.2 release

Copied: trunk/bibledesktop/etc/bin/BibleDesktop.bat (from rev 1018, trunk/bibledesktop/etc/bin/jsword.bat)

Copied: trunk/bibledesktop/etc/bin/BibleDesktop.sh (from rev 1018, trunk/bibledesktop/etc/bin/jsword.sh)

Deleted: trunk/bibledesktop/etc/bin/jsword.bat
===================================================================
--- trunk/bibledesktop/etc/bin/jsword.bat	2006-04-09 22:51:13 UTC (rev 1080)
+++ trunk/bibledesktop/etc/bin/jsword.bat	2006-04-09 22:53:42 UTC (rev 1081)
@@ -1,34 +0,0 @@
-
-REM STEP 1 - Initial setup
-REM @echo off
-if "%OS%"=="Windows_NT" @setlocal
-
-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
-:DoneFindJSword
-echo "Using JSWORD=%JSWORD%"
-
-REM STEP 3 - Setup the classpath
-set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%JSWORD%\*.jar") do call "%JSWORD%\lcp.bat" %%i
-
-REM STEP 4 - Run JSword
-REM -Xmx256M
-REM "-Djava.endorsed.dirs=%JSWORD%\lib"
-REM -classpath "%JSWORD%\resource"
-"%JAVA_HOME%\bin\java.exe" -classpath "%LOCALCLASSPATH%" 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"
-
-:End
-set LOCALCLASSPATH=
-set _JAVACMD=
-if "%OS%"=="Windows_NT" @endlocal

Deleted: trunk/bibledesktop/etc/bin/jsword.sh
===================================================================
--- trunk/bibledesktop/etc/bin/jsword.sh	2006-04-09 22:51:13 UTC (rev 1080)
+++ trunk/bibledesktop/etc/bin/jsword.sh	2006-04-09 22:53:42 UTC (rev 1081)
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Parts of this file were derived from the ant startup script for unix.
-# Copyright (c) 2001-2003 The Apache Software Foundation.
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home   
-           fi
-           ;;
-esac
-
-if [ -z "$JSWORD" ] ; then
-  ## resolve links - $0 may be a link to jsword's home
-  PRG="$0"
-  progname=`basename "$0"`
-  saveddir=`pwd`
-
-  # need this for relative symlinks
-  dirname_prg=`dirname "$PRG"`
-  cd "$dirname_prg"
-  
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '.*/.*' > /dev/null; then
-	PRG="$link"
-    else
-	PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-
-  JSWORD=`dirname "$PRG"`
-
-  cd "$saveddir"
-
-  # make it fully qualified
-  JSWORD=`cd "$JSWORD" && pwd`
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$JSWORD" ] &&
-    JSWORD=`cygpath --unix "$JSWORD"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-if [ -z "$JAVACMD" ] ; then 
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then 
-        JAVACMD=java
-    fi
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-if [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH="$CLASSPATH"
-fi
-
-# This is redundant if we are using the endorsed.dirs method
-for i in "${JSWORD}/"*.jar
-do
-  # if the directory is empty, then it will return the input string
-  # this is stupid, so case for it
-  if [ -f "$i" ] ; then
-    if [ -z "$LOCALCLASSPATH" ] ; then
-      LOCALCLASSPATH="$i"
-    else
-      LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
-    fi
-  fi
-done
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  JSWORD=`cygpath --windows "$JSWORD"`
-  JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
-  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
-  CYGHOME=`cygpath --windows "$HOME"`
-fi
-
-# "-Djava.endorsed.dirs=${JSWORD}/lib"
-# -classpath "${JSWORD}/resource"
-"$JAVACMD" -classpath "${LOCALCLASSPATH}" org.crosswire.bibledesktop.desktop.Desktop