[eGroupWare-svn] r32371 - /branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php

[<ral...@us...>]

Author: ralfbecker
Date: Wed Sep 29 12:20:33 2010
New Revision: 32371

URL: http://www.egroupware.org/viewvc/egroupware?rev=32371&view=rev
Log:
fixed editsvnchangelog to work with community version and committing changelog before checkout, so it will be included in the archives too

Modified:
    branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php

Modified: branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php?rev=32371&r1=32370&r2=32371&view=diff
==============================================================================
--- branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php (original)
+++ branches/1.8/egroupware/doc/rpm-build/checkout-build-archives.php Wed Sep 29 12:20:33 2010
@@ -43,7 +43,7 @@
 	'svntag' => 'tags/$version.$packaging',	// eg. '$version.$packaging'
 	'release' => 'ralfbecker,egr...@fr...:/home/frs/project/e/eg/egroupware/eGroupware-$version/eGroupware-$version.$packaging/',
 	'skip' => array(),
-	'run' => array('svntag','checkout','copy','virusscan','create','sign','obs')
+	'run' => array('editsvnchangelog','svntag','checkout','copy','virusscan','create','sign','obs','release')
 );
 
 // process config from command line
@@ -190,6 +190,9 @@
 	{
 		die("\nChangelog must not be empty --> aborting\n\n");
 	}
+	file_put_contents(__DIR__.'/debian.changelog', $config['changelog']);
+	$cmd = $svn." commit -m 'Changelog for $config[version].$config[packaging]' ".__DIR__.'/debian.changelog';
+	die($cmd);
 }
 
 /**
@@ -211,7 +214,7 @@
 	{
 		list($tags_url,$branch) = explode('/branches/',$branch_url);
 		$tags_url .= '/tags';
-		$pattern=str_replace('Stylite-EPL-10\.1',preg_quote($branch),'/tags\/(Stylite-EPL-10\.1\.\d{8})/');
+		$pattern=str_replace('Stylite-EPL-10\.1',preg_quote($branch),'/tags\/(Stylite-EPL-10\.1\.[0-9.]+)/');
 		$revision = get_last_svn_tag($tags_url,$pattern,$matches);
 		$tag = $matches[1];
 	}