Merge branch 'master' of github.com:krakjoe/pthreads

krakjoe · Jul 24, 2017 · 634fc6d · 634fc6d
2 parents 082f2ef + e62432e
commit 634fc6d
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -56,21 +56,25 @@ build_script:
 
     buildconf.bat
 
-    configure.bat --disable-all --enable-cli --enable-zts --with-pthreads=shared --with-config-file-scan-dir=C:\projects\pthreads\bin\modules.d --with-prefix=C:\projects\pthreads\bin --with-php-build=deps
+    configure.bat --disable-all --enable-cli --enable-zts --with-pthreads=shared --with-prefix=C:\projects\pthreads\bin --with-php-build=deps
 
     nmake
 
     nmake install
 
-    copy php.ini-development C:\projects\pthreads\bin\php.ini
+    cd C:\projects\pthreads\bin
 
-    mkdir C:\projects\pthreads\bin\modules.d
+    copy C:\projects\pthreads-w32\Pre-built.2\dll\%ARCH%\pthreadVC2.dll C:\projects\pthreads\bin\pthreadVC2.dll
 
-    echo extension=php_pthreads.dll > C:\projects\pthreads\bin\modules.d\php.ini
+    echo [PHP] > php.ini
 
-    copy C:\projects\pthreads-w32\Pre-built.2\dll\%ARCH%\pthreadVC2.dll C:\projects\pthreads\bin\pthreadVC2.dll
+    echo extension_dir = "ext" >> php.ini
+
+    echo extension=php_pthreads.dll >> php.ini
+
+    set TEST_PHP_EXECUTABLE=%cd%\php.exe
 test_script:
-- cmd: C:\projects\pthreads\bin\php.exe -doutput_buffering=0 run-tests.php ext\pthreads -p C:\projects\pthreads\bin\php.exe -q --show-diff
+- cmd: php.exe /projects/php-src/run-tests.php /projects/php-src/ext/pthreads -q --show-diff
 artifacts:
   - path: bin
     name: master