From: <Wil...@nt...> - 2005-04-19 09:38:04
|
Author: WillNorris Date: 2005-04-19 02:36:52 -0700 (Tue, 19 Apr 2005) New Revision: 4044 Modified: twiki/branches/DEVELOP/tools/builddistros.pl Log: TWikiTestInfrastructure: fixed bug in 'parsing' the branch name (used to require a kludge file with the name of the branch, now gets it from svn info) Modified: twiki/branches/DEVELOP/tools/builddistros.pl =================================================================== --- twiki/branches/DEVELOP/tools/builddistros.pl 2005-04-19 09:31:40 UTC (rev 4043) +++ twiki/branches/DEVELOP/tools/builddistros.pl 2005-04-19 09:36:52 UTC (rev 4044) @@ -24,9 +24,12 @@ ################################################################################ # build the twiki-kernel -my ( $svnRev ) = ( ( grep { /^Revision:\s+(\d+)$/ } `svn info .` )[0] ) =~ /(\d+)$/; -execute ( "cd distro/ ; ./build-twiki-kernel.pl --nozip --tempdir=/tmp --outputdir=$outputDir --outfile=TWikiKernel-`head -n 1 branch`-$svnRev" ) or die $!; +chomp( my @svnInfo = `svn info .` ); +my ( $svnRev ) = ( ( grep { /^Revision:\s+(\d+)$/ } @svnInfo )[0] ) =~ /(\d+)$/; +my ( $branch ) = ( ( grep { /^URL:/ } @svnInfo )[0] ) =~ m/^.+?\/branches\/([^\/]+)\/.+?$/; +execute ( "cd distro/ ; ./build-twiki-kernel.pl --nozip --tempdir=/tmp --outputdir=$outputDir --outfile=TWikiKernel-$branch-$svnRev" ) or die $!; + print "</verbatim>\n"; print "<HR />\n"; |