-
Notifications
You must be signed in to change notification settings - Fork 66
650: support gmake on freebsd #671
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
asgrim
wants to merge
3
commits into
php:1.5.x
Choose a base branch
from
asgrim:650-freebsd-gmake
base: 1.5.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Php\Pie\Platform; | ||
|
|
||
| use Symfony\Component\Process\Process; | ||
|
|
||
| use function assert; | ||
| use function file_exists; | ||
| use function is_executable; | ||
| use function Safe\preg_match; | ||
| use function trim; | ||
|
|
||
| /** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */ | ||
| final class MakePath | ||
| { | ||
| private static function looksLikeValidGnuMake(string $makePathToCheck): bool | ||
| { | ||
| if ($makePathToCheck === '') { | ||
| return false; | ||
| } | ||
|
|
||
| if (! file_exists($makePathToCheck) || ! is_executable($makePathToCheck)) { | ||
| return false; | ||
| } | ||
|
|
||
| $makeVersionProcess = new Process([$makePathToCheck, '--version']); | ||
| if ($makeVersionProcess->run() !== 0) { | ||
| return false; | ||
| } | ||
|
|
||
| return preg_match('/GNU Make/i', $makeVersionProcess->getOutput()) === 1; | ||
| } | ||
|
|
||
| /** | ||
| * PHP extension Makefiles (generated by phpize/configure) rely on GNU | ||
| * Make syntax. On some platforms (e.g. FreeBSD, NetBSD, OpenBSD), the | ||
| * `make` found on the PATH is the native BSD make, which cannot parse | ||
| * these Makefiles; GNU Make is available there as `gmake` instead. | ||
| * | ||
| * @return non-empty-string | ||
| */ | ||
| public static function guess(): string | ||
| { | ||
| foreach (['make', 'gmake'] as $candidate) { | ||
| // Note: depends on `which` existing, which doesn't always... | ||
| $which = new Process(['which', $candidate]); | ||
| if ($which->run() !== 0) { | ||
| continue; | ||
| } | ||
|
|
||
| $candidatePath = trim($which->getOutput()); | ||
|
|
||
| if (! self::looksLikeValidGnuMake($candidatePath)) { | ||
| continue; | ||
| } | ||
|
|
||
| assert($candidatePath !== ''); | ||
|
|
||
| return $candidatePath; | ||
| } | ||
|
|
||
| // Fall back to assuming/hoping make is on the path | ||
| return 'make'; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Php\PieUnitTest\Platform; | ||
|
|
||
| use Composer\Util\Platform; | ||
| use Php\Pie\Platform\MakePath; | ||
| use PHPUnit\Framework\Attributes\CoversClass; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| #[CoversClass(MakePath::class)] | ||
| final class MakePathTest extends TestCase | ||
| { | ||
| public function testGuessingFindsMakePath(): void | ||
| { | ||
| if (Platform::isWindows()) { | ||
| self::markTestSkipped('Guessing make path is not done for Windows as we are not building for Windows.'); | ||
| } | ||
|
|
||
| self::assertNotEmpty(MakePath::guess()); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC it could be that it inherits the current process verbosity, in which case if used in quiet mode for example you may not have an output there when you would expect to.
I vaguely remember that problem in Box and I'm about to fix some instances I noticed in Infection, but it's not clear 100% to me when it occurs so you may not be hit by this case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@theofidry is that specific to FreeBSD? or just in general? I've not observed this verbosity inheritance behaviour before... 🤔