com web/rmtools: Re-enable json uploading: client/data/config/branch/php54.ini client/script/snap.php

Commit: 8bd4ffdd1fab034aed1ec8518e5e284293550563 Author: Stephen Zarkos <stephen.zarkos@microsoft.com> Thu, 29 Nov 2012 10:40:12 -0800 Parents: 35b6a4d499b586a12a92da36598e761109920417 Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=8bd4ffdd1fab034aed1ec8518e5e284293550563 Log: Re-enable json uploading Changed paths: M client/data/config/branch/php54.ini M client/script/snap.php Diff: diff --git a/client/data/config/branch/php54.ini b/client/data/config/branch/php54.ini index abbb264..19f1f62 100644 --- a/client/data/config/branch/php54.ini +++ b/client/data/config/branch/php54.ini @@ -5,6 +5,8 @@ repo_module=php-src.git repo_branch=refs/heads/PHP-5.4 build_dir=c:/obj build_location=c:/php-sdk/snap_5_4/vc9/x86/ +appver=xp +debug=0 pgo=1 [build-nts-windows-vc9-x86] diff --git a/client/script/snap.php b/client/script/snap.php index c3fd506..e3ab250 100644 --- a/client/script/snap.php +++ b/client/script/snap.php @@ -174,11 +174,8 @@ if ($force || $branch->hasNewRevision()) { $json_data['build_error'] = $build_errors[$build_name]; } - if (strcmp($branch_name, 'php-5.4') != 0) { - $json = json_encode($json_data); - file_put_contents($toupload_dir . '/' . $json_filename, $json); - } - + $json = json_encode($json_data); + file_put_contents($toupload_dir . '/' . $json_filename, $json); rm\upload_build_result_ftp_curl($toupload_dir, $branch_name . '/r' . $last_rev); // $build->clean(); rmdir($build_src_path); @@ -191,7 +188,7 @@ if (!$new_rev) { } /*Upload the branch DB */ -//rm\upload_file($branch->db_path, $branch_name . '/' . basename($branch->db_path)); +rm\upload_file($branch->db_path, $branch_name . '/' . basename($branch->db_path)); if ($has_build_errors) { rm\send_error_notification($branch_name, $build_errors, $branch->getPreviousRevision(), $last_rev, 'http://windows.php.net/downloads/snaps/' . $branch_name . '/r' . $last_rev);