A few minor tweaks about HPHP_HOME

I think everything should work without it now.
Esse commit está contido em:
Jordan DeLong
2013-04-29 14:28:23 -07:00
commit de Sara Golemon
commit b3ae38b6c0
2 arquivos alterados com 4 adições e 3 exclusões
+2 -1
Ver Arquivo
@@ -161,7 +161,8 @@ std::string Option::GetSystemRoot() {
if (SystemRoot.empty()) {
const char *home = getenv("HPHP_HOME");
if (!home || !*home) {
throw Exception("Environment variable HPHP_HOME is not set.");
throw Exception("Environment variable HPHP_HOME is not set, "
"and neither is the SystemRoot option.");
}
SystemRoot = home;
SystemRoot += "/hphp";
+2 -2
Ver Arquivo
@@ -73,8 +73,8 @@ function idx_file($array, $key, $default = null) {
}
function bin_root() {
return idx($_ENV, 'FBMAKE_BIN_ROOT',
is_dir(hphp_home().'/_bin') ?
return idx($_ENV, 'FBMAKE_BIN_ROOT',
is_dir(hphp_home().'/_bin') ?
hphp_home().'/_bin' : # fbmake
hphp_home() # github
);