diff -r b183ec05bd8c -r 19bba8228ff0 omaprovisioning/provisioning/Group/bld.inf
--- a/omaprovisioning/provisioning/Group/bld.inf	Tue Aug 31 16:04:06 2010 +0300
+++ b/omaprovisioning/provisioning/Group/bld.inf	Wed Sep 01 12:27:42 2010 +0100
@@ -38,20 +38,92 @@
 
 // Generic configuration interface for component cenrep settings  
 ../conf/s60provisioning.confml                    MW_LAYER_CONFML(provisioning.confml)
-../conf/CI_s60provisioning.confml                    MW_LAYER_CONFML(CI_provisioning.confml)
 ../conf/s60provisioning_101F87AA.crml 	        MW_LAYER_CRML(provisioning_101F87AA.crml)
 
 ../Rom/Provisioning.iby										CORE_MW_LAYER_IBY_EXPORT_PATH(provisioning.iby)
+//../rom/Provisioning_variant.iby						CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(provisioning_variant.iby)
 ../Rom/ProvisioningResources.iby					LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(provisioningresources.iby)
 ../loc/Provisioning.loc									MW_LAYER_LOC_EXPORT_PATH(provisioning.loc)
+../IMAdapter/loc/WPWVAdapter.loc				MW_LAYER_LOC_EXPORT_PATH(wpwvadapter.loc)
+../MbxNbrAdapter/loc/MailboxAdapter.loc		MW_LAYER_LOC_EXPORT_PATH(mailboxadapter.loc)
+../ProvisioningBC/loc/ProvisioningBC.loc					MW_LAYER_LOC_EXPORT_PATH(provisioningbc.loc)
+//../ProvisioningCx/loc/ProvisioningCx.loc					MW_LAYER_LOC_EXPORT_PATH(provisioningcx.loc)
+../StreamingAdapter/loc/StreamingAdapter.loc				MW_LAYER_LOC_EXPORT_PATH(streamingadapter.loc)
+../AuthTypePlugin/loc/Authtypeplugin.loc 					MW_LAYER_LOC_EXPORT_PATH(authtypeplugin.loc)
+../accesspointadapter/loc/WPAPAdapter.loc                       MW_LAYER_LOC_EXPORT_PATH(wpapadapter.loc)
+../cpdestinationnwadapter/loc/wpdestinationnwadapter.loc	MW_LAYER_LOC_EXPORT_PATH(wpdestinationnwadapter.loc)
 
 PRJ_EXTENSIONS
+#ifdef SBSV2
+
+
+START EXTENSION s60/mifconv
+OPTION TARGETFILE provisioningcx.mif
+OPTION HEADERFILE provisioningcx.mbg
+OPTION SOURCES -c8,8 qgn_menu_set_cxt.bmp
+END
+
+#ifdef __SCALABLE_ICONS
+    START EXTENSION s60/mifconv
+		OPTION TARGETFILE provisioningcx_aif.mif
+		OPTION SOURCES -c8,8 qgn_menu_set.svg
+		END
+#else
+    START EXTENSION s60/mifconv
+		OPTION TARGETFILE provisioningcx_aif.mbm
+		OPTION SOURCES -c8,8 qgn_menu_set_lst.bmp -c8,8 qgn_menu_set_cxt.bmp 
+		END   
+#endif
+
+START EXTENSION s60/mifconv
+OPTION TARGETFILE Authtypeplugin.mif
+OPTION HEADERFILE Authtypeplugin.mbg
+OPTION SOURCES -c8,8 qgn_prop_set_conn_config
+END
+#endif
+
 
 PRJ_MMPFILES
 
+
 ../ProvisioningEngine/Group/ProvisioningEngine.mmp
 ../ProvisioningParser/Group/ProvisioningParser.mmp
 ../ProvisioningHandler/Group/ProvisioningHandler.mmp
+../accesspointadapter/group/WPAPAdapter.mmp
+../WAPAdapter/Group/WPWAPAdapter.mmp
+../IMAdapter/Group/IMAdapter.mmp
+../StreamingAdapter/Group/StreamingAdapter.mmp
+//../ProvisioningCx/group/ProvisioningCx.mmp
+../ProvisioningBC/Group/ProvisioningBC.mmp
+../MbxNbrAdapter/Group/MbxNbrAdapter.mmp
+../cpdestinationnwadapter/group/wpdestinationnwadapter.mmp
+
+
+
+../AuthTypePlugin/Group/Authtypeplugin.mmp
+../alwaysonadapter/Group/alwaysonadapter.mmp
+
+#ifdef __SMART_CARD_PROV
+    ../ProvisioningSC/Group/ProvisioningSC.mmp
+#endif
+
+
+#ifndef SBSV2
+
+gnumakefile ../ProvisioningCx/group/iconscxdc.mk
+
+#ifdef __SCALABLE_ICONS
+    gnumakefile ../ProvisioningCx/group/Iconscxaifscalabledc.mk
+#else
+    gnumakefile ../provisioningcx/group/Iconscxaifbitmaps.mk
+#endif
+
+gnumakefile ../AuthTypePlugin/Group/AuthtypePluginIcons.mk
+
+#endif
+
+
+
 
 PRJ_TESTMMPFILES