svn: /web/php-rmtools/trunk/client/include/ Branch.php MakeLogParserVC.php Svn.php Tools.php
| From: | Pierre Joye | Date: | Tue, 23 Aug 2011 13:32:03 +0000 |
| Subject: | svn: /web/php-rmtools/trunk/client/include/ Branch.php MakeLogParserVC.php Svn.php Tools.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-12005@lists.php.net to get a copy of this message | ||
pajoye Tue, 23 Aug 2011 13:32:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315367
Log:
- cleanup&ws
Changed paths:
U web/php-rmtools/trunk/client/include/Branch.php
U web/php-rmtools/trunk/client/include/MakeLogParserVC.php
U web/php-rmtools/trunk/client/include/Svn.php
U web/php-rmtools/trunk/client/include/Tools.php
Modified: web/php-rmtools/trunk/client/include/Branch.php
===================================================================
--- web/php-rmtools/trunk/client/include/Branch.php 2011-08-23 13:27:19 UTC (rev 315366)
+++ web/php-rmtools/trunk/client/include/Branch.php 2011-08-23 13:32:03 UTC (rev 315367)
@@ -140,14 +140,14 @@
switch ($compiler) {
case 'vc9':
case 'vc6':
- $class_name = 'rmtools\BuildVC';
+ $build = new rmtools\BuildVC($this, $build_name);
break;
case 'icc':
case 'gcc':
throw new \Exception("$compiler not supported yet. Not implemented");
break;
}
- $build = new $class_name($this, $build_name);
+
return $build;
}
}
Modified: web/php-rmtools/trunk/client/include/MakeLogParserVC.php
===================================================================
--- web/php-rmtools/trunk/client/include/MakeLogParserVC.php 2011-08-23 13:27:19 UTC (rev 315366)
+++ web/php-rmtools/trunk/client/include/MakeLogParserVC.php 2011-08-23 13:32:03 UTC (rev 315367)
@@ -68,6 +68,7 @@
$word1=$matches[3][0];
$alphanum1=$matches[4][0];
$error_msg=trim(str_replace(array("\r","\n"),
array('',''),$matches[5][0]));
+ /** @noinspection PhpUnusedLocalVariableInspection */
$out .= "match 2: ($path) ($int1) ($word1) ($alphanum1) ($error_msg)\n";
$row = array(
'file' => $path,
Modified: web/php-rmtools/trunk/client/include/Svn.php
===================================================================
--- web/php-rmtools/trunk/client/include/Svn.php 2011-08-23 13:27:19 UTC (rev 315366)
+++ web/php-rmtools/trunk/client/include/Svn.php 2011-08-23 13:32:03 UTC (rev 315367)
@@ -35,7 +35,7 @@
public function getLastCommitId()
{
- $path = $this->repo_url . $this->module. $this->branch;
+ $path = $this->repo_url . $this->module. $this->branch;
$cmd = $this->svn_cmd . ' info --xml ' . $path;
$res = exec_sep_log($cmd);
Modified: web/php-rmtools/trunk/client/include/Tools.php
===================================================================
--- web/php-rmtools/trunk/client/include/Tools.php 2011-08-23 13:27:19 UTC (rev 315366)
+++ web/php-rmtools/trunk/client/include/Tools.php 2011-08-23 13:32:03 UTC (rev 315367)
@@ -242,7 +242,6 @@
include __DIR__ . '/../template/mail_notification.tpl.php';
$body = ob_get_contents();
ob_end_clean();
- echo $mail . "\n";
if (substr($to, -7) === 'php.net') {
$params = '-fnoreply@php.net';