cvs: php-gcov-web(SOC06) /cron MASTER_README config.sh cron.sh tags.inc template.php

nlopess Thu Sep 7 17:34:28 2006 UTC Modified files: (Branch: SOC06) /php-gcov-web/cron MASTER_README config.sh cron.sh tags.inc template.php Log: use the config.sh instead of overloading the tags file. remove the time_diff() function (moved to www) http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/MASTER_README?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-gcov-web/cron/MASTER_README diff -u php-gcov-web/cron/MASTER_README:1.1.2.1 php-gcov-web/cron/MASTER_README:1.1.2.2 --- php-gcov-web/cron/MASTER_README:1.1.2.1 Mon Aug 21 04:02:24 2006 +++ php-gcov-web/cron/MASTER_README Thu Sep 7 17:34:28 2006 @@ -44,7 +44,8 @@ PHP 5.1 and above is required to have the cron scripts function as server instance. Additionally, the master server instance will require several PHP extensions to be installed for proper operation, including: bzip2 -gd +ctype +gd pdo pdo-mysql http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/config.sh?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-gcov-web/cron/config.sh diff -u php-gcov-web/cron/config.sh:1.1.2.2 php-gcov-web/cron/config.sh:1.1.2.3 --- php-gcov-web/cron/config.sh:1.1.2.2 Sun Sep 3 13:06:00 2006 +++ php-gcov-web/cron/config.sh Thu Sep 7 17:34:28 2006 @@ -1,7 +1,13 @@ -#!/bin/sh - -PHPSRC=/tmp/gcov -TMPDIR=/tmp -OUTDIR=/www/gcov -CVSROOT=:pserver:cvsread@cvs.php.net:/repository -VALGRIND=valgrind +#!/bin/sh + +# where the files (sources, etc..) will be stored +PHPROOT=/tmp/gcov + +# the output dir (aka the place of the php-gcov-web checkout) +OUTROOT=/www/gcov + +# the cvsroot to be used for _new_ php-src checkouts +CVSROOT=:pserver:cvsread@cvs.php.net:/repository + +# set this to null if you don't want to run valgrind tests +VALGRIND=1 http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/cron.sh?r1=1.1.2.10&r2=1.1.2.11&diff_format=u Index: php-gcov-web/cron/cron.sh diff -u php-gcov-web/cron/cron.sh:1.1.2.10 php-gcov-web/cron/cron.sh:1.1.2.11 --- php-gcov-web/cron/cron.sh:1.1.2.10 Sun Sep 3 15:47:00 2006 +++ php-gcov-web/cron/cron.sh Thu Sep 7 17:34:28 2006 @@ -1,5 +1,6 @@ #!/bin/sh +source ./config.sh export LC_ALL=C # file that contains the PHP version tags @@ -16,8 +17,6 @@ TAGS_COUNT=${#TAGS_ARRAY[@]} BUILT_SOME=0 -PHPROOT=${TAGS_ARRAY[0]} -OUTROOT=${TAGS_ARRAY[1]} # Check for a build version passed to the script if [ $# -eq 1 ]; then @@ -27,7 +26,7 @@ fi # loop through each PHP version and perform the required builds -for (( i = 2 ; i < $TAGS_COUNT ; i += 1 )) +for (( i = 0 ; i < $TAGS_COUNT ; i += 1 )) do PHPTAG=${TAGS_ARRAY[i]} @@ -59,6 +58,10 @@ if [ -d ${PHPTAG} ]; then cd ${PHPTAG} cvs -q up + # CVS doesn't update the Zend dir automatically + cd Zend + cvs -q up + cd .. else cvs -q -d ${CVSROOT} co -d ${PHPTAG} -r ${PHPTAG} php-src cd ${PHPTAG} @@ -75,7 +78,6 @@ if ( make > /dev/null 2> ${TMPDIR}/php_build.log ); then - #test for success of the make operation MAKESTATUS=pass TEST_PHP_ARGS="-U -n -q --keep-all" http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/tags.inc?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: php-gcov-web/cron/tags.inc diff -u php-gcov-web/cron/tags.inc:1.1.2.6 php-gcov-web/cron/tags.inc:1.1.2.7 --- php-gcov-web/cron/tags.inc:1.1.2.6 Sun Sep 3 13:06:00 2006 +++ php-gcov-web/cron/tags.inc Thu Sep 7 17:34:28 2006 @@ -1,5 +1,3 @@ -/tmp/gcov -/www/gcov PHP_4_4 PHP_5_2 PHP_HEAD http://cvs.php.net/viewvc.cgi/php-gcov-web/cron/template.php?r1=1.1.2.4&r2=1.1.2.5&diff_format=u Index: php-gcov-web/cron/template.php diff -u php-gcov-web/cron/template.php:1.1.2.4 php-gcov-web/cron/template.php:1.1.2.5 --- php-gcov-web/cron/template.php:1.1.2.4 Fri Sep 1 16:57:03 2006 +++ php-gcov-web/cron/template.php Thu Sep 7 17:34:28 2006 @@ -1,34 +1,14 @@ <?php +date_default_timezone_set('UTC'); function html_footer() { - date_default_timezone_set('UTC'); $timestamp = time(); $date = date('r', $timestamp); return <<< HTML -<?php - function time_diff() - { - date_default_timezone_set('UTC'); - \$diff = time() - $timestamp; - - if (\$diff < 60) - { - echo "\$diff seconds"; - } - elseif(\$diff < 3600) - { - echo intval(\$diff/60) ." minutes"; - } else - { - echo intval(\$diff/3600) ." hours"; - } - } -?> - <p>&nbsp;</p> -<p align="center"><small>Generated at $date (<?php time_diff(); ?> ago)</small></p> +<p align="center"><small>Generated at $date (<?php echo time_diff($timestamp, true); ?> ago)</small></p> HTML; }