Skip to content

Commit ba3f74f

Browse files
committed
Fix PHP_V8_EXEC_PATH for Windows build also
1 parent 989f0ae commit ba3f74f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

appveyor.yml

+6-6
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
@@ -38,6 +38,7 @@ install:
3838
- IF "%Platform%" == "x64" SET OUTDIR=x64\%OUTDIR%
3939
- mkdir %OUTDIR%
4040
- move ..\deps\bin\*.dll %OUTDIR%\
41+
- move ..\deps\bin\icudtl.dat %OUTDIR%\
4142

4243
build_script:
4344
- ps: >-
@@ -57,19 +58,18 @@ build_script:
5758

5859
after_build:
5960
- cd %OUTDIR%
60-
- 7z a %ARTIFACT_NAME% icu*.dll v8.dll php_v8js.dll
61+
- 7z a %ARTIFACT_NAME% icudtl.dat icu*.dll v8.dll php_v8js.dll
6162
- ps: Push-AppveyorArtifact $env:ARTIFACT_NAME
6263

6364
test_script:
6465
- cd c:\projects\php-sdk\v8js-ci\vc14\%Platform%\php-%PHP_VERSION%
6566
- set NO_INTERACTION=1
6667
- set TEST_PHP_JUNIT=junit.xml
6768
- set REPORT_EXIT_STATUS=1
68-
- "%OUTDIR%\\php.exe run-tests.php -p %OUTDIR%\\php.exe ext/v8js/tests/ -d extension=php_v8js.dll -d extension_dir=%OUTDIR%\\"
69+
- "%OUTDIR%\\php.exe run-tests.php -p %OUTDIR%\\php.exe ext/v8js/tests/ -d v8js.icudtl_dat_path=%OUTDIR%/icudtl.dat -d extension=php_v8js.dll -d extension_dir=%OUTDIR%\\"
6970

7071
on_finish:
7172
- cd c:\projects\php-sdk\v8js-ci\vc14\%Platform%\php-%PHP_VERSION%
72-
- type ext\v8js\tests\issue_306_basic.out
7373
- ps: |
7474
# upload results to AppVeyor
7575
$wc = New-Object 'System.Net.WebClient'

config.w32

+2
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:\\php\\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)