You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/06/16 17:16:25 UTC

[4/4] git commit: setlocal and fixes for stress and sstablemetadata bat files patch by Holger Hoffstatte and jbellis for CASSANDRA-4344

setlocal and fixes for stress and sstablemetadata bat files
patch by Holger Hoffstatte and jbellis for CASSANDRA-4344


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a21307a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a21307a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a21307a2

Branch: refs/heads/trunk
Commit: a21307a2778db4e9e3b48d8c37ac4cc0d998a811
Parents: f74ed12
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Jun 16 10:03:15 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Jun 16 10:03:15 2012 -0500

----------------------------------------------------------------------
 tools/bin/cassandra-stress.bat |   10 +++++++---
 tools/bin/sstablemetadata.bat  |    2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a21307a2/tools/bin/cassandra-stress.bat
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stress.bat b/tools/bin/cassandra-stress.bat
index 78e8dbb..288b8fe 100644
--- a/tools/bin/cassandra-stress.bat
+++ b/tools/bin/cassandra-stress.bat
@@ -15,12 +15,16 @@
 
 @echo off
 
+setlocal
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\..
-if NOT DEFINED STRESS_HOME set STRESS_HOME=%CD%
+if NOT DEFINED STRESS_HOME set STRESS_HOME=%CD%\..
+
+@REM Include the build\classes\main directory so it works in development
+set CLASSPATH="%CASSANDRA_HOME%\build\classes\stress";"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
 
-set CLASSPATH="%STRESS_HOME%\..\lib\*.jar"
+for %%i in ("%STRESS_HOME%\lib\*.jar") do call :append "%%i"
 for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-    set CLASSPATH=%CLASSPATH%;"%%i"
 goto start
 
 :append

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a21307a2/tools/bin/sstablemetadata.bat
----------------------------------------------------------------------
diff --git a/tools/bin/sstablemetadata.bat b/tools/bin/sstablemetadata.bat
index 2b945ec..bf06bca 100644
--- a/tools/bin/sstablemetadata.bat
+++ b/tools/bin/sstablemetadata.bat
@@ -15,6 +15,8 @@
 
 @echo off
 
+setlocal
+
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\..
 
 set CLASSPATH=""