Skip to content

Commit

Permalink
Changed %~dp0 to %cd% processing for the following in batch versi…
Browse files Browse the repository at this point in the history
…on by default:

* `wpath` property
* `-unpack` key
  • Loading branch information
3F committed Jan 16, 2020
1 parent 3d90fa8 commit ca720ee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions embedded/exec.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ set args=%args: #__b_ECL## =!%

:found
call :core
call %msbuildexe% %$tpl.corevar$% /nologo /p:wpath="%~dp0/" /v:m /m:4 %args%
call %msbuildexe% %$tpl.corevar$% /nologo /p:wpath="%cd%/" /v:m /m:4 %args%

set "msbuildexe="
set ret=%ERRORLEVEL%
Expand All @@ -86,7 +86,7 @@ del /Q/F %$tpl.corevar$%
exit /B %ret%

:unpack
set $tpl.corevar$="%~dp0\%gntcore%"
set $tpl.corevar$="%cd%\%gntcore%"
echo Generating minified version in %$tpl.corevar$% ...

:core
Expand Down
5 changes: 4 additions & 1 deletion embedded/sha1.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ echo SHA-1 test has been started.

set msbuild="%~dp0\..\netmsb.bat"

call "%~dp0\gnt" -unpack || goto err
setlocal
cd "%~dp0"
call ".\gnt" -unpack || goto err
endlocal
call %msbuild% "%~dp0\sha1_comparer.targets" /p:core1="%~dp0\gnt.min.core" /p:core2="%~dp0\gnt.core" /nologo /v:m /m:4 || goto err

exit /B 0
Expand Down

0 comments on commit ca720ee

Please sign in to comment.