Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Commit

Permalink
Merge pull request #513 from paxtonhare/fix-jar-on-windows
Browse files Browse the repository at this point in the history
#509 - fixing jar creation on windows. Updated ml.bat to allow jruby …
  • Loading branch information
dmcassel committed Sep 16, 2015
2 parents a007c9c + eec7174 commit 16d82a7
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions ml.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

set RUBYFOUND=
for %%e in (%PATHEXT%) do (
for %%X in (jruby%%e) do (
if not defined RUBYFOUND (
set RUBYFOUND=%%~$PATH:X
)
)
for %%X in (ruby%%e) do (
if not defined RUBYFOUND (
set RUBYFOUND=%%~$PATH:X
Expand Down Expand Up @@ -150,7 +155,7 @@ goto end
goto :loop2
)

ruby -Ideploy -Ideploy\lib -Ideploy\test deploy\test\test_main.rb
%RUBYFOUND% -Ideploy -Ideploy\lib -Ideploy\test deploy\test\test_main.rb

REM Restore original env variable value
set ROXY_TEST_SERVER_VERSION=%ROXY_TEST_SERVER_VERSION_ORG%
Expand All @@ -159,7 +164,7 @@ goto end

:rubydeployer
if NOT EXIST deploy\lib\ml.rb GOTO missingdeploy
ruby -Ideploy -Ideploy\lib deploy\lib\ml.rb %*
%RUBYFOUND% -Ideploy -Ideploy\lib deploy\lib\ml.rb %*
goto end

:missingdeploy
Expand Down

0 comments on commit 16d82a7

Please sign in to comment.