revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-02-17 01:08:40 +01:00
Code Issues Releases Wiki Activity

Fix checking for lint binary paths

Browse source 
Summary: Like D4379.

Test Plan:
  $ arc unit

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D4391
This commit is contained in:
vrana 2013-01-10 15:22:49 -08:00
parent 767f9457c1
commit 80cd881fb1
4 changed files with 46 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/lint/linter/ArcanistCppcheckLinter.php
View file

@ -32,22 +32,15 @@ final class ArcanistCppcheckLinter extends ArcanistLinter {
public function getLintPath() {
$working_copy = $this->getEngine()->getWorkingCopy();
$prefix = $working_copy->getConfig('lint.cppcheck.prefix');
$bin = $working_copy->getConfig('lint.cppcheck.bin');
if ($bin === null && $prefix === null) {
$bin = 'cppcheck';
} else {
if ($bin === null) {
$bin = 'cppcheck';
}
$bin = $working_copy->getConfig('lint.cppcheck.bin', 'cppcheck');
if ($prefix !== null) {
if (!Filesystem::pathExists($prefix.'/'.$bin)) {
throw new ArcanistUsageException(
"Unable to find cppcheck binary in a specified directory. Make ".
"sure that 'lint.cppcheck.prefix' and 'lint.cppcheck.bin' keys are".
" set correctly. If you'd rather use a copy of cppcheck installed ".
"globally, you can just remove these keys from your .arcconfig");
"sure that 'lint.cppcheck.prefix' and 'lint.cppcheck.bin' keys are ".
"set correctly. If you'd rather use a copy of cppcheck installed ".
"globally, you can just remove these keys from your .arcconfig.");
}
$bin = csprintf("%s/%s", $prefix, $bin);
@ -59,16 +52,14 @@ final class ArcanistCppcheckLinter extends ArcanistLinter {
list($err) = exec_manual('which %s', $bin);
if ($err) {
throw new ArcanistUsageException(
"cppcheck does not appear to be installed on this system. Install".
"it (from http://cppcheck.sourceforge.net/) or configure".
"'lint.cppcheck.prefix' in your .arcconfig to point to the".
"cppcheck does not appear to be installed on this system. Install ".
"it (from http://cppcheck.sourceforge.net/) or configure ".
"'lint.cppcheck.prefix' in your .arcconfig to point to the ".
"directory where it resides."
);
}
}
return $bin;
}
public function lintPath($path) {

17
src/lint/linter/ArcanistCpplintLinter.php
View file

@ -27,14 +27,7 @@ final class ArcanistCpplintLinter extends ArcanistLinter {
public function getLintPath() {
$working_copy = $this->getEngine()->getWorkingCopy();
$prefix = $working_copy->getConfig('lint.cpplint.prefix');
$bin = $working_copy->getConfig('lint.cpplint.bin');
if ($bin === null && $prefix === null) {
$bin = 'cpplint.py';
} else {
if ($bin === null) {
$bin = 'cpplint.py';
}
$bin = $working_copy->getConfig('lint.cpplint.bin', 'cpplint.py');
if ($prefix !== null) {
if (!Filesystem::pathExists($prefix.'/'.$bin)) {
@ -42,7 +35,7 @@ final class ArcanistCpplintLinter extends ArcanistLinter {
"Unable to find cpplint.py binary in a specified directory. Make ".
"sure that 'lint.cpplint.prefix' and 'lint.cpplint.bin' keys are ".
"set correctly. If you'd rather use a copy of cpplint installed ".
"globally, you can just remove these keys from your .arcconfig");
"globally, you can just remove these keys from your .arcconfig.");
}
$bin = csprintf("%s/%s", $prefix, $bin);
@ -54,16 +47,14 @@ final class ArcanistCpplintLinter extends ArcanistLinter {
list($err) = exec_manual('which %s', $bin);
if ($err) {
throw new ArcanistUsageException(
"cpplint.py does not appear to be installed on this system. Install".
"cpplint.py does not appear to be installed on this system. Install ".
"it (e.g., with 'wget \"http://google-styleguide.googlecode.com/".
"svn/trunk/cpplint/cpplint.py\"') or configure 'lint.cpplint.prefix'".
"svn/trunk/cpplint/cpplint.py\"') or configure 'lint.cpplint.prefix' ".
"in your .arcconfig to point to the directory where it resides. ".
"Also don't forget to chmod a+x cpplint.py!");
}
}
return $bin;
}
public function lintPath($path) {

2
src/lint/linter/ArcanistFlake8Linter.php
View file

@ -35,7 +35,7 @@ final class ArcanistFlake8Linter extends ArcanistLinter {
"Unable to find flake8 binary in a specified directory. Make sure ".
"that 'lint.flake8.prefix' and 'lint.flake8.bin' keys are set ".
"correctly. If you'd rather use a copy of flake8 installed ".
"globally, you can just remove these keys from your .arcconfig");
"globally, you can just remove these keys from your .arcconfig.");
}
$bin = csprintf("%s/%s", $prefix, $bin);

2
src/lint/linter/ArcanistPEP8Linter.php
View file

@ -59,7 +59,7 @@ final class ArcanistPEP8Linter extends ArcanistLinter {
"Unable to find PEP8 binary in a specified directory. Make sure ".
"that 'lint.pep8.prefix' and 'lint.pep8.bin' keys are set ".
"correctly. If you'd rather use a copy of PEP8 installed ".
"globally, you can just remove these keys from your .arcconfig");
"globally, you can just remove these keys from your .arcconfig.");
}
$bin = csprintf("%s/%s", $prefix, $bin);