[PHP-WEBMASTER] com web/rmtools: fix deps dir path: include/BuildVC.php

[Anatol Belski]

Commit:    b58f5d20a312aaa1e525c75d4231962c5846ffa9
Author:    Anatol Belski <a...@php.net>         Thu, 10 Aug 2017 15:00:44 +0200
Parents:   c0a4bdcbdae1c1c39f636ac8006359cdbbf49f0d
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=b58f5d20a312aaa1e525c75d4231962c5846ffa9

Log:
fix deps dir path

Changed paths:
  M  include/BuildVC.php


Diff:
diff --git a/include/BuildVC.php b/include/BuildVC.php
index 22ff570..f962cd2 100644
--- a/include/BuildVC.php
+++ b/include/BuildVC.php
@@ -123,7 +123,7 @@ class BuildVC {
        function isPgoSetup()
        {
                $env = $this->env;
-               $env["PATH"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR 
. "deps;" . $env["PATH"];
+               $env["Path"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR 
. "deps;" . $env["Path"];
 
                $cmd = 'phpsdk_pgo --ready';
                $ret = exec_single_log($cmd, $this->build_dir, $env);
@@ -138,7 +138,7 @@ class BuildVC {
        {
                $this->log_pgo = isset($this->log_pgo) ? $this->log_pgo . "\n" 
: "";
                $env = $this->env;
-               $env["PATH"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR 
. "deps;" . $env["PATH"];
+               $env["Path"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR 
. "deps" . DIRECTORY_SEPARATOR . "bin;" . $env["Path"];
 
                $cmd = 'phpsdk_pgo --init';
                $ret = exec_single_log($cmd, $this->build_dir, $env);
@@ -152,7 +152,7 @@ class BuildVC {
        {
                $this->log_pgo = isset($this->log_pgo) ? $this->log_pgo . "\n" 
: "";
                $env = $this->env;
-               $env["PATH"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR 
. "deps;" . $env["PATH"];
+               $env["Path"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR 
. "deps" . DIRECTORY_SEPARATOR . "bin;" . $env["Path"];
 
                $cmd = 'phpsdk_pgo --train';
                $ret = exec_single_log($cmd, $this->build_dir, $env);
@@ -170,6 +170,9 @@ class BuildVC {
                if (is_dir($this->obj_dir) && $rm_obj === true) {
                        rmdir_rf($this->obj_dir);
                }
+               if (is_dir($this->obj_dir)) {
+                       $this->clean();
+               }
                mkdir($this->obj_dir, 0655, true);
                $ret = exec_single_log($cmd, $this->build_dir, $this->env);
                if (!$ret) {


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php