db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r535039 - in /db/derby/code/trunk/bin: NetworkServerControl.bat dblook.bat derby_common.bat ij.bat startNetworkServer.bat stopNetworkServer.bat sysinfo.bat
Date Fri, 04 May 2007 00:31:08 GMT
Author: fuzzylogic
Date: Thu May  3 17:31:07 2007
New Revision: 535039

URL: http://svn.apache.org/viewvc?view=rev&rev=535039
Log:
DERBY-2501: Windows batch scripts should not report extraneous errors.

Original patch by John H. Embretsen <john.embretsen@sun.com>

Modified:
    db/derby/code/trunk/bin/NetworkServerControl.bat
    db/derby/code/trunk/bin/dblook.bat
    db/derby/code/trunk/bin/derby_common.bat
    db/derby/code/trunk/bin/ij.bat
    db/derby/code/trunk/bin/startNetworkServer.bat
    db/derby/code/trunk/bin/stopNetworkServer.bat
    db/derby/code/trunk/bin/sysinfo.bat

Modified: db/derby/code/trunk/bin/NetworkServerControl.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/NetworkServerControl.bat?view=diff&rev=535039&r1=535038&r2=535039
==============================================================================
--- db/derby/code/trunk/bin/NetworkServerControl.bat (original)
+++ db/derby/code/trunk/bin/NetworkServerControl.bat Thu May  3 17:31:07 2007
@@ -19,6 +19,8 @@
 
 CALL "%~dp0derby_common.bat" %*
 
+if "%_JAVACMD%"=="" goto end
+
 if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
 if not "%CLASSPATH%"=="" goto runWithClasspath
 

Modified: db/derby/code/trunk/bin/dblook.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/dblook.bat?view=diff&rev=535039&r1=535038&r2=535039
==============================================================================
--- db/derby/code/trunk/bin/dblook.bat (original)
+++ db/derby/code/trunk/bin/dblook.bat Thu May  3 17:31:07 2007
@@ -19,6 +19,8 @@
 
 CALL "%~dp0derby_common.bat" %*
 
+if "%_JAVACMD%"=="" goto end
+
 if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
 if not "%CLASSPATH%"=="" goto runWithClasspath
 

Modified: db/derby/code/trunk/bin/derby_common.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/derby_common.bat?view=diff&rev=535039&r1=535038&r2=535039
==============================================================================
--- db/derby/code/trunk/bin/derby_common.bat (original)
+++ db/derby/code/trunk/bin/derby_common.bat Thu May  3 17:31:07 2007
@@ -50,9 +50,10 @@
 rem check the value of DERBY_HOME
 if exist "%DERBY_HOME%\lib\derby.jar" goto setLocalClassPath
 
-:noAntHome
-echo DERBY_HOME is set incorrectly or derby.jar could not be located. Please set DERBY_HOME.
-goto end
+:noDerbyHome
+echo DERBY_HOME is set incorrectly or derby.jar could not be located. 
+echo Please set the DERBY_HOME environment variable to the path where you installed Derby.
+goto endcommon
 
 :setLocalClassPath
 set LOCALCLASSPATH=%DERBY_HOME%/lib/derby.jar;%DERBY_HOME%/lib/derbynet.jar;%DERBY_HOME%/lib/derbyclient.jar;%DERBY_HOME%/lib/derbytools.jar

Modified: db/derby/code/trunk/bin/ij.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/ij.bat?view=diff&rev=535039&r1=535038&r2=535039
==============================================================================
--- db/derby/code/trunk/bin/ij.bat (original)
+++ db/derby/code/trunk/bin/ij.bat Thu May  3 17:31:07 2007
@@ -19,6 +19,8 @@
 
 CALL "%~dp0derby_common.bat" %*
 
+if "%_JAVACMD%"=="" goto end
+
 if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
 if not "%CLASSPATH%"=="" goto runWithClasspath
 

Modified: db/derby/code/trunk/bin/startNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/startNetworkServer.bat?view=diff&rev=535039&r1=535038&r2=535039
==============================================================================
--- db/derby/code/trunk/bin/startNetworkServer.bat (original)
+++ db/derby/code/trunk/bin/startNetworkServer.bat Thu May  3 17:31:07 2007
@@ -19,6 +19,8 @@
 
 CALL "%~dp0derby_common.bat" %*
 
+if "%_JAVACMD%"=="" goto end
+
 if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
 if not "%CLASSPATH%"=="" goto runWithClasspath
 

Modified: db/derby/code/trunk/bin/stopNetworkServer.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/stopNetworkServer.bat?view=diff&rev=535039&r1=535038&r2=535039
==============================================================================
--- db/derby/code/trunk/bin/stopNetworkServer.bat (original)
+++ db/derby/code/trunk/bin/stopNetworkServer.bat Thu May  3 17:31:07 2007
@@ -19,6 +19,8 @@
 
 CALL "%~dp0derby_common.bat" %*
 
+if "%_JAVACMD%"=="" goto end
+
 if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
 if not "%CLASSPATH%"=="" goto runWithClasspath
 

Modified: db/derby/code/trunk/bin/sysinfo.bat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/sysinfo.bat?view=diff&rev=535039&r1=535038&r2=535039
==============================================================================
--- db/derby/code/trunk/bin/sysinfo.bat (original)
+++ db/derby/code/trunk/bin/sysinfo.bat Thu May  3 17:31:07 2007
@@ -19,6 +19,8 @@
 
 CALL "%~dp0derby_common.bat" %*
 
+if "%_JAVACMD%"=="" goto end
+
 if "%_USE_CLASSPATH%"=="no" goto runNoClasspath
 if not "%CLASSPATH%"=="" goto runWithClasspath
 



Mime
View raw message