com web/rmtools: git proper TMP_DIR: data/config.php
| From: | Anatol Belski | Date: | Thu, 17 Nov 2016 01:02:17 +0000 |
| Subject: | com web/rmtools: git proper TMP_DIR: data/config.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25901@lists.php.net to get a copy of this message | ||
Commit: 27400fd1f3f010cf56f4f8f57d9e3f8c82f028eb
Author: Anatol Belski <ab@php.net> Thu, 17 Nov 2016 02:02:17 +0100
Parents: 9865f442ef793db654717108d261bf0f66a2be5b
Branches: master
Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=27400fd1f3f010cf56f4f8f57d9e3f8c82f028eb
Log:
git proper TMP_DIR
Changed paths:
M data/config.php
Diff:
diff --git a/data/config.php b/data/config.php
index 2064b9b..a543037 100644
--- a/data/config.php
+++ b/data/config.php
@@ -17,17 +17,12 @@ foreach ($required_exts as $ext) {
}
}
-$rmtools_base = getenv('RMTOOLS_BASE_DIR');
-
-if (!$rmtools_base) {
- $rmtools_base = '/home/web/rmtools.php.net';
+$tmp = getenv('PHP_RMTOOLS_TMP_PATH');
+if (!$tmp) {
+ throw new \Exception("Temporary path '$tmp' doesn't exist");
}
+define('TMP_DIR', $tmp);
-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:\apps\slicksvn\bin;c:\\php-sdk\\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' => 'c:\\php-sdk\\bin\\bison.simple'
- );
+/* XXX might remove this later */
+$custom_env = array();