From 7a8f512603fe8c01fc5c9a43dfb6de76514f9f28 Mon Sep 17 00:00:00 2001 From: Jentsch Date: Thu, 7 Nov 2013 19:22:37 +0100 Subject: [PATCH] Removing JavaC dependency in *.bat javac is never used in batch script and a normal project should depend on it during runtime. --- .../typesafe/sbt/packager/archetypes/bat-template | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/bat-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/bat-template index 2109120fc..243040fce 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/bat-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/bat-template @@ -1,6 +1,6 @@ @REM @@APP_NAME@@ launcher script @REM -@REM Envioronment: +@REM Environment: @REM JAVA_HOME - location of a JDK home dir (optional if java on path) @REM CFG_OPTS - JVM options (optional) @REM Configuration: @@ -45,22 +45,9 @@ for /F %%j in ('"%_JAVACMD%" -version 2^>^&1') do ( if %%~j==Java set JAVAINSTALLED=1 ) -rem Detect the same thing about javac -if "%_JAVACCMD%"=="" ( - if not "%JAVA_HOME%"=="" ( - if exist "%JAVA_HOME%\bin\javac.exe" set "_JAVACCMD=%JAVA_HOME%\bin\javac.exe" - ) -) -if "%_JAVACCMD%"=="" set _JAVACCMD=javac -for /F %%j in ('"%_JAVACCMD%" -version 2^>^&1') do ( - if %%~j==javac set JAVACINSTALLED=1 -) - rem BAT has no logical or, so we do it OLD SCHOOL! Oppan Redmond Style set JAVAOK=true if not defined JAVAINSTALLED set JAVAOK=false -rem TODO - JAVAC is an optional requirement. -if not defined JAVACINSTALLED set JAVAOK=false if "%JAVAOK%"=="false" ( echo.