0
0
mirror of https://github.com/phpv8/v8js.git synced 2024-12-22 17:31:53 +00:00

Fix PHP_V8_EXEC_PATH for Windows build also

This commit is contained in:
Stefan Siegl 2017-04-22 11:37:34 +02:00
parent 989f0ae82c
commit ba3f74f45c
No known key found for this signature in database
GPG Key ID: 51575950154839CD
2 changed files with 8 additions and 6 deletions

View File

@ -2,13 +2,13 @@ environment:
matrix: matrix:
- ARTIFACT_NAME: v8js_vc14_php7_%Platform%_ts.zip - ARTIFACT_NAME: v8js_vc14_php7_%Platform%_ts.zip
OUTDIR: Release_TS OUTDIR: Release_TS
V8_ASSETS: V8-5.8.301.0-%Platform%.zip V8_ASSETS: V8-5.8.283.31-%Platform%.zip
- ARTIFACT_NAME: v8js_vc14_php7_%Platform%_nts.zip - ARTIFACT_NAME: v8js_vc14_php7_%Platform%_nts.zip
OUTDIR: Release OUTDIR: Release
CONFIGURE_EXTRA: --disable-zts CONFIGURE_EXTRA: --disable-zts
V8_ASSETS: V8-5.8.301.0-%Platform%.zip V8_ASSETS: V8-5.8.283.31-%Platform%.zip
PHP_VERSION: 7.0.16 PHP_VERSION: 7.0.18
PHP_SDK: c:\projects\php-sdk PHP_SDK: c:\projects\php-sdk
os: Windows Server 2012 os: Windows Server 2012
@ -38,6 +38,7 @@ install:
- IF "%Platform%" == "x64" SET OUTDIR=x64\%OUTDIR% - IF "%Platform%" == "x64" SET OUTDIR=x64\%OUTDIR%
- mkdir %OUTDIR% - mkdir %OUTDIR%
- move ..\deps\bin\*.dll %OUTDIR%\ - move ..\deps\bin\*.dll %OUTDIR%\
- move ..\deps\bin\icudtl.dat %OUTDIR%\
build_script: build_script:
- ps: >- - ps: >-
@ -57,7 +58,7 @@ build_script:
after_build: after_build:
- cd %OUTDIR% - cd %OUTDIR%
- 7z a %ARTIFACT_NAME% icu*.dll v8.dll php_v8js.dll - 7z a %ARTIFACT_NAME% icudtl.dat icu*.dll v8.dll php_v8js.dll
- ps: Push-AppveyorArtifact $env:ARTIFACT_NAME - ps: Push-AppveyorArtifact $env:ARTIFACT_NAME
test_script: test_script:
@ -65,11 +66,10 @@ test_script:
- set NO_INTERACTION=1 - set NO_INTERACTION=1
- set TEST_PHP_JUNIT=junit.xml - set TEST_PHP_JUNIT=junit.xml
- set REPORT_EXIT_STATUS=1 - set REPORT_EXIT_STATUS=1
- "%OUTDIR%\\php.exe run-tests.php -p %OUTDIR%\\php.exe ext/v8js/tests/ -d extension=php_v8js.dll -d extension_dir=%OUTDIR%\\" - "%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%\\"
on_finish: on_finish:
- cd c:\projects\php-sdk\v8js-ci\vc14\%Platform%\php-%PHP_VERSION% - cd c:\projects\php-sdk\v8js-ci\vc14\%Platform%\php-%PHP_VERSION%
- type ext\v8js\tests\issue_306_basic.out
- ps: | - ps: |
# upload results to AppVeyor # upload results to AppVeyor
$wc = New-Object 'System.Net.WebClient' $wc = New-Object 'System.Net.WebClient'

View File

@ -77,6 +77,8 @@ if (PHP_V8JS != "no") {
AC_DEFINE("PHP_V8_API_VERSION", v8api, "", false); AC_DEFINE("PHP_V8_API_VERSION", v8api, "", false);
AC_DEFINE("PHP_V8_VERSION", v8ver, "", true); AC_DEFINE("PHP_V8_VERSION", v8ver, "", true);
// AC_DEFINE("PHP_V8_EXEC_PATH", "C:\\php\\bin\\v8.dll", "", true);
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"); 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");
} else { } else {