[PHP-CVS] Re: cvs: php-src /ext/phar/tests phar_oo_005.phpt
Alexey Zakhlestin wrote: indeyets Tue Oct 21 13:00:30 2008 UTC Modified files: /php-src/ext/phar/tests phar_oo_005.phpt Log: MFB: proper check for php-version http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_005.phpt?r1=1.11r2=1.12diff_format=u Index: php-src/ext/phar/tests/phar_oo_005.phpt diff -u php-src/ext/phar/tests/phar_oo_005.phpt:1.11 php-src/ext/phar/tests/phar_oo_005.phpt:1.12 --- php-src/ext/phar/tests/phar_oo_005.phpt:1.11 Fri Aug 1 13:36:18 2008 +++ php-src/ext/phar/tests/phar_oo_005.phpt Tue Oct 21 13:00:29 2008 @@ -4,7 +4,8 @@ ?php if (!extension_loaded(phar)) die(skip); if (!extension_loaded(spl)) die(skip SPL not available); -if (!version_compare(PHP_VERSION, 5.3, ==)) die(skip requires 5.3); +if (version_compare(PHP_VERSION, 5.3, ) or version_compare(PHP_VERSION, 5.4, =)) +die(skip requires 5.3); ? --INI-- phar.require_hash=0 Hi Alexey, Thanks for this fix. Would you mind merging it to pecl/phar/tests/phar_oo_005.phpt? Thanks, Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-internals-win /script snapshot_5_2.bat snapshot_5_2_all.bat snapshot_5_3_all.bat snapshot_5_3_vc9.bat snapshot_5_3_vc9x64.bat snapshot_6_0.bat snapshot_6_0_all.bat snapshot_6_0_vc9.
pajoye Sat Oct 25 16:50:25 2008 UTC Added files: /php-internals-win/script snapshot_5_2.bat snapshot_5_2_all.bat snapshot_5_3_all.bat snapshot_5_3_vc9.bat snapshot_5_3_vc9x64.bat snapshot_6_0.bat snapshot_6_0_all.bat snapshot_6_0_vc9.bat snapshot_installer.bat snapshot_src_download.bat Log: - add scripts helper for all active branches - add src downloader scripts used by the automatic tasks for the snaps http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_5_2.bat?view=markuprev=1.1 Index: php-internals-win/script/snapshot_5_2.bat +++ php-internals-win/script/snapshot_5_2.bat REM $Id: snapshot_5_2.bat,v 1.1 2008/10/25 16:50:25 pajoye Exp $ @ECHO OFF SET PHP_SDK_SCRIPT_PATH=%~dp0 REM change the drive %~d0 CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat IF %1 == ( SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-snapshot-template=%PHP_SDK_PATH%\snap_5_2\vc6\x86\template --with-php-build=%PHP_SDK_PATH%\snap_5_2\vc6\x86\php_build --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared ) IF %1 == ts ( SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-snapshot-template=%PHP_SDK_PATH%\snap_5_2\vc6\x86\template --with-php-build=%PHP_SDK_PATH%\snap_5_2\vc6\x86\php_build --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared ) IF %1 == nts ( SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-zts --disable-isapi --with-snapshot-template=%PHP_SDK_PATH%\snap_5_2\vc6\x86\template --with-php-build=%PHP_SDK_PATH%\snap_5_2\vc6\x86\php_build --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared ) SET PHP_MODULE=php5 IF %2 == ( CD %PHP_SDK_PATH%\snap_5_2\sources CALL snapshot_src_download.bat 5.2 ) CD %PHP_SDK_PATH%\snap_5_2\vc6\x86 CALL snapshot.bat 6 5.2 snap52_vc6 %PHP_SDK_PATH%\snap_5_2\sources\php-5.2-src-latest.zip %4 http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_5_2_all.bat?view=markuprev=1.1 Index: php-internals-win/script/snapshot_5_2_all.bat +++ php-internals-win/script/snapshot_5_2_all.bat REM $Id: snapshot_5_2_all.bat,v 1.1 2008/10/25 16:50:25 pajoye Exp $ @ECHO OFF SET PHP_SDK_SCRIPT_PATH=%~dp0 REM change the drive %~d0 CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat CD %PHP_SDK_PATH%\snap_5_2\sources CALL snapshot_src_download.bat 5.2 CMD /C snapshot_5_2.bat ts nodownload no msi CMD /C snapshot_5_2.bat nts nodownload no msi http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_5_3_all.bat?view=markuprev=1.1 Index: php-internals-win/script/snapshot_5_3_all.bat +++ php-internals-win/script/snapshot_5_3_all.bat REM $Id: snapshot_5_3_all.bat,v 1.1 2008/10/25 16:50:25 pajoye Exp $ @ECHO OFF SET PHP_SDK_SCRIPT_PATH=%~dp0 REM change the drive %~d0 CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat CD %PHP_SDK_PATH%\snap_5_3\sources CALL snapshot_src_download.bat 5.3 CMD /C snapshot_5_3_vc9.bat ts nodownload no msi CMD /C snapshot_5_3_vc9.bat nts nodownload no msi CMD /C snapshot_5_3.bat ts nodownload no msi CMD /C snapshot_5_3.bat nts nodownload no msi http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot_5_3_vc9.bat?view=markuprev=1.1 Index: php-internals-win/script/snapshot_5_3_vc9.bat +++ php-internals-win/script/snapshot_5_3_vc9.bat REM $Id: snapshot_5_3_vc9.bat,v 1.1 2008/10/25 16:50:25 pajoye Exp $ @ECHO OFF SET PHP_SDK_SCRIPT_PATH=%~dp0 REM change the drive %~d0 CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat CD %PHP_SDK_PATH%\php_5_3\vc9\x86 IF %1 == ( SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared ) IF %1 == ts ( SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared ) IF %1 == nts ( SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-zts --disable-isapi --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared ) SET PHP_MODULE=php5 IF %2 == ( CD %PHP_SDK_PATH%\snap_5_3\sources CALL snapshot_src_download.bat 5.3 ) CD %PHP_SDK_PATH%\snap_5_3\vc9\x86 CALL snapshot.bat 9 5.3 snap53_vc9 %PHP_SDK_PATH%\snap_5_3\sources\php-5.3-src-latest.zip %4
[PHP-CVS] cvs: php-internals-win /script conf_tools.bat phpsdk_buildtree.bat phpsdk_setvars.bat snapshot.bat snapshot_5_3.bat
pajoye Sat Oct 25 16:51:28 2008 UTC Modified files: /php-internals-win/script conf_tools.bat phpsdk_buildtree.bat phpsdk_setvars.bat snapshot.bat snapshot_5_3.bat Log: - update config - add support for already downloaded sources instead of cvs - add installer build script call to snapshot.bat http://cvs.php.net/viewvc.cgi/php-internals-win/script/conf_tools.bat?r1=1.3r2=1.4diff_format=u Index: php-internals-win/script/conf_tools.bat diff -u php-internals-win/script/conf_tools.bat:1.3 php-internals-win/script/conf_tools.bat:1.4 --- php-internals-win/script/conf_tools.bat:1.3 Sat Aug 23 23:55:40 2008 +++ php-internals-win/script/conf_tools.bat Sat Oct 25 16:51:28 2008 @@ -1,3 +1,5 @@ +REM $Id: conf_tools.bat,v 1.4 2008/10/25 16:51:28 pajoye Exp $ + @ECHO OFF SET PSDK_200302_DIR=C:\Program Files\Microsoft SDK @@ -10,14 +12,20 @@ SET VC6_LIB=%PSDK_200302_DIR%\Lib;%VC6_DIR%\VC98\LIB;%VC6_DIR%\VC98\MFC\LIB SET VC6_PATH=%PSDK_200302_DIR%\Bin;%PSDK_200302_DIR%\Bin\WinNT;%VC6_DIR%\Common\msdev98\BIN;%VC6_DIR%\VC98\BIN;%VC6_DIR%\Common\TOOLS\WINNT;%VC6_DIR%\Common/TOOLS +SET VC9_SHELL=C:\WINDOWS\system32\cmd.exe /E:ON /V:ON /T:0E /K C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd SET VC9_INCLUDE=%PSDK_61_DIR%\include;%VC9_DIR%\VC\ATLMFC\INCLUDE;%VC9_DIR%\VC\INCLUDE SET VC9_LIB=%PSDK_61_DIR%\lib;%VC9_DIR%\VC\ATLMFC\LIB;%VC9_DIR%\VC\LIB SET VC9_PATH=%VC9_DIR%\Common7\IDE;%VC9_DIR%\VC\BIN;%VC9_DIR%\Common7\Tools;%VC9_DIR%\VC\VCPackages;%PSDK_61_DIR%\bin;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem +SET VC9_X64_INCLUDE=%VC9_DIR%\VC\Include;C:\Program Files\Microsoft SDKs\Windows\v6.1\Include;C:\Program Files\Microsoft SDKs\Windows\v6.1\Include\gl;%VC9_DIR%VC\ATLMFC\INCLUDE; +SET VC9_X64_LIB=%VC9_DIR%\VC\Lib\amd64;C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib\x64;%VC9_DIR%\VC\ATLMFC\LIB\AMD64; +SET VC9_X64_PATH=%VC9_DIR%\VC\Bin\x86_amd64;%VC9_DIR%\VC\Bin;%VC9_DIR%\VC\vcpackages;%VC9_DIR%\Common7\IDE;C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin;C:\WINDOWS\Microsoft.NET\Framework64\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework64\v2.0.50727;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\PHP\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;c:\win2k3cd;C:\Program Files\cvsnt;C:\Program Files\WinSCP\;C:\Program Files\CVSNT\ + SET PHP_CVSROOT=-d :pserver:[EMAIL PROTECTED]:/repository -SET PUTTYBASE=C:\Program Files (x86)\PUTTY\ -SET REMOTE_USER=edink -SET [EMAIL PROTECTED] -SET REMOTE_PATH=/local/sites/snaps.php.net/www/win32 +SET PUTTYBASE=C:\Program Files\PUTTY\ +SET SSH_USER=snaps +SET SSH_HOST=example.com +SET SSH_KEY= d:\php-sdk\keys\nameofyourkey.ppk +SET REMOTE_PATH=/home/web/windows.php.net/docroot/downloads/snaps SET HOMEPATH=\Documents and Settings\pierre SET HOMEDRIVE=C: http://cvs.php.net/viewvc.cgi/php-internals-win/script/phpsdk_buildtree.bat?r1=1.2r2=1.3diff_format=u Index: php-internals-win/script/phpsdk_buildtree.bat diff -u php-internals-win/script/phpsdk_buildtree.bat:1.2 php-internals-win/script/phpsdk_buildtree.bat:1.3 --- php-internals-win/script/phpsdk_buildtree.bat:1.2 Sun Aug 24 11:21:02 2008 +++ php-internals-win/script/phpsdk_buildtree.bat Sat Oct 25 16:51:28 2008 @@ -1,3 +1,5 @@ +REM $Id: phpsdk_buildtree.bat,v 1.3 2008/10/25 16:51:28 pajoye Exp $ + @echo off IF %1 EQU GOTO Help http://cvs.php.net/viewvc.cgi/php-internals-win/script/phpsdk_setvars.bat?r1=1.2r2=1.3diff_format=u Index: php-internals-win/script/phpsdk_setvars.bat diff -u php-internals-win/script/phpsdk_setvars.bat:1.2 php-internals-win/script/phpsdk_setvars.bat:1.3 --- php-internals-win/script/phpsdk_setvars.bat:1.2 Wed Jul 30 07:35:19 2008 +++ php-internals-win/script/phpsdk_setvars.bat Sat Oct 25 16:51:28 2008 @@ -1,12 +1,14 @@ -::phpsdk.bat +REM $Id: phpsdk_setvars.bat,v 1.3 2008/10/25 16:51:28 pajoye Exp $ + @ECHO OFF -:: Add skd\bin directory to the path +REM Add skd\bin directory to the path SET PHP_SDK_SCRIPT_PATH=%~dp0 -SET PHP_SDK_BIN_PATH=%PHP_SDK_SCRIPT_PATH%\..\bin\ +SET PHP_SDK_BIN_PATH=%PHP_SDK_SCRIPT_PATH%\..\bin +SET PHP_SDK_PATH=%PHP_SDK_SCRIPT_PATH%\.. -SET PATH=%PATH%;%PHP_SDK_SCRIPT_PATH%;%PHP_SDK_BIN_PATH% +SET PATH=%PATH%;%PHP_SDK_BIN_PATH%;%PHP_SDK_SCRIPT_PATH% -:: Set BISON_SIMPLE -SET BISON_SIMPLE=%PHP_SDK_BIN_PATH%bison.simple +REM Set BISON_SIMPLE +SET BISON_SIMPLE=%PHP_SDK_BIN_PATH%\bison.simple http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.8r2=1.9diff_format=u Index: php-internals-win/script/snapshot.bat diff -u php-internals-win/script/snapshot.bat:1.8 php-internals-win/script/snapshot.bat:1.9 --- php-internals-win/script/snapshot.bat:1.8 Sat Aug 23 23:55:40 2008 +++ php-internals-win/script/snapshot.bat
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build Makefile mkdist.php
pajoye Sun Oct 26 00:14:23 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildMakefile mkdist.php Log: - add php-test-pack-[version].zip to nmake snap so we can distribute the tests as single zip TODO: add run-tests.bat to the package http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.8r2=1.35.2.1.2.6.2.9diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.8 php-src/win32/build/Makefile:1.35.2.1.2.6.2.9 --- php-src/win32/build/Makefile:1.35.2.1.2.6.2.8 Fri Sep 26 13:29:11 2008 +++ php-src/win32/build/MakefileSun Oct 26 00:14:23 2008 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.35.2.1.2.6.2.8 2008/09/26 13:29:11 pajoye Exp $ +# $Id: Makefile,v 1.35.2.1.2.6.2.9 2008/10/26 00:14:23 pajoye Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -131,13 +131,16 @@ -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip $(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES) $(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE) cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING) - -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -q -r ..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . cd ..\.. cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) - -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -q -r ..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + cd ..\.. + cd $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING) + -$(ZIP) -9 -q -r ..\php-test-pack-$(PHP_VERSION_STRING).zip . cd ..\.. cd $(BUILD_DIR) - -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb + -$(ZIP) -9 -q php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb cd ..\.. dist: all build-dist http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.5r2=1.13.4.1.2.6diff_format=u Index: php-src/win32/build/mkdist.php diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.5 php-src/win32/build/mkdist.php:1.13.4.1.2.6 --- php-src/win32/build/mkdist.php:1.13.4.1.2.5 Mon Sep 1 18:19:58 2008 +++ php-src/win32/build/mkdist.php Sun Oct 26 00:14:23 2008 @@ -1,4 +1,4 @@ -?php # $Id: mkdist.php,v 1.13.4.1.2.5 2008/09/01 18:19:58 pajoye Exp $ +?php # $Id: mkdist.php,v 1.13.4.1.2.6 2008/10/26 00:14:23 pajoye Exp $ /* piece together a windows binary distro */ $build_dir = $argv[1]; @@ -13,6 +13,7 @@ echo Making dist for $build_dir\n; $dist_dir = $build_dir . /php- . phpversion(); +$test_dir = $build_dir . /php-test-pack- . phpversion(); $pecl_dir = $build_dir . /pecl- . phpversion(); @mkdir($dist_dir); @@ -346,6 +347,58 @@ closedir($d); } + + +function copy_test_dir($directory, $dest) +{ + if(substr($directory,-1) == '/') { + $directory = substr($directory,0,-1); + } + + if ($directory == 'tests') { + mkdir($dest . '/tests', 0775, true); + copy_dir($directory, $dest . '/tests/'); + + return false; + } + + if(!file_exists($directory) || !is_dir($directory)) { + echo failed... $directory\n; + return FALSE; + } + + $directory_list = opendir($directory); + + while (FALSE !== ($file = readdir($directory_list))) { + $full_path = $directory . '/' . $file; + if($file != '.' $file != '..' $file != 'CVS' is_dir($full_path)) { + if ($file == 'tests') { + mkdir($dest . '/' . $full_path , 0775, true); + copy_dir($full_path, $dest . '/' . $full_path . '/'); + continue; + } else { + copy_test_dir($full_path, $dest); + } + } + } + + closedir($directory_list); +} + +if (!is_dir($test_dir)) { + mkdir($test_dir); +} + +$dirs = array( + 'ext', + 'Sapi', + 'Zend', + 'tests' +); +foreach ($dirs as $dir) { + copy_test_dir($dir, $test_dir); +} + /* change this next line to true to use good-old * hand-assembled go-pear-bundle from the
[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php
pajoye Sun Oct 26 00:15:57 2008 UTC Modified files: /php-src/win32/buildMakefile mkdist.php Log: - MFH: add php-test-pack-[version].zip to nmake snap so we can distribute the tests as single zip TODO: add run-tests.bat to the package http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.50r2=1.51diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.50 php-src/win32/build/Makefile:1.51 --- php-src/win32/build/Makefile:1.50 Fri Sep 26 13:31:01 2008 +++ php-src/win32/build/MakefileSun Oct 26 00:15:56 2008 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.50 2008/09/26 13:31:01 pajoye Exp $ +# $Id: Makefile,v 1.51 2008/10/26 00:15:56 pajoye Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -131,13 +131,16 @@ -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip $(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES) $(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE) cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING) - -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -q -r ..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . cd ..\.. cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) - -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -q -r ..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + cd ..\.. + cd $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING) + -$(ZIP) -9 -q -r ..\php-test-pack-$(PHP_VERSION_STRING).zip . cd ..\.. cd $(BUILD_DIR) - -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb + -$(ZIP) -9 -q php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb cd ..\.. dist: all build-dist http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.18r2=1.19diff_format=u Index: php-src/win32/build/mkdist.php diff -u php-src/win32/build/mkdist.php:1.18 php-src/win32/build/mkdist.php:1.19 --- php-src/win32/build/mkdist.php:1.18 Mon Sep 1 18:21:06 2008 +++ php-src/win32/build/mkdist.php Sun Oct 26 00:15:56 2008 @@ -1,4 +1,4 @@ -?php # $Id: mkdist.php,v 1.18 2008/09/01 18:21:06 pajoye Exp $ +?php # $Id: mkdist.php,v 1.19 2008/10/26 00:15:56 pajoye Exp $ /* piece together a windows binary distro */ $build_dir = $argv[1]; @@ -13,6 +13,7 @@ echo Making dist for $build_dir\n; $dist_dir = $build_dir . /php- . phpversion(); +$test_dir = $build_dir . /php-test-pack- . phpversion(); $pecl_dir = $build_dir . /pecl- . phpversion(); @mkdir($dist_dir); @@ -346,6 +347,58 @@ closedir($d); } + + +function copy_test_dir($directory, $dest) +{ + if(substr($directory,-1) == '/') { + $directory = substr($directory,0,-1); + } + + if ($directory == 'tests') { + mkdir($dest . '/tests', 0775, true); + copy_dir($directory, $dest . '/tests/'); + + return false; + } + + if(!file_exists($directory) || !is_dir($directory)) { + echo failed... $directory\n; + return FALSE; + } + + $directory_list = opendir($directory); + + while (FALSE !== ($file = readdir($directory_list))) { + $full_path = $directory . '/' . $file; + if($file != '.' $file != '..' $file != 'CVS' is_dir($full_path)) { + if ($file == 'tests') { + mkdir($dest . '/' . $full_path , 0775, true); + copy_dir($full_path, $dest . '/' . $full_path . '/'); + continue; + } else { + copy_test_dir($full_path, $dest); + } + } + } + + closedir($directory_list); +} + +if (!is_dir($test_dir)) { + mkdir($test_dir); +} + +$dirs = array( + 'ext', + 'Sapi', + 'Zend', + 'tests' +); +foreach ($dirs as $dir) { + copy_test_dir($dir, $test_dir); +} + /* change this next line to true to use good-old * hand-assembled go-pear-bundle from the snapshot template */ $use_pear_template = true; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
felipe Sun Oct 26 01:58:26 2008 UTC Modified files: /php-src/ext/soap php_encoding.c Log: - Fixed bug #46389 (NetWare needs small patch for _timezone) (patch by guenter at php.net) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.171r2=1.172diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.171 php-src/ext/soap/php_encoding.c:1.172 --- php-src/ext/soap/php_encoding.c:1.171 Thu Oct 16 15:49:38 2008 +++ php-src/ext/soap/php_encoding.c Sun Oct 26 01:58:25 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_encoding.c,v 1.171 2008/10/16 15:49:38 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.172 2008/10/26 01:58:25 felipe Exp $ */ #include time.h @@ -2940,7 +2940,7 @@ #ifdef HAVE_TM_GMTOFF snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, (ta-tm_gmtoff 0) ? '-' : '+', abs(ta-tm_gmtoff / 3600), abs( (ta-tm_gmtoff % 3600) / 60 )); #else -# ifdef __CYGWIN__ +# if defined(__CYGWIN__) || defined(NETWARE) snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, ((ta-tm_isdst ? _timezone - 3600:_timezone)0)?'-':'+', abs((ta-tm_isdst ? _timezone - 3600 : _timezone) / 3600), abs(((ta-tm_isdst ? _timezone - 3600 : _timezone) % 3600) / 60)); # else snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, ((ta-tm_isdst ? timezone - 3600:timezone)0)?'-':'+', abs((ta-tm_isdst ? timezone - 3600 : timezone) / 3600), abs(((ta-tm_isdst ? timezone - 3600 : timezone) % 3600) / 60)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap php_encoding.c
felipe Sun Oct 26 02:00:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/soap php_encoding.c Log: - MFH: Fixed bug #46389 (NetWare needs small patch for _timezone) (patch by guenter at php.net) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.37.2.9r2=1.103.2.21.2.37.2.10diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.9 php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.10 --- php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.9 Thu Oct 16 15:49:29 2008 +++ php-src/ext/soap/php_encoding.c Sun Oct 26 02:00:44 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.9 2008/10/16 15:49:29 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.10 2008/10/26 02:00:44 felipe Exp $ */ #include time.h @@ -2989,7 +2989,7 @@ #ifdef HAVE_TM_GMTOFF snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, (ta-tm_gmtoff 0) ? '-' : '+', abs(ta-tm_gmtoff / 3600), abs( (ta-tm_gmtoff % 3600) / 60 )); #else -# ifdef __CYGWIN__ +# if defined(__CYGWIN__) || defined(NETWARE) snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, ((ta-tm_isdst ? _timezone - 3600:_timezone)0)?'-':'+', abs((ta-tm_isdst ? _timezone - 3600 : _timezone) / 3600), abs(((ta-tm_isdst ? _timezone - 3600 : _timezone) % 3600) / 60)); # else snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, ((ta-tm_isdst ? timezone - 3600:timezone)0)?'-':'+', abs((ta-tm_isdst ? timezone - 3600 : timezone) / 3600), abs(((ta-tm_isdst ? timezone - 3600 : timezone) % 3600) / 60)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_encoding.c
felipe Sun Oct 26 02:02:05 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap php_encoding.c Log: - MFH: Fixed bug #46389 (NetWare needs small patch for _timezone) (patch by guenter at php.net) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.42r2=1.103.2.21.2.43diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.42 php-src/ext/soap/php_encoding.c:1.103.2.21.2.43 --- php-src/ext/soap/php_encoding.c:1.103.2.21.2.42 Thu Oct 16 15:49:18 2008 +++ php-src/ext/soap/php_encoding.c Sun Oct 26 02:02:05 2008 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_encoding.c,v 1.103.2.21.2.42 2008/10/16 15:49:18 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21.2.43 2008/10/26 02:02:05 felipe Exp $ */ #include time.h @@ -2876,7 +2876,7 @@ #ifdef HAVE_TM_GMTOFF snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, (ta-tm_gmtoff 0) ? '-' : '+', abs(ta-tm_gmtoff / 3600), abs( (ta-tm_gmtoff % 3600) / 60 )); #else -# ifdef __CYGWIN__ +# if defined(__CYGWIN__) || defined(NETWARE) snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, ((ta-tm_isdst ? _timezone - 3600:_timezone)0)?'-':'+', abs((ta-tm_isdst ? _timezone - 3600 : _timezone) / 3600), abs(((ta-tm_isdst ? _timezone - 3600 : _timezone) % 3600) / 60)); # else snprintf(tzbuf, sizeof(tzbuf), %c%02d:%02d, ((ta-tm_isdst ? timezone - 3600:timezone)0)?'-':'+', abs((ta-tm_isdst ? timezone - 3600 : timezone) / 3600), abs(((ta-tm_isdst ? timezone - 3600 : timezone) % 3600) / 60)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_encoding.c
On Sun, Oct 26, 2008 at 04:02, Felipe Pena [EMAIL PROTECTED] wrote: felipe Sun Oct 26 02:02:05 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/soap php_encoding.c Log: - MFH: Fixed bug #46389 (NetWare needs small patch for _timezone) (patch by guenter at php.net) NEWS entry? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
felipe Sun Oct 26 02:24:25 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - BFN #46389 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1278r2=1.2027.2.547.2.1279diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1278 php-src/NEWS:1.2027.2.547.2.1279 --- php-src/NEWS:1.2027.2.547.2.1278Fri Oct 24 13:56:27 2008 +++ php-src/NEWSSun Oct 26 02:24:23 2008 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? Nov 2008, PHP 5.2.7RC3 +- Fixed bug #46389 (NetWare needs small patch for _timezone). + (patch by [EMAIL PROTECTED]) - Fixed bug #46381 (wrong $this passed to internal methods causes segfault). (Tony) - Fixed bug #46082 (stream_set_blocking() can cause a crash in some -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c phar_object.c util.c
cellog Sun Oct 26 05:49:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c phar_object.c util.c Log: fix several errors found by valgrind 1 - entry metadata not properly processed or retrieved from cached phars 2 - copy on write was using a void return value instead of int, a dangerous oversight in phar_update_cached_entry 3 - metadata creation in entries for cached phars was causing an invalid read http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.51r2=1.370.2.52diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.51 php-src/ext/phar/phar.c:1.370.2.52 --- php-src/ext/phar/phar.c:1.370.2.51 Sun Oct 12 21:09:22 2008 +++ php-src/ext/phar/phar.c Sun Oct 26 05:49:09 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar.c,v 1.370.2.51 2008/10/12 21:09:22 tony2001 Exp $ */ +/* $Id: phar.c,v 1.370.2.52 2008/10/26 05:49:09 cellog Exp $ */ #define PHAR_MAIN 1 #include phar_internal.h @@ -1114,7 +1114,9 @@ } if (entry.is_persistent) { - if (phar_parse_metadata(buffer, entry.metadata, 0 TSRMLS_CC) == FAILURE) { + PHAR_GET_32(buffer, entry.metadata_len); + if (!entry.metadata_len) buffer -= 4; + if (phar_parse_metadata(buffer, entry.metadata, entry.metadata_len TSRMLS_CC) == FAILURE) { pefree(entry.filename, entry.is_persistent); MAPPHAR_FAIL(unable to read file metadata in .phar file \%s\); } @@ -3622,7 +3624,7 @@ php_info_print_table_header(2, Phar: PHP Archive support, enabled); php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION); php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION); - php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.51 $); + php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.52 $); php_info_print_table_row(2, Phar-based phar archives, enabled); php_info_print_table_row(2, Tar-based phar archives, enabled); php_info_print_table_row(2, ZIP-based phar archives, enabled); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.53r2=1.266.2.54diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.53 php-src/ext/phar/phar_object.c:1.266.2.54 --- php-src/ext/phar/phar_object.c:1.266.2.53 Fri Oct 24 14:35:37 2008 +++ php-src/ext/phar/phar_object.c Sun Oct 26 05:49:09 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar_object.c,v 1.266.2.53 2008/10/24 14:35:37 felipe Exp $ */ +/* $Id: phar_object.c,v 1.266.2.54 2008/10/26 05:49:09 cellog Exp $ */ #include phar_internal.h #include func_interceptors.h @@ -4583,6 +4583,15 @@ PHAR_ENTRY_OBJECT(); if (entry_obj-ent.entry-metadata) { + if (entry_obj-ent.entry-is_persistent) { + zval *ret; + char *buf = estrndup((char *) entry_obj-ent.entry-metadata, entry_obj-ent.entry-metadata_len); + /* assume success, we would have failed before */ + phar_parse_metadata(buf, ret, entry_obj-ent.entry-metadata_len TSRMLS_CC); + efree(buf); + RETURN_ZVAL(ret, 0, 1); + return; + } RETURN_ZVAL(entry_obj-ent.entry-metadata, 1, 0); } } http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.38r2=1.55.2.39diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.38 php-src/ext/phar/util.c:1.55.2.39 --- php-src/ext/phar/util.c:1.55.2.38 Sun Oct 12 19:40:11 2008 +++ php-src/ext/phar/util.c Sun Oct 26 05:49:09 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: util.c,v 1.55.2.38 2008/10/12 19:40:11 cellog Exp $ */ +/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */ #include phar_internal.h @@ -2198,7 +2198,7 @@ } /* }}} */ -static void phar_update_cached_entry(void *data, void *argument) /* {{{ */ +static int phar_update_cached_entry(void *data, void *argument) /* {{{ */ { phar_entry_info *entry = (phar_entry_info *)data; TSRMLS_FETCH(); @@ -2221,7 +2221,7 @@ if (entry-metadata_len) { char *buf = estrndup((char *) entry-metadata, entry-metadata_len); /* assume success, we would have failed before */ - phar_parse_metadata((char **) entry-metadata, entry-metadata, entry-metadata_len TSRMLS_CC); + phar_parse_metadata((char **) buf, entry-metadata, entry-metadata_len TSRMLS_CC);
[PHP-CVS] cvs: php-src /ext/phar phar.c
cellog Sun Oct 26 05:51:04 2008 UTC Modified files: /php-src/ext/phar phar.c Log: last commit was an old patch, revert faulty line http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.391r2=1.392diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.391 php-src/ext/phar/phar.c:1.392 --- php-src/ext/phar/phar.c:1.391 Sun Oct 26 05:49:24 2008 +++ php-src/ext/phar/phar.c Sun Oct 26 05:51:04 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar.c,v 1.391 2008/10/26 05:49:24 cellog Exp $ */ +/* $Id: phar.c,v 1.392 2008/10/26 05:51:04 cellog Exp $ */ #define PHAR_MAIN 1 #include phar_internal.h @@ -1035,7 +1035,6 @@ /* check whether we have meta data, zero check works regardless of byte order */ if (mydata-is_persistent) { PHAR_GET_32(buffer, mydata-metadata_len); - if (!mydata-metadata_len) buffer -= 4; if (phar_parse_metadata(buffer, mydata-metadata, mydata-metadata_len TSRMLS_CC) == FAILURE) { MAPPHAR_FAIL(unable to read phar metadata in .phar file \%s\); } @@ -3625,7 +3624,7 @@ php_info_print_table_header(2, Phar: PHP Archive support, enabled); php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION); php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION); - php_info_print_table_row(2, CVS revision, $Revision: 1.391 $); + php_info_print_table_row(2, CVS revision, $Revision: 1.392 $); php_info_print_table_row(2, Phar-based phar archives, enabled); php_info_print_table_row(2, Tar-based phar archives, enabled); php_info_print_table_row(2, ZIP-based phar archives, enabled); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php