Skip to content

Commit

Permalink
Merge pull request #2602 from Jojo-Schmitz/vtest
Browse files Browse the repository at this point in the history
fix vtest for Windows
  • Loading branch information
lasconic committed May 16, 2016
2 parents fe7fde1 + 7fceba4 commit 3aa52cd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
3 changes: 2 additions & 1 deletion vtest/gen
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

if [ "`uname`" = 'Darwin' ]; then
MSCORE=../../build.xcode/mscore/Debug/mscore.app/Contents/MacOS/mscore
Expand Down Expand Up @@ -58,6 +58,7 @@ fi
DPI=130

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
mkdir -p $DIR/html
cd $DIR/html

if test -f LOG; then
Expand Down
13 changes: 4 additions & 9 deletions vtest/gen.bat
Expand Up @@ -38,17 +38,12 @@ cd html

set JSON_FILE=vtestjob.json

FOR /D %%a IN (%SRC%) DO set LAST=%%A

echo [ >> %JSON_FILE%
FOR /D %%a IN (%SRC%) DO (
if /I NOT %%a==%LAST% (
echo { "in": "..\\%%a.mscz", "out": "%%a.png"}, >> %JSON_FILE%
) else (
echo { "in": "..\\%%a.mscz", "out": "%%a.png"} >> %JSON_FILE%
)
echo { "in": "..\\%%a.mscz", "out": "%%a.png"}, >> %JSON_FILE%

)
echo ] >> %JSON_FILE%
echo {}] >> %JSON_FILE%

..\%MSCORE% -j %JSON_FILE% -r %DPI%

Expand All @@ -59,7 +54,7 @@ FOR /D %%a IN (%SRC%) DO (

xcopy ..\style.css . /Q > nul

IF EXIST %F% del /q %F% >
IF EXIST %F% del /q %F% > nul

echo ^<html^> >> %F%
echo ^<head^> >> %F%
Expand Down

0 comments on commit 3aa52cd

Please sign in to comment.