--- a/syborg_stem/rom_content.csv	Sun Oct 10 16:22:15 2010 +0100
+++ b/syborg_stem/rom_content.csv	Sun Oct 10 17:40:25 2010 +0100
@@ -812,25 +812,25 @@
 private\2000b187\cenrep\101f8e44.xml,/epoc32/data/z/private/2000b187/cenrep/101f8e44.xml,core/mw/wlanpsmplugin.iby,os/wlan,,,
 private\2000B187\cenrep\102818E8.xml,/epoc32/data/z/private/2000b187/cenrep/102818e8.xml,core/mw/psln.iby,mw/classicui,,,
 private\2000B4D8\backup_registration.xml,/epoc32/data/z/private/2000b4d8/backup_registration.xml,core/mw/WidgetBackupRestore.iby,mw/web,,,
-private\2000D75B\fail\failcmdlist.rsc,/epoc32/data/z/private/2000d75b/fail/failcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc,/epoc32/data/z/private/2000d75b/hw/noncriticalcmdlist_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\usbwatcher.rsc,/epoc32/data/z/private/2000d75b/hw/usbwatcher_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\wserv.rsc,/epoc32/data/z/private/2000d75b/hw/wserv_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
+private\2000D75B\fail\failcmdlist.rsc,/epoc32/data/z/private/2000d75b/fail/failcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc,/epoc32/data/z/private/2000d75b/hw/noncriticalcmdlist_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\usbwatcher.rsc,/epoc32/data/z/private/2000d75b/hw/usbwatcher_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\wserv.rsc,/epoc32/data/z/private/2000d75b/hw/wserv_hw.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
 private\2000d75b\normal\gsanormalcmdlist.rsc,/epoc32/data/z/private/2000d75b/normal/gsanormalcmdlist.rsc,core/os/ssmcompatibility.iby,os/devicesrv,,,
-private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc,/epoc32/data/z/private/2000d75b/rfstatusswpcmdlist/rfswpcmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\shutdown\shutdowncmdlists.rsc,/epoc32/data/z/private/2000d75b/shutdown/shutdowncmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\alarm_charging.rsc,/epoc32/data/z/private/2000d75b/startup/0/alarm_charging.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\criticalappscmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/criticalappscmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/emergencycallsonlycmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\noncriticalcmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/noncriticalcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\preuiservicescmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/preuiservicescmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\securitycheckcmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/securitycheckcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\selftestokcmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/selftestokcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\uiservicescmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/uiservicescmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\noncriticalcmdlist_ext.rsc,/epoc32/data/z/private/2000d75b/startup/0_ext/noncriticalcmdlist_ext.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\startup\0\uiservicescmdlist_ext.rsc,/epoc32/data/z/private/2000d75b/startup/0_ext/uiservicescmdlist_ext.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc,/epoc32/data/z/private/2000d75b/swpnoncritical/noncriticalswpcmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
-private\2000D75B\swpui\uiswpcmdlists.rsc,/epoc32/data/z/private/2000d75b/swpui/uiswpcmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,,,
+private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc,/epoc32/data/z/private/2000d75b/rfstatusswpcmdlist/rfswpcmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\shutdown\shutdowncmdlists.rsc,/epoc32/data/z/private/2000d75b/shutdown/shutdowncmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\alarm_charging.rsc,/epoc32/data/z/private/2000d75b/startup/0/alarm_charging.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\criticalappscmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/criticalappscmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/emergencycallsonlycmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\noncriticalcmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/noncriticalcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\preuiservicescmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/preuiservicescmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\securitycheckcmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/securitycheckcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\selftestokcmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/selftestokcmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\uiservicescmdlist.rsc,/epoc32/data/z/private/2000d75b/startup/0/uiservicescmdlist.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\noncriticalcmdlist_ext.rsc,/epoc32/data/z/private/2000d75b/startup/0_ext/noncriticalcmdlist_ext.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\startup\0\uiservicescmdlist_ext.rsc,/epoc32/data/z/private/2000d75b/startup/0_ext/uiservicescmdlist_ext.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc,/epoc32/data/z/private/2000d75b/swpnoncritical/noncriticalswpcmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
+private\2000D75B\swpui\uiswpcmdlists.rsc,/epoc32/data/z/private/2000d75b/swpui/uiswpcmdlists.rsc,core/os/ssmcmdlists.iby,os/devicesrv,stem,WR,Startup script
 private\2000d766\backup_registration.xml,/epoc32/data/z/private/2000d766/backup_registration.xml,core/os/ssmutilityplugins.iby,os/devicesrv,,,
 private\2000E53C\backup_registration.xml,/epoc32/data/z/private/2000e53c/backup_registration.xml,core/app/FreestyleIpsServices.iby,app/commonemail,,,
 private\2000F83E\bs_config.xml,/epoc32/data/z/private/2000f83e/bs_config.xml,core/mw/backsteppingservice.iby,mw/homescreensrv,,,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/filter_obyfile.pl	Sun Oct 10 17:40:25 2010 +0100
@@ -0,0 +1,104 @@
+# Copyright (c) 2010 Symbian Foundation Ltd.
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+# This script filters an OBY file given a rom_content.csv and a static_dependencies.txt
+
+use strict;
+
+if (scalar @ARGV < 2)
+	{
+	die ("Must specify at least two arguments: rom_content.csv and static_dependencies.txt");
+	}
+
+my $rom_content_csv = shift @ARGV;
+my $static_dependencies_txt = shift @ARGV;
+
+open ROM_CONTENT, "<$rom_content_csv" or die("Cannot read $rom_content_csv: $!\n");
+my @rom_content = <ROM_CONTENT>;
+close ROM_CONTENT;
+
+my $rom_content_header = shift @rom_content;
+die("Not a valid rom_content.csv file") if ($rom_content_header !~ /^ROM file,/);
+
+# read through the rom_content_csv looking for direct instructions
+my %stem_substitutions;
+my %deletions;
+my %must_have;
+foreach my $line (@rom_content)
+	{
+	my ($romfile,$hostfile,$ibyfile,$package,$cmd,@rest) = split /,/, $line;
+	
+	next if ($cmd eq "");
+
+	$cmd = lc $cmd;
+	if ($cmd eq "stem")
+		{
+		$stem_substitutions{$romfile} = $hostfile;
+		next;
+		}
+	
+	if ($cmd eq "out")
+		{
+		$deletions{$romfile} = "";
+		next;
+		}
+	
+	if ($cmd eq "in")
+		{
+		$must_have{$romfile} = 1;
+		next;
+		}
+	}
+
+printf STDERR "%d stem, %d out, %d in\n", 
+	scalar keys %stem_substitutions, 
+	scalar keys %deletions, 
+	scalar keys %must_have;
+
+# read static dependencies file
+# process the "out" commands to recursively expand the deletions
+
+# read the oby file and apply the commands
+
+my $line;
+while ($line = <>)
+	{
+	chomp $line;
+	if ($line =~ /^(.*=)(\S+\s+)(\S+)(\s.*)?$/)
+		{
+		my $romcmd = $1;
+		my $hostfile = $2;
+		my $romfile = $3;
+		my $rest = $4;
+		$rest = "" if (!defined $rest);
+		
+		if ($romfile =~ /^"(.*)"$/)
+			{
+			$romfile = $1;
+			$hostfile .= '"';
+			$rest = '"'. $rest;
+			}
+		
+		next if ($deletions{$romfile});
+		
+		if (defined $stem_substitutions{$romfile})
+			{
+			# print STDERR "Applying stem_ prefix to $hostfile in $line\n";
+			$hostfile =~ s/(\/|\\)([^\\\/]+)$/$1stem_$2/;
+			}
+		print $romcmd, $hostfile, $romfile, $rest, "\n";
+		next;
+		}
+	
+	print $line,"\n";
+	}
\ No newline at end of file