From c148c483a2b65a79e2f70ae862c612c8b4c3470c Mon Sep 17 00:00:00 2001 From: Colin Jones Date: Mon, 28 Nov 2011 19:18:32 -0600 Subject: [PATCH] Add resources to batch file classpath and clean up a bit --- script/repl.bat | 9 +++++---- script/run.bat | 9 +++++---- script/test.bat | 10 ++++++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/script/repl.bat b/script/repl.bat index e539881..cf3048c 100755 --- a/script/repl.bat +++ b/script/repl.bat @@ -1,13 +1,14 @@ @echo off setLocal EnableDelayedExpansion + set CLASSPATH=" -for /R ./lib %%a in (*.jar) do ( - set CLASSPATH=!CLASSPATH!;%%a +for %%j in (".\lib\*.jar") do ( + set CLASSPATH=!CLASSPATH!;%%~fj ) set CLASSPATH=!CLASSPATH!" -set CLASSPATH=%CLASSPATH%;src +set CLASSPATH=%CLASSPATH%;src;resources set JLINE=jline.ConsoleRunner -java -Xmx1G -cp "%CLASSPATH%" %JLINE% clojure.main +java -Xmx1G -cp %CLASSPATH% %JLINE% clojure.main diff --git a/script/run.bat b/script/run.bat index afeb605..1f7e10e 100755 --- a/script/run.bat +++ b/script/run.bat @@ -1,11 +1,12 @@ @echo off setLocal EnableDelayedExpansion + set CLASSPATH=" -for /R ./lib %%a in (*.jar) do ( - set CLASSPATH=!CLASSPATH!;%%a +for %%j in (".\lib\*.jar") do ( + set CLASSPATH=!CLASSPATH!;%%~fj ) set CLASSPATH=!CLASSPATH!" -set CLASSPATH=%CLASSPATH%;src +set CLASSPATH=%CLASSPATH%;src;resources -java -Xmx1G -cp "%CLASSPATH%" clojure.main -i script\run.clj +java -Xmx1G -cp %CLASSPATH% clojure.main script\run.clj diff --git a/script/test.bat b/script/test.bat index 1299515..2037779 100755 --- a/script/test.bat +++ b/script/test.bat @@ -1,9 +1,11 @@ @echo off setLocal EnableDelayedExpansion + set CLASSPATH=" -for /R ./lib %%a in (*.jar) do ( - set CLASSPATH=!CLASSPATH!;%%a +for %%j in (".\lib\*.jar") do ( + set CLASSPATH=!CLASSPATH!;%%~fj ) set CLASSPATH=!CLASSPATH!" -set CLASSPATH=%CLASSPATH%;src -java -Xmx1G -cp "%CLASSPATH%" clojure.main -i script\test.clj +set CLASSPATH=%CLASSPATH%;src;resources + +java -Xmx1G -cp %CLASSPATH% clojure.main script\test.clj