diff -r 7333d7932ef7 -r 8b7f4e561641 installationservices/swcomponentregistry/group/bld.inf
--- a/installationservices/swcomponentregistry/group/bld.inf	Tue Aug 31 15:21:33 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-* 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:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* @ Software Component Registry
-*
-*/
-
-
-/**
- @file
-*/
-
-#include "../sqlite_secure/GROUP/BLD.INF"
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// SCR exported headers
-
-../inc/screntries.h			SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(usif/scr/screntries.h)
-../inc/appregentries.h			SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(usif/scr/appregentries.h)
-../inc/appreginfo.h			SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(usif/scr/appreginfo.h)
-../inc/scr.h 				SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(usif/scr/scr.h)
-../inc/scrcommon.h 			SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(usif/scr/scrcommon.h)
-../inc/screntries_platform.h 			SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(usif/scr/screntries_platform.h)
-../inc/scrcommon.inl 		SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(usif/scr/scrcommon.inl)
-
-// USIF common includes
-../../swinstallationfw/common/inc/usiferror.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(usif/usiferror.h)
-../../swinstallationfw/common/inc/usifcommon.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(usif/usifcommon.h)
-
-// ROMKIT includes
-../inc/scr.iby				/epoc32/rom/include/scr.iby
-
-
-PRJ_MMPFILES
-
-#ifndef TOOLS
-#ifndef TOOLS2
-
-scrserver.mmp		// SCR Server
-scrclient.mmp		// SCR Client
-scrdatabase.mmp		// SCR Data Layer
-
-../scrhelper/group/scrhelperserver.mmp // SCR Helper Server
-../scrhelper/group/scrhelperclient.mmp // SCR Helper Client
-
-#endif // TOOLS2
-#endif // TOOLS
-
-PRJ_TESTMMPFILES
-
-#ifndef TOOLS
-#ifndef TOOLS2
-
-../test/group/tscr.mmp		// SCR Test Harness
-../test/group/tscrdatalayer.mmp		// SCR Data Layer Test Harness
-../test/group/tscraccessor.mmp		// SCR Accessor
-../test/group/tscrapparc.mmp		// SCR-Apparc Test Harness
-
-#endif // TOOLS2
-#endif // TOOLS
-
-PRJ_TESTEXPORTS
-
-../test/tscr/scripts/tscr.ini				z:/tusif/tscr/tscr.ini
-../test/tscr/scripts/tscr.script			z:/tusif/tscr/tscr.script
-../test/tscr/scripts/tscr_api.script		z:/tusif/tscr/tscr_api.script
-
-../test/tscr/scripts/tscr_performance.ini			z:/tusif/tscr/tscr_performance.ini
-../test/tscr/scripts/tscr_performance.script		z:/tusif/tscr/tscr_performance.script
-../test/tscr/scripts/tscr_performance_cases.script	z:/tusif/tscr/tscr_performance_cases.script
-../test/tscr/scripts/tscr_app_performance_cases.script	z:/tusif/tscr/tscr_app_performance_cases.script
-
-../test/tscr/scripts/tscr_versioning.script		z:/tusif/tscr/tscr_versioning.script
-../test/tscr/scripts/tscr_oom.script		z:/tusif/tscr/tscr_oom.script
-
-../test/tscr/scripts/tscr_appreginfo.ini	z:/tusif/tscr/tscr_appreginfo.ini
-../test/tscr/scripts/tscr_appreginfo.script	z:/tusif/tscr/tscr_appreginfo.script
-../test/tscr/scripts/tscrapparc.script	        z:/tusif/tscr/tscrapparc.script
-
-../test/tscrdatalayer/scripts/tscr_datalayer.script		z:/tusif/tscrdatalayer/tscr_datalayer.script
-../test/tscrdatalayer/scripts/tscr_datalayer_oom.script	z:/tusif/tscrdatalayer/tscr_datalayer_oom.script
-../test/tscrdatalayer/scripts/tscr_datalayer_oom.ini	z:/tusif/tscrdatalayer/tscr_datalayer_oom.ini
-../test/tscrdatalayer/scripts/data/nondb.db				z:/tusif/tscrdatalayer/data/nondb.db
-
-../test/tscr/scripts/data/scr_small.db		z:/tusif/tscr/data/scr_small.db
-../test/tscr/scripts/data/scr_medium.db		z:/tusif/tscr/data/scr_medium.db
-../test/tscr/scripts/data/scr_large.db		z:/tusif/tscr/data/scr_large.db
-
-../test/tscr/scripts/data/scr-noversiontable.db			z:/tusif/tscr/data/scr-noversiontable.db
-../test/tscr/scripts/data/scr-olderminordbversion.db			z:/tusif/tscr/data/scr-olderminordbversion.db
-../test/tscr/scripts/data/scr-differentbuildnumber.db			z:/tusif/tscr/data/scr-differentbuildnumber.db
-../test/tscr/scripts/data/scr-newermajordbversion.db			z:/tusif/tscr/data/scr-newermajordbversion.db
-../test/tscr/scripts/data/scr-noentriesinversiontable.db			z:/tusif/tscr/data/scr-noentriesinversiontable.db
-../test/tscr/scripts/data/scr-newerminordbversion.db 	z:/tusif/tscr/data/scr-newerminordbversion.db
-../test/tscr/scripts/data/scr-oldermajordbversion.db 	z:/tusif/tscr/data/scr-oldermajordbversion.db
-../test/tscr/scripts/data/scr-multiapp.db 	z:/tusif/tscr/data/scr-multiapp.db
-../test/tscr/scripts/data/scr-nodefaultvalues.db 	z:/tusif/tscr/data/scr-nodefaultvalues.db
-
-../test/testdb/scr.db			z:/sys/install/scr/provisioned/scr.db
-
-// The second copy is required for ARMV5 builds, where z:/ does not automatically transfer into the simulated Z drive. The custom steps in ONB take care of copying testscr.db into scr.db before ROM build and test
-../test/testdb/scr.db /epoc32/release/winscw/udeb/z/sys/install/scr/provisioned/testscr.db
-../test/testdb/scr.db /epoc32/release/winscw/urel/z/sys/install/scr/provisioned/testscr.db
-
-// ROMKIT includes
-../inc/tscr.iby								/epoc32/rom/include/tscr.iby
-