Merge pull request #176 from vbardales/fix-build-command
create sql folder if not exists + CS
This commit is contained in:
commit
ea7653d2c7
|
@ -63,6 +63,10 @@ EOT
|
||||||
$filesystem->remove($cacheDir);
|
$filesystem->remove($cacheDir);
|
||||||
$filesystem->mkdir($cacheDir);
|
$filesystem->mkdir($cacheDir);
|
||||||
|
|
||||||
|
if (!$filesystem->exists($sqlDir)) {
|
||||||
|
$filesystem->mkdir($sqlDir);
|
||||||
|
}
|
||||||
|
|
||||||
// Execute the task
|
// Execute the task
|
||||||
$ret = $this->callPhing('build-sql', array(
|
$ret = $this->callPhing('build-sql', array(
|
||||||
'propel.sql.dir' => $cacheDir
|
'propel.sql.dir' => $cacheDir
|
||||||
|
@ -77,10 +81,9 @@ EOT
|
||||||
$fileExt = pathinfo($file->getFilename(), PATHINFO_EXTENSION);
|
$fileExt = pathinfo($file->getFilename(), PATHINFO_EXTENSION);
|
||||||
$finalLocation = $sqlDir. DIRECTORY_SEPARATOR. $file->getFilename();
|
$finalLocation = $sqlDir. DIRECTORY_SEPARATOR. $file->getFilename();
|
||||||
|
|
||||||
if($fileExt === 'map' && $filesystem->exists($finalLocation)) {
|
if ($fileExt === 'map' && $filesystem->exists($finalLocation)) {
|
||||||
$this->mergeMapFiles($finalLocation, (string) $file);
|
$this->mergeMapFiles($finalLocation, (string) $file);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$filesystem->remove($finalLocation);
|
$filesystem->remove($finalLocation);
|
||||||
$filesystem->rename((string) $file, $finalLocation);
|
$filesystem->rename((string) $file, $finalLocation);
|
||||||
}
|
}
|
||||||
|
@ -105,18 +108,21 @@ EOT
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reads the existing target and the generated map files, and adds to the
|
* Reads the existing target and the generated map files, and adds to the
|
||||||
* target the missing lines that are in the generated file.
|
* target the missing lines that are in the generated file.
|
||||||
*
|
*
|
||||||
* @param string $target target map filename
|
* @param string $target target map filename
|
||||||
* @param string $generated generated map filename
|
* @param string $generated generated map filename
|
||||||
*
|
*
|
||||||
* @return boolean result
|
* @return boolean result
|
||||||
*/
|
*/
|
||||||
protected function mergeMapFiles($target, $generated) {
|
protected function mergeMapFiles($target, $generated)
|
||||||
|
{
|
||||||
if(($targetContent = file($target)) === false)
|
if(($targetContent = file($target)) === false)
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
if(($generatedContent = file($generated)) === false)
|
if(($generatedContent = file($generated)) === false)
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
$targetContent = array_merge($generatedContent, array_diff($targetContent, $generatedContent));
|
$targetContent = array_merge($generatedContent, array_diff($targetContent, $generatedContent));
|
||||||
|
|
Loading…
Reference in a new issue