Skip to content

Commit c0f15a9

Browse files
committed
Fix PHP_V8_EXEC_PATH for Windows build also
1 parent 73e1f3c commit c0f15a9

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

appveyor.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ environment:
22
matrix:
33
- ARTIFACT_NAME: v8js_vc14_php7_%Platform%_ts.zip
44
OUTDIR: Release_TS
5-
V8_ASSETS: V8-5.8.301.0-%Platform%.zip
5+
V8_ASSETS: V8-5.8.283.31-%Platform%.zip
66
- ARTIFACT_NAME: v8js_vc14_php7_%Platform%_nts.zip
77
OUTDIR: Release
88
CONFIGURE_EXTRA: --disable-zts
9-
V8_ASSETS: V8-5.8.301.0-%Platform%.zip
9+
V8_ASSETS: V8-5.8.283.31-%Platform%.zip
1010

11-
PHP_VERSION: 7.0.16
11+
PHP_VERSION: 7.0.18
1212
PHP_SDK: c:\projects\php-sdk
1313

1414
os: Windows Server 2012
@@ -37,9 +37,15 @@ install:
3737
- cd php-%PHP_VERSION%
3838
- IF "%Platform%" == "x64" SET OUTDIR=x64\%OUTDIR%
3939
- mkdir %OUTDIR%
40+
- cd
4041
- move ..\deps\bin\*.dll %OUTDIR%\
4142

4243
build_script:
44+
- ps: >-
45+
If ($env:Platform -Match "x86") {
46+
$cnf = "c:\\projects\\php-sdk\\v8js-ci\\vc14\\" + $env:Platform + "\\php\\ext\\v8js\\config.w32"
47+
(Get-Content $cnf).replace("x64\\", "") | Set-Content $cnf
48+
}
4349
- ps: >-
4450
If ($env:Platform -Match "x86") {
4551
$env:VCVARS_PLATFORM="x86"
@@ -51,25 +57,26 @@ build_script:
5157
- call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
5258
- echo Building PHP [%PHP_VERSION%]
5359
- '%PHP_SDK%\bin\phpsdk_setvars'
60+
- type ext\v8js\config.w32
5461
- buildconf
5562
- configure --disable-all --enable-cli --with-v8js %CONFIGURE_EXTRA%
5663
- nmake
5764

5865
after_build:
5966
- cd %OUTDIR%
60-
- 7z a %ARTIFACT_NAME% icu*.dll v8.dll php_v8js.dll
67+
- 7z a %ARTIFACT_NAME% icudtl.dat icu*.dll v8.dll php_v8js.dll
6168
- ps: Push-AppveyorArtifact $env:ARTIFACT_NAME
6269

6370
test_script:
6471
- cd c:\projects\php-sdk\v8js-ci\vc14\%Platform%\php-%PHP_VERSION%
72+
- cd
6573
- set NO_INTERACTION=1
6674
- set TEST_PHP_JUNIT=junit.xml
6775
- set REPORT_EXIT_STATUS=1
6876
- "%OUTDIR%\\php.exe run-tests.php -p %OUTDIR%\\php.exe ext/v8js/tests/ -d extension=php_v8js.dll -d extension_dir=%OUTDIR%\\"
6977

7078
on_finish:
7179
- cd c:\projects\php-sdk\v8js-ci\vc14\%Platform%\php-%PHP_VERSION%
72-
- type ext\v8js\tests\issue_306_basic.out
7380
- ps: |
7481
# upload results to AppVeyor
7582
$wc = New-Object 'System.Net.WebClient'

config.w32

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ if (PHP_V8JS != "no") {
7777
AC_DEFINE("PHP_V8_API_VERSION", v8api, "", false);
7878
AC_DEFINE("PHP_V8_VERSION", v8ver, "", true);
7979

80+
AC_DEFINE("PHP_V8_EXEC_PATH", "C:\\projects\\php-sdk\\v8js-ci\\vc14\\x64\\deps\\bin\\v8.dll", "", true);
81+
8082
EXTENSION("v8js", "v8js_array_access.cc v8js_class.cc v8js_commonjs.cc v8js_convert.cc v8js_exceptions.cc v8js_generator_export.cc v8js_main.cc v8js_methods.cc v8js_object_export.cc v8js_timer.cc v8js_v8.cc v8js_v8object_class.cc v8js_variables.cc", "yes");
8183

8284
} else {

0 commit comments

Comments
 (0)