svn: /web/php-rmtools/trunk/client/ data/config.php include/BuildVC.php

pajoye Thu, 25 Aug 2011 12:58:06 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=315479 Log: - add default config, easier to dev Changed paths: U web/php-rmtools/trunk/client/data/config.php U web/php-rmtools/trunk/client/include/BuildVC.php Modified: web/php-rmtools/trunk/client/data/config.php =================================================================== --- web/php-rmtools/trunk/client/data/config.php 2011-08-25 12:36:02 UTC (rev 315478) +++ web/php-rmtools/trunk/client/data/config.php 2011-08-25 12:58:06 UTC (rev 315479) @@ -8,3 +8,9 @@ } define('TMP_DIR', $rmtools_base . '/tmp'); +$custom_env = array( +'PATH' => "C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\Bin;C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\vcpackages;C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\Common7\\IDE;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Bin\\x64;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Bin;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;C:\\Windows\\Microsoft.NET\\Framework\\v2.0.50727;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;C:\\Program Files\\Common Files\\Microsoft Shared\\Windows Live;C:\\Program Files (x86)\\Common Files\\Microsoft Shared\\Windows Live;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\WinMerge;g:\\apps\\gnuwin32\\bin;C:\\Program Files (x86)\\TortoiseGit\\bin;C:\\Program Files (x86)\\Windows Live\\Shared;C:\\Program Files\\SlikSvn\\bin\\;g:\\php-sdk\\bin\\..\\bin;g:\\php-sdk\\bin\\;C:\\Program Files\\SlikSvn\\bin;C:\\Program! Files (x86)\\Bazaar;g:\\apps\\perl\\bin", +'INCLUDE' => "C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\Include;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Include;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Include\\gl;C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\ATLMFC\\INCLUDE;", +'LIB' => "C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\Lib;C:\\Program Files\\Microsoft SDKs\\Windows\\v6.1\\Lib;C:\\Program Files (x86)\\Microsoft Visual Studio 9.0\\VC\\ATLMFC\\LIB;", +'BISON_SIMPLE' => 'g:\\php-sdk\\bin\\bison.simple' + ); \ No newline at end of file Modified: web/php-rmtools/trunk/client/include/BuildVC.php =================================================================== --- web/php-rmtools/trunk/client/include/BuildVC.php 2011-08-25 12:36:02 UTC (rev 315478) +++ web/php-rmtools/trunk/client/include/BuildVC.php 2011-08-25 12:58:06 UTC (rev 315479) @@ -41,10 +41,17 @@ $vc_env_prefix .= '_'; } - $env = array(); - $env['PATH'] = getenv($vc_env_prefix . 'PATH') . ';' . getenv('PATH') ; - $env['INCLUDE'] = getenv($vc_env_prefix . 'INCLUDE'); - $env['LIB'] = getenv($vc_env_prefix . 'LIB'); + $path = getenv($vc_env_prefix . 'PATH'); + if (empty($path)) { + include __DIR__ . '/../data/config.php'; + /* use default config */ + $env = $custom_env; + } else { + $env = array(); + $env['PATH'] = getenv($vc_env_prefix . 'PATH') . ';' . getenv('PATH') ; + $env['INCLUDE'] = getenv($vc_env_prefix . 'INCLUDE'); + $env['LIB'] = getenv($vc_env_prefix . 'LIB'); + } /* We don't support anymore VC6, so calling these scripts from the SDK are just fine */ @@ -56,7 +63,9 @@ $env['TMP'] = $env['TEMP'] = getenv('TEMP'); $env['SystemDrive'] = getenv('SystemDrive'); $env['SystemRoot'] = getenv('SystemRoot'); - $env['BISON_SIMPLE'] = getenv('BISON_SIMPLE'); + if (!isset($env['BISON_SIMPLE'])) { + $env['BISON_SIMPLE'] = getenv('BISON_SIMPLE'); + } $this->env = $env; }