darkkirb/composer2nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correctly compose relative paths to the composition expression

Browse source
This commit is contained in:
Sander van der Burg 2018-05-10 16:40:39 +02:00
parent 0615fec7f3
commit c205febd60
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Composer2Nix/Expressions/CompositionExpression.php
View file

@ -24,16 +24,29 @@ class CompositionExpression extends NixASTNode
/** Path to the composer environment expression containing the build functionality */ /** Path to the composer environment expression containing the build functionality */
public $composerEnvFile; public $composerEnvFile;
private function relativePath($from, $to, $ps = DIRECTORY_SEPARATOR)
{
$arFrom = explode($ps, rtrim($from, $ps));
$arTo = explode($ps, rtrim($to, $ps));
while(count($arFrom) && count($arTo) && ($arFrom[0] == $arTo[0]))
{
array_shift($arFrom);
array_shift($arTo);
}
return str_pad("", count($arFrom) * 3, '..'.$ps).implode($ps, $arTo);
}
/** /**
* Composes a new composition expression object. * Composes a new composition expression object.
* *
* @param string $outputFile Path to the packages Nix expression * @param string $outputFile Path to the packages Nix expression
* @param string $composerEnvFile Path to the composer environment expression containing the build functionality * @param string $composerEnvFile Path to the composer environment expression containing the build functionality
*/ */
public function __construct($outputFile, $composerEnvFile) public function __construct($baseDir, $outputFile, $composerEnvFile)
{ {
$this->outputFile = $outputFile; $this->outputFile = CompositionExpression::relativePath($baseDir, realpath($outputFile));
$this->composerEnvFile = $composerEnvFile; $this->composerEnvFile = CompositionExpression::relativePath($baseDir, realpath($composerEnvFile));
} }
/** /**

3
src/Composer2Nix/Generator.php
View file

@ -27,7 +27,8 @@ class Generator
private static function generateCompositionExpression($compositionFile, $outputFile, $composerEnvFile) private static function generateCompositionExpression($compositionFile, $outputFile, $composerEnvFile)
{ {
Generator::writeExprToFile($compositionFile, new CompositionExpression($outputFile, $composerEnvFile)); $baseDir = realpath(dirname($compositionFile));
Generator::writeExprToFile($compositionFile, new CompositionExpression($baseDir, $outputFile, $composerEnvFile));
} }
private static function copyComposerEnv($composerEnvFile, $noCopyComposerEnv) private static function copyComposerEnv($composerEnvFile, $noCopyComposerEnv)