From 8e7fc7e3d4934ffbb7c080c129b264e6db963ea9 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 28 Aug 2015 15:07:35 -0400
Subject: Windows: Fix variable manipulation errors in run.bat

---
 tools/run.bat | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/run.bat b/tools/run.bat
index 007126d..7e737da 100644
--- a/tools/run.bat
+++ b/tools/run.bat
@@ -1,4 +1,8 @@
 @echo off
+:: Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights
+:: reserved. Use of this source code is governed by a BSD-style license
+:: that can be found in the LICENSE file.
+
 set RC=
 setlocal
 cd ..
@@ -21,17 +25,24 @@ set ERRORLEVEL=1
 goto end
 )
 
-set OUT_PATH=".\out\%1"
-set LIB_PATH="%OUT_PATH%\%2"
-set CLS_PATH=".\third_party\jogamp\jar\*;%OUT_PATH%"
-set RUN_TYPE="%3"
+set OUT_PATH=.\out\%~1
+set LIB_PATH=%OUT_PATH%\%~2
+set CLS_PATH=.\third_party\jogamp\jar\*;%OUT_PATH%
+set RUN_TYPE=%~3
 
 :: Remove the first three params (%1, %2 and %3) and pass the rest to java.
+set RESTVAR=
+shift
 shift
 shift
+:loop1
+if "%1"=="" goto after_loop
+set RESTVAR=%RESTVAR% %1
 shift
+goto loop1
+:after_loop
 
-java -cp %CLS_PATH% -Djava.library.path=%LIB_PATH% tests.%RUN_TYPE%.MainFrame %*
+java -cp %CLS_PATH% -Djava.library.path=%LIB_PATH% tests.%RUN_TYPE%.MainFrame %RESTVAR%
 
 :end
 endlocal & set RC=%ERRORLEVEL%
-- 
cgit v1.2.3