Skip to content

Commit e52492d

Browse files
committed
ADD: pre defined folders.
FIX: restore the path before the building. FIX: readme.md about php-devel-pack.
1 parent 5c21ab5 commit e52492d

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

_ready.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ if %1 == begin (
1414
set BUILD_PATH=%~dp0
1515
set BUILD_PATH=%BUILD_PATH:~0,-1%
1616
set PHP_SDK_PATH=%BUILD_PATH%\php-sdk
17-
set PHP_EXT_SDK_PATH=%BUILD_PATH%\php-sdk-ext
17+
set PHP_DEVEL_PACK_PATH=%BUILD_PATH%\php-devel-pack
1818
set PHP_SRC_PATH=%BUILD_PATH%\php-src
19-
set INCLUDE=%VC_TOOLS_PATH%\include;%WIN_SDK_PATH%\Include\%WIN_SDK_VERSION%\shared;%WIN_SDK_PATH%\Include\%WIN_SDK_VERSION%\ucrt;%WIN_SDK_PATH%\Include\%WIN_SDK_VERSION%\um
19+
set INCLUDE=%VC_TOOLS_PATH%\include;%WIN_SDK_PATH%\Include\%WIN_SDK_VERSION%\shared;%WIN_SDK_PATH%\Include\%WIN_SDK_VERSION%\ucrt;%WIN_SDK_PATH%\Include\%WIN_SDK_VERSION%\um;%PHP_DEVEL_PACK_PATH%\include
2020
set LIB=%VC_TOOLS_PATH%\lib\x64;%WIN_SDK_PATH%\Lib\%WIN_SDK_VERSION%\um\x64;%WIN_SDK_PATH%\Lib\%WIN_SDK_VERSION%\ucrt\x64
2121
set ORIGN_PATH=%path%
2222

2323
set path=%PATH%;%VC_TOOLS_PATH%\bin\HostX64\x64
2424
set path=%PATH%;%WIN_SDK_PATH%\bin\%WIN_SDK_VERSION%\x64
2525
set path=%PATH%;%PHP_SDK_PATH%;%PHP_SDK_PATH%\bin;%PHP_SDK_PATH%\msys2\usr\bin
26-
set path=%PATH%;%PHP_EXT_SDK_PATH%
26+
set path=%PATH%;%PHP_DEVEL_PACK_PATH%
2727
set path=%PATH%;%PHP_SRC_PATH%
2828

2929
goto EXIT

build.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
@echo ====================================
44
call _config.bat
55
call _ready.bat begin
6+
set PRE_PATH=%cd%
67
::------------------------------------------------------------------------------
78

89

910
cd /d %PHP_SRC_PATH%
1011
nmake clean 1>nul 2>nul
1112
nmake
12-
cd /d %BUILD_PATH%\
13-
del /q %BUILD_PATH%\release\*.* 1>nul 2>nul
1413
if defined PHP_NTS (
1514
copy /y %PHP_SRC_PATH%\x64\Release\php_redis.dll %BUILD_PATH%\release\php_redis_nts.dll 1>nul 2>nul
1615
rmdir /s /q %PHP_SRC_PATH%\x64\Release 1>nul 2>nul
1716
) else (
1817
copy /y %PHP_SRC_PATH%\x64\Release_TS\php_redis.dll %BUILD_PATH%\release\php_redis_ts.dll 1>nul 2>nul
1918
rmdir /s /q %PHP_SRC_PATH%\x64\Release_TS 1>nul 2>nul
2019
)
21-
echo --------------------------
22-
echo Done!
2320

2421

2522
::------------------------------------------------------------------------------
26-
cd /d %BUILD_PATH%\
27-
call _ready.bat end
23+
cd /d %PRE_PATH%
24+
set PRE_PATH=
25+
call _ready.bat end
26+
echo --------------------------
27+
echo Done!

php-devel-pack/.gitkeep

Whitespace-only changes.

php-sdk/.gitkeep

Whitespace-only changes.

php-src/.gitkeep

Whitespace-only changes.

readme.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Links:
1313

1414
- Visual Studio ( https://visualstudio.microsoft.com/downloads ) Download Community Edition
1515
- PHP SDK ( https://github.com/php/php-sdk-binary-tools ) Download source code ZIP
16-
- PHP Source ( https://windows.php.net/download ) Download source code ZIP
16+
- PHP Source ( https://windows.php.net/download ) Download source code ZIP and Development package
1717
- PhpRedis Source ( https://github.com/phpredis/phpredis ) Download source code ZIP
1818

1919
# Prepare
@@ -23,6 +23,7 @@ Links:
2323
- Extract SDKs and sources to specified folder, excluding the first level directory if exist:
2424
- PHP SDK -> `{build}\php-sdk`
2525
- PHP Source -> `{build}\php-src`
26+
- PHP Development package -> `{build}\php-devel-pack`
2627
- PhpRedis Source -> `{build}\php-src\ext\redis`
2728
- **Edit `{build}\_config.bat` !!!** Specify the correct parameters: VC_TOOLS_PATH, WIN_SDK_PATH, WIN_SDK_VERSION, PHP_NTS
2829

release/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)