Script now outputs info message if sources.csv specifies a file that's not in the package (irrespective of whether it will try to use it).
authorSimon Howkins <simonh@symbian.org>
Wed, 20 Oct 2010 17:30:21 +0100
changeset 1282 2a30d4157ddd
parent 1281 116cb28ed586
child 1283 8d797b367538
Script now outputs info message if sources.csv specifies a file that's not in the package (irrespective of whether it will try to use it).
common/tools/csvToSysDef.pl
--- a/common/tools/csvToSysDef.pl	Wed Oct 20 15:19:52 2010 +0100
+++ b/common/tools/csvToSysDef.pl	Wed Oct 20 17:30:21 2010 +0100
@@ -59,10 +59,11 @@
 	if (!-f $pkgDef)
 	{
 		# Not there, so look for the pkg defn in the root of the package tree
-		warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
+		warn "WARNING: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
 		$pkgDef = "$package->{dst}/$package->{sysdef}";
 	}
-	die "Unable to locate any package_definition at all for $package->{dst}" unless -f $pkgDef;
+	warn "INFO: sources.csv lists '$package->{sysdef}', which is not supplied in $package->{dst}\n" if -d "$package->{dst}" && !-f "$package->{dst}/$package->{sysdef}";
+	die "ERROR: Unable to locate any package_definition at all for $package->{dst}" unless -f $pkgDef;
 
 	warn "Including $pkgDef for $package->{dst}\n";
 	my $pkgTree = eval { $parser->parsefile($pkgDef) } or die "Failed to parse $pkgDef : $@";