Merge
authorDario Sestito <darios@symbian.org>
Thu, 06 Aug 2009 11:11:45 +0100
changeset 337 1d3a752f6723
parent 336 08d0bd91ad20 (diff)
parent 335 15307a7772ea (current diff)
child 338 473fefd9c5de
Merge
--- a/common/build.xml	Thu Aug 06 10:01:35 2009 +0100
+++ b/common/build.xml	Thu Aug 06 11:11:45 2009 +0100
@@ -910,7 +910,7 @@
       <!-- Now iterate through the generated TSVs to sort them and remove duplicates -->
       <for param="tsv">
         <path>
-          <fileset dir="${build.log.dir}/releaseables" erroronmissingdir="false">
+          <fileset dir="${build.log.dir}/releaseables">
             <include name="**/*.tsv"/>
           </fileset>
         </path>
--- a/common/tools/raptor/RaptorReleaseable.pm	Thu Aug 06 10:01:35 2009 +0100
+++ b/common/tools/raptor/RaptorReleaseable.pm	Thu Aug 06 11:11:45 2009 +0100
@@ -35,6 +35,7 @@
 
 $buildlog_status->{name} = 'buildlog_status';
 $buildlog_status->{next_status} = {whatlog=>$whatlog_status};
+$buildlog_status->{on_start} = 'RaptorReleaseable::on_start_buildlog';
 
 $whatlog_status->{name} = 'whatlog_status';
 $whatlog_status->{next_status} = {bitmap=>$bitmap_status, resource=>$resource_status, build=>$build_status, export=>$export_status, stringtable=>$stringtable_status, archive=>$archive_status, '?default?'=>$whatlog_default_status};
@@ -88,6 +89,11 @@
 my $curfiletype = 'unknown';
 my $characters = '';
 
+sub on_start_buildlog
+{
+	mkdir("$::basedir/releaseables");
+}
+
 sub on_start_whatlog
 {
 	my ($el) = @_;
@@ -223,7 +229,6 @@
 			my $layer = $1;
 			my $package = $2;
 			
-			mkdir("$::basedir/releaseables");
 			mkdir("$::basedir/releaseables/$layer");
 			mkdir("$::basedir/releaseables/$layer/$package");