rename var for more clarity

This commit is contained in:
Anatol Belski
2016-11-16 19:44:02 +01:00
parent c84a5d8303
commit 2849ea89a8
4 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ if "%PHP_SDK_ARCH%"=="x64" (
)
echo Visual C++: %PHP_SDK_VC:~2%
echo PHP-SDK path: %PHP_SDK_PATH%
echo PHP-SDK path: %PHP_SDK_ROOT_PATH%
exit /b
+3 -3
View File
@@ -6,11 +6,11 @@ set PHP_SDK_BIN_PATH=%~dp0
rem remove trailing slash
set PHP_SDK_BIN_PATH=%PHP_SDK_BIN_PATH:~0,-1%
for %%a in ("%PHP_SDK_BIN_PATH%") do set PHP_SDK_PATH=%%~dpa
for %%a in ("%PHP_SDK_BIN_PATH%") do set PHP_SDK_ROOT_PATH=%%~dpa
rem remove trailing slash
set PHP_SDK_PATH=%PHP_SDK_PATH:~0,-1%
set PHP_SDK_ROOT_PATH=%PHP_SDK_ROOT_PATH:~0,-1%
set PHP_SDK_MSYS2_PATH=%PHP_SDK_PATH%\msys2\usr\bin
set PHP_SDK_MSYS2_PATH=%PHP_SDK_ROOT_PATH%\msys2\usr\bin
set PHP_SDK_PHP_CMD=%PHP_SDK_BIN_PATH%\php\do_php.bat
set PATH=%PHP_SDK_BIN_PATH%;%PHP_SDK_MSYS2_PATH%;%PATH%
+1 -1
View File
@@ -8,7 +8,7 @@ if "%PHP_SDK_PHP_CMD%"=="" (
)
)
%PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_PATH') . '\\VERSION');"
%PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_ROOT_PATH') . '\\VERSION');"
exit /b
+2 -2
View File
@@ -177,10 +177,10 @@ class Config
public static function getSdkPath()
{/*{{{*/
$path = getenv("PHP_SDK_PATH");
$path = getenv("PHP_SDK_ROOT_PATH");
if (!$path) {
throw new Exception("PHP_SDK_PATH isn't set!");
throw new Exception("PHP_SDK_ROOT_PATH isn't set!");
}
$path = realpath($path);