Allow DOS batch files to work from any directory

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-1@392463 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: b9e58cfce5

bin/jmeter-n.bat

@@ -34,10 +34,6 @@ pause
 goto END
 :WinNT
 
-rem Change to directory containing this file, which must be in bin
-echo Changing to JMeter home directory
-cd /D %~dp0
-
 rem Check file is supplied
 if a == a%1 goto winNT2
 rem Check it has extension .jmx
@@ -48,6 +44,7 @@ pause
 goto :EOF
 :winNT3
 
-jmeter -n -t %1 -l %~dpn1.jtl
+rem use same directory to find jmeter script
+%~dp0jmeter -n -t %1 -l %~dpn1.jtl
 
 :END

bin/jmeter-t.bat

@@ -32,9 +32,8 @@ pause
 goto END
 :WinNT
 
-rem change to the directory in which this script resides, i.e. bin
-cd /D %~dp0
+rem Prepend the directory in which this script resides in case not on path
 
-jmeter -t %1
+%~dp0jmeter -t %1
 
 :END

bin/jmeter.bat

@@ -33,8 +33,9 @@ rem Need to check if we are using the 4NT shell...
 if "%eval[2+2]" == "4" goto setup4NT
 
 if exist jmeter.bat goto winNT1
-echo Changing to JMeter home directory
-cd /D %~dp0
+if .%JM_BIN% == . set JM_BIN=%~dp0
+
+echo Setting JMeter bin directory to %JM_BIN%
 
 :winNT1
 rem On NT/2K grab all arguments at once
@@ -88,4 +89,4 @@ rem set DDRAW=%DDRAW% -Dsun.java2d.ddscale=true
 rem Collect the settings defined above
 set ARGS=%HEAP% %NEW% %SURVIVOR% %TENURING% %EVACUATION% %RMIGC% %PERM% %DEBUG% %DDRAW%
 
-%JM_START% %JM_LAUNCH% %JVM_ARGS% %ARGS% -jar ApacheJMeter.jar %JMETER_CMD_LINE_ARGS%
+%JM_START% %JM_LAUNCH% %JVM_ARGS% %ARGS% -jar %JM_BIN%ApacheJMeter.jar %JMETER_CMD_LINE_ARGS%

xdocs/changes.xml

@@ -75,6 +75,7 @@ Users must explicitly check append in the sampler</li>
 <li>The Post-Processor "Save Responses to a File" now saves the generated file name with the
 sample, and the file name can be included in the sample log file.
 </li>
+<li>Change jmeter DOS batch scripts so they work from any directory (except jmeter-server.bat)</li>
 </ul>
 
 <h4>Bug fixes:</h4>