revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-29 10:12:41 +01:00
Code Issues Releases Wiki Activity

Support Windows

Browse source 
Test Plan:
Enable setup.
Disable setup.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D2118
This commit is contained in:
vrana 2012-04-05 23:50:55 -07:00
parent 426d6f2b1f
commit 23988ca482
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/__init_env__.php
View file

@ -1,7 +1,7 @@
<?php <?php
/* /*
* Copyright 2011 Facebook, Inc. * Copyright 2012 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,7 +17,9 @@
*/ */
$include_path = ini_get('include_path'); $include_path = ini_get('include_path');
ini_set('include_path', $include_path.':'.dirname(__FILE__).'/../../'); ini_set(
'include_path',
$include_path.PATH_SEPARATOR.dirname(__FILE__).'/../../');
require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php'; require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';

7
scripts/__init_script__.php
View file

@ -20,7 +20,9 @@ error_reporting(E_ALL | E_STRICT);
ini_set('display_errors', 1); ini_set('display_errors', 1);
$include_path = ini_get('include_path'); $include_path = ini_get('include_path');
ini_set('include_path', $include_path.':'.dirname(__FILE__).'/../../'); ini_set(
'include_path',
$include_path.PATH_SEPARATOR.dirname(__FILE__).'/../../');
@include_once 'libphutil/scripts/__init_script__.php'; @include_once 'libphutil/scripts/__init_script__.php';
if (!@constant('__LIBPHUTIL__')) { if (!@constant('__LIBPHUTIL__')) {
echo "ERROR: Unable to load libphutil. Update your PHP 'include_path' to ". echo "ERROR: Unable to load libphutil. Update your PHP 'include_path' to ".
@ -34,9 +36,6 @@ phutil_load_library(dirname(__FILE__).'/../src/');
// are not vulnerable to CSRF. // are not vulnerable to CSRF.
AphrontWriteGuard::allowDangerousUnguardedWrites(true); AphrontWriteGuard::allowDangerousUnguardedWrites(true);
$include_path = ini_get('include_path');
ini_set('include_path', $include_path.':'.dirname(__FILE__).'/../../');
require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php'; require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';
$env = isset($_SERVER['PHABRICATOR_ENV']) $env = isset($_SERVER['PHABRICATOR_ENV'])

4
src/infrastructure/setup/PhabricatorSetup.php
View file

@ -233,8 +233,8 @@ final class PhabricatorSetup {
// unreasonable and we don't need it from Apache, so do an explicit test // unreasonable and we don't need it from Apache, so do an explicit test
// for CLI availability. // for CLI availability.
list($err, $stdout, $stderr) = exec_manual( list($err, $stdout, $stderr) = exec_manual(
'%s/scripts/setup/pcntl_available.php', 'php %s',
$root); "{$root}/scripts/setup/pcntl_available.php");
if ($err) { if ($err) {
self::writeFailure(); self::writeFailure();
self::write("Unable to execute scripts/setup/pcntl_available.php to ". self::write("Unable to execute scripts/setup/pcntl_available.php to ".

4
webroot/index.php
View file

@ -198,7 +198,9 @@ function setup_aphront_basics() {
$root = $_SERVER['PHUTIL_LIBRARY_ROOT']; $root = $_SERVER['PHUTIL_LIBRARY_ROOT'];
} }
ini_set('include_path', $libraries_root.':'.ini_get('include_path')); ini_set(
'include_path',
$libraries_root.PATH_SEPARATOR.ini_get('include_path'));
@include_once $root.'libphutil/src/__phutil_library_init__.php'; @include_once $root.'libphutil/src/__phutil_library_init__.php';
if (!@constant('__LIBPHUTIL__')) { if (!@constant('__LIBPHUTIL__')) {
echo "ERROR: Unable to load libphutil. Put libphutil/ next to ". echo "ERROR: Unable to load libphutil. Put libphutil/ next to ".