From ba3f74f45cab4eebe78ee6895b5cd2da24ce24f6 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Sat, 22 Apr 2017 11:37:34 +0200
Subject: [PATCH] Fix PHP_V8_EXEC_PATH for Windows build also

---
 appveyor.yml | 12 ++++++------
 config.w32   |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index fea0873..59baea1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,13 +2,13 @@ environment:
   matrix:
   - ARTIFACT_NAME: v8js_vc14_php7_%Platform%_ts.zip
     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
     OUTDIR: Release
     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
 
 os: Windows Server 2012
@@ -38,6 +38,7 @@ install:
   - IF "%Platform%" == "x64" SET OUTDIR=x64\%OUTDIR%
   - mkdir %OUTDIR%
   - move ..\deps\bin\*.dll %OUTDIR%\
+  - move ..\deps\bin\icudtl.dat %OUTDIR%\
 
 build_script:
   - ps: >-
@@ -57,7 +58,7 @@ build_script:
 
 after_build:
   - 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
 
 test_script:
@@ -65,11 +66,10 @@ test_script:
   - set NO_INTERACTION=1
   - set TEST_PHP_JUNIT=junit.xml
   - 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:
   - cd c:\projects\php-sdk\v8js-ci\vc14\%Platform%\php-%PHP_VERSION%
-  - type ext\v8js\tests\issue_306_basic.out
   - ps: |
       # upload results to AppVeyor
       $wc = New-Object 'System.Net.WebClient'
diff --git a/config.w32 b/config.w32
index d5ef2a4..efc9349 100644
--- a/config.w32
+++ b/config.w32
@@ -77,6 +77,8 @@ if (PHP_V8JS != "no") {
 		AC_DEFINE("PHP_V8_API_VERSION", v8api, "", false);
 		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");
 
 	} else {