com web/rmtools: Support php_opcache profiling for PGO builds: client/data/config/branch/php55.ini clie nt/script/snap.php

Commit: 60d6f8045b6fc745cc1ca9dcf75884ccd3991436 Author: Stephen Zarkos <stephen.zarkos@microsoft.com> Wed, 20 Mar 2013 13:30:13 -0700 Parents: fce0f07ce16b68d397c64be19aba44023883603d Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=60d6f8045b6fc745cc1ca9dcf75884ccd3991436 Log: Support php_opcache profiling for PGO builds Changed paths: M client/data/config/branch/php55.ini M client/script/snap.php Diff: diff --git a/client/data/config/branch/php55.ini b/client/data/config/branch/php55.ini index 1826009..c77f163 100644 --- a/client/data/config/branch/php55.ini +++ b/client/data/config/branch/php55.ini @@ -4,21 +4,23 @@ repo_name=phpnet repo_module=php-src.git repo_branch=refs/heads/PHP-5.5 build_dir=c:/obj -build_location=c:/php-sdk/snap_5_5/vc9/x86/ +build_location=c:/php-sdk/snap_5_5/vc11/x86/ appver=2008 debug=0 pgo=1 +compiler=vc11 +arch=x86 -[build-nts-windows-vc9-x86] -name=nts-windows-vc9-x86 -compiler=vc9 +[build-nts-windows-vc11-x86] +name=nts-windows-vc11-x86 +compiler=vc11 arch=x86 configure_options=--enable-snapshot-build --disable-zts --disable-isapi --enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web --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 --enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze platform=windows -[build-ts-windows-vc9-x86] -name=ts-windows-vc9-x86 -compiler=vc9 +[build-ts-windows-vc11-x86] +name=ts-windows-vc11-x86 +compiler=vc11 arch=x86 configure_options=--enable-snapshot-build --disable-isapi --enable-debug-pack --disable-nsapi --without-mssql --without-pdo-mssql --without-pi3web --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 --enable-com-dotnet=shared --with-mcrypt=static --disable-static-analyze platform=windows \ No newline at end of file diff --git a/client/script/snap.php b/client/script/snap.php index ee0bcbb..c53a451 100644 --- a/client/script/snap.php +++ b/client/script/snap.php @@ -114,10 +114,16 @@ if ($force || $branch->hasNewRevision()) { } if ($branch->config->getPGO() == 1) { if ($build->archive_path) { - echo "Running pgo_controller.ps1 with PGI build at $build->archive_path, ver=$branch_name\n"; + echo "Running pgo_controller.ps1 with PGI build at $build->archive_path, ver=$branch_name, opcache=0\n"; $cmd = 'c:\windows\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command C:\php-sdk\pgo-build\pgo_controller.ps1 -PHPBUILD '. $build->archive_path . ' -PHPVER ' . $branch_name; $pgolog = rm\exec_single_log($cmd); print_r($pgolog); + if ( preg_match('/5\.5/', $branch_name) ) { + echo "Running pgo_controller.ps1 with PGI build at $build->archive_path, ver=$branch_name, opcache=1\n"; + $cmd = 'c:\windows\system32\WindowsPowerShell\v1.0\powershell..exe -NonInteractive -Command C:\php-sdk\pgo-build\pgo_controller.ps1 -PHPBUILD '. $build->archive_path . ' -PHPVER ' . $branch_name . ' -OPCACHE 1'; + $pgolog = rm\exec_single_log($cmd); + print_r($pgolog); + } echo "Creating PGO build\n"; try {