holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow for comments in externals file

Browse Source
This commit is contained in:
Ralf Becker 2010-05-25 20:39:08 +00:00
parent f478c91069
commit a2f59c855b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/rpm-build/checkout-build-archives.php
View File

@ -384,7 +384,7 @@ function do_checkout()
} }
if(file_exists($config['aliasdir'])) if(file_exists($config['aliasdir']))
{ {
die('"egroupware" applications must be first one in externals!'); die("'egroupware' applications must be first one in externals!\n");
} }
$cmd .= ' '.$repo.'/'.$config['svntag'].'/'.basename($path); $cmd .= ' '.$repo.'/'.$config['svntag'].'/'.basename($path);
} }
@ -459,8 +459,9 @@ function do_svntag()
$config['modules'] = array(); $config['modules'] = array();
foreach($output as $line) foreach($output as $line)
{ {
if ($line[0] == '#') continue;
list($path,$url) = preg_split('/[ \t\r\n]+/',trim($line)); list($path,$url) = preg_split('/[ \t\r\n]+/',trim($line));
if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die('Invalid SVN URL!'); if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
$repo = $matches[1]; $repo = $matches[1];
$config['modules'][$repo][$path] = $url; $config['modules'][$repo][$path] = $url;
} }
@ -474,7 +475,7 @@ function do_svntag()
$url = strpos($module,'://') === false ? $svnbranch.'/' : ''; $url = strpos($module,'://') === false ? $svnbranch.'/' : '';
$url .= $module; $url .= $module;
if (strpos($module,'://') !== false) $module = basename($module); if (strpos($module,'://') !== false) $module = basename($module);
if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die('Invalid SVN URL!'); if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
$repo = $matches[1]; $repo = $matches[1];
$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url; $config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
} }