# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1283257840 -10800
# Node ID dd7ad3d3dc46a32e6ae7e2bf806488a5d1f92c31
# Parent  c0474fab502e2de8ad061a058b08b76cc8b5320b
Revision: 201033
Kit: 201035

diff -r c0474fab502e -r dd7ad3d3dc46 group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/bld.inf	Tue Aug 31 15:30:40 2010 +0300
@@ -0,0 +1,34 @@
+/*
+* ==============================================================================
+*  Name        : bld.inf
+*  Part of     : 
+*  Description : 
+*  Version     : 
+*
+*  Copyright © 2006 Nokia. All rights reserved.
+*  This material, including documentation and any related
+*  computer programs, is protected by copyright controlled by
+*  Nokia Corporation. All rights are reserved. Copying,
+*  including reproducing, storing, adapting or translating, any
+*  or all of this material requires the prior written consent of
+*  Nokia. This material also contains confidential
+*  information which may not be disclosed to others without the
+*  prior written consent of Nokia.
+* ==============================================================================
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+
+PRJ_MMPFILES
+#include "../helix_ren/group/bld.inf"
+
+
+
+//  End of File  
+
diff -r c0474fab502e -r dd7ad3d3dc46 helix_ren/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/helix_ren/group/bld.inf	Tue Aug 31 15:30:40 2010 +0300
@@ -0,0 +1,31 @@
+/*
+* ==============================================================================
+*  Name        : bld.inf
+*  Part of     : HELIXENGINE	
+*  Description : This main bld.inf file for HELIX_MDF 
+*  Version     : 
+*
+*  Copyright © 2006 Nokia Corporation.
+*  This material, including documentation and any related 
+*  computer programs, is protected by copyright controlled by 
+*  Nokia Corporation. All rights are reserved. Copying, 
+*  including reproducing, storing, adapting or translating, any 
+*  or all of this material requires the prior written consent of 
+*  Nokia Corporation. This material also contains confidential 
+*  information which may not be disclosed to others without the 
+*  prior written consent of Nokia Corporation.
+* ==============================================================================
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../data/backup_registration.xml		        /epoc32/data/z/system/libs/plugins/backup_registration_ROP.xml
+
+PRJ_MMPFILES
+#include "../helixrfsplugin/group/bld.inf"
+    
+PRJ_TESTMMPFILES
diff -r c0474fab502e -r dd7ad3d3dc46 helix_ren/helixrfsplugin/group/bld.inf
--- a/helix_ren/helixrfsplugin/group/bld.inf	Wed Mar 31 22:03:30 2010 +0300
+++ b/helix_ren/helixrfsplugin/group/bld.inf	Tue Aug 31 15:30:40 2010 +0300
@@ -1,62 +1,29 @@
 /*
-
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-
 * All rights reserved.
-
 * This component and the accompanying materials are made available
-
 * under the terms of "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: bld.inf for helix rfs plugin.
-
 *
-
 */
 
 
 
 PRJ_PLATFORMS
-
 DEFAULT
 
-
-
 PRJ_MMPFILES
-
-
-
-../group/RfsHelixPlugin.mmp
-
-
-
-
+RfsHelixPlugin.mmp
 
 PRJ_EXPORTS
 
-
-
-
-
 PRJ_TESTMMPFILES
 
-
-
-
-
diff -r c0474fab502e -r dd7ad3d3dc46 layers.sysdef.xml
--- a/layers.sysdef.xml	Wed Mar 31 22:03:30 2010 +0300
+++ b/layers.sysdef.xml	Tue Aug 31 15:30:40 2010 +0300
@@ -3,44 +3,19 @@
   <!ENTITY layer_real_source_path "sf/mw/helix" >
 ]> 
 
-<SystemDefinition name="avdomain" schema="1.4.0">
+<SystemDefinition name="helix" schema="1.4.0">
 	<systemModel>
   <!-- Common file for prebuild layers-->
   	<layer name="mw_layer">
 			<module name="helix">
 				<unit unitID="helix" mrp="" bldFile="&layer_real_source_path;/group" filter="!sf_build" name="helix" />
-				<unit unitID="helix_src" mrp="" bldFile="&layer_real_source_path;/helix_ren/src/group" filter="!sf_build" name="helix_src" />
-				<unit unitID="ng_helix_src" mrp="" bldFile="&layer_real_source_path;/helix_ren/ng_helix/src/group" filter="!sf_build" name="ng_helix_src" />
 				<unit unitID="helix_stub" mrp="" bldFile="&layer_real_source_path;/helix_ren/helix_stub/group" filter="sf_build" name="helix_stub" />
 			</module>
     </layer>
 
-   	<layer name="api_test_layer">
-			<module name="helix_tsrc">
-				<unit unitID="helix_tsrc" name="helix_tsrc" bldFile="&layer_real_source_path;/tsrc/group" mrp="" />
-			</module>
-    </layer>
-
-   	<layer name="module_test_layer">
-			<module name="helix_ren_tsrc">
-				<unit unitID="helix_ren_tsrc" name="helix_ren_tsrc" bldFile="&layer_real_source_path;/helix_ren/tsrc/helixstiftest/group" mrp="" />
-			</module>
-    </layer>
-
-   	<layer name="pref_test_layer">
-			<module name="helix_tsrc_group">
-				<unit unitID="helix_tsrc_group" name="helix_tsrc_group" bldFile="&layer_real_source_path;/tsrc/group" mrp="" filter="TA_HELIX" />
-			</module>
-			<module name="helix_ren_tsrc_group">
-				<unit unitID="helix_ren_tsrc_group" name="helix_ren_tsrc_group" bldFile="&layer_real_source_path;/helix_ren/tsrc/helixstiftest/group" mrp="" filter="TA_HELIX_REN" />
-			</module>
-    </layer>
-
   	<layer name="mw_helix_layer">
 			<module name="helix_group">
 				<unit unitID="helix_group" mrp="" bldFile="&layer_real_source_path;/group" filter="!sf_build" name="helix_group" />
-				<unit unitID="helix_src_group" mrp="" bldFile="&layer_real_source_path;/helix_ren/src/group" filter="!sf_build" name="helix_src_group" />
-				<unit unitID="ng_helix_src_group" mrp="" bldFile="&layer_real_source_path;/helix_ren/ng_helix/src/group" filter="!sf_build" name="ng_helix_src_group" />
 				<unit unitID="helix_stub_group" mrp="" bldFile="&layer_real_source_path;/helix_ren/helix_stub/group" filter="sf_build" name="helix_stub_group" /> 
 			</module>
     </layer>
diff -r c0474fab502e -r dd7ad3d3dc46 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Tue Aug 31 15:30:40 2010 +0300
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="sf:helix" name="Helix" levels="plugin framework server generic specific">
+    <collection id="sf:helix_ren" name="Helix Engine" level="framework">
+      <component id="sf:helix_ren_build" filter="s60" name="Helix Engine Build" introduced="^2">
+       <unit bldFile="helix_ren/group"/>
+      </component>
+      <component id="helix_stub" filter="sf_build" name="Helix Stub" class="api" introduced="^2">
+        <unit bldFile="helix_ren/helix_stub/group"/>
+      </component>
+      <component id="helixrfsplugin" filter="s60" name="Helix RFS Plugin" class="plugin" introduced="^2">
+        <unit bldFile="helix_ren/helixrfsplugin/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r c0474fab502e -r dd7ad3d3dc46 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Tue Aug 31 15:30:40 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>