# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1279812902 -3600
# Node ID f9816ed9a7578eac5d3d8be4abf26252c32ae75f
# Parent  5fabdb30d0012f079187ea0835ef186a64b81b3d
Add workaround for Bug 2339, and add minigui-stripped.oby and minigui_syborg.oby

diff -r 5fabdb30d001 -r f9816ed9a757 windowing/windowserver/group/wserv.iby
--- a/windowing/windowserver/group/wserv.iby	Tue Jul 20 17:58:01 2010 +0100
+++ b/windowing/windowserver/group/wserv.iby	Thu Jul 22 16:35:02 2010 +0100
@@ -23,8 +23,14 @@
 file=ABI_DIR\BUILD_DIR\wserv_nga.exe 	System\Libs\EwSrv.exe
 file=ABI_DIR\BUILD_DIR\ws32_nga.dll 	System\Libs\Ws32.dll
 file=ABI_DIR\BUILD_DIR\remotegc_nga.dll	System\Libs\remotegc.dll 
-file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nga.dll	System\Libs\WsGraphicDrawer.dll 
+file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nga.dll	System\Libs\WsGraphicDrawer.dll
+
+#if defined(SYMBIAN_GRAPHICS_USE_OPENWF) && !defined(SYMBIAN_GRAPHICS_USE_OPENWF_MIGRATION)
+REM Pure OpenWF implementation, so skipping proprietary compositor
+#else
 #include <gce.iby>
+#endif
+
 #include <wserv_std_plugins.iby>
 //wserv calls eglReleaseThread() on exit
 #include <egl.iby>
diff -r 5fabdb30d001 -r f9816ed9a757 windowing/windowserver/minigui/group/bld.inf
--- a/windowing/windowserver/minigui/group/bld.inf	Tue Jul 20 17:58:01 2010 +0100
+++ b/windowing/windowserver/minigui/group/bld.inf	Thu Jul 22 16:35:02 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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 "Eclipse Public License v1.0"
@@ -19,4 +19,7 @@
 PRJ_EXPORTS
 econs_wserv.iby  	  			/epoc32/rom/include/econs_wserv.iby
 minigui.oby						/epoc32/rom/include/minigui.oby
-wsini_minigui.ini				z:/
\ No newline at end of file
+wsini_minigui.ini				z:/
+minigui-stripped.oby            /epoc32/rom/include/minigui-stripped.oby
+minigui_syborg.oby              /epoc32/rom/include/minigui_syborg.oby
+wsini_minigui-stripped.ini		z:/
diff -r 5fabdb30d001 -r f9816ed9a757 windowing/windowserver/minigui/group/minigui-stripped.oby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/windowing/windowserver/minigui/group/minigui-stripped.oby	Thu Jul 22 16:35:02 2010 +0100
@@ -0,0 +1,106 @@
+/*
+* 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:
+* iwanj@users.sourceforge.net - modified to make it work for Symbian^3.
+* MattD <mattd@symbian.org> - renamed file and target to minigui-stripped so we can have both present and build seperate roms. 
+*
+* Description:
+* This OBY File is used to build miniGUI ROM Images.
+*/
+ 
+#ifndef __MINIGUI_OBY__
+#define __MINIGUI_OBY__
+ 
+define OBEYFILE minigui-stripped
+define ROMDATE	##TODAY##
+ 
+#define _ARMV5
+#define SYMBIAN_BASE_USE_GCE
+#define SYMBIAN_EXCLUDE_SCDV
+#define USE_CUSTOM_MMC_PARTITION
+
+// Kernel
+//
+#include <header.iby>
+#include <base.iby>
+ 
+// NGA stack
+//
+#define SYMBIAN_GRAPHICS_USE_GCE
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+#define OPENWFCLIB_DRV <openwfc_ref.iby>
+#define EGL_DRV <egl_ref.iby>
+ 
+#include <gdi.iby>
+#include <bitgdi.iby>
+#include <fntstore.iby>
+#include <fbserv.iby>
+#include <iculayoutengine.iby>
+#include <freetype.iby>
+#include <directgdi.iby>
+#include <wserv.iby>
+#include <wslog.iby>
+#include <econs_wserv.iby>
+#include <surfaceupdate.iby>
+#include <surfacemanager.iby>
+file=\epoc32\release\ARMV5\urel\_generic_scdv.dll	sys\bin\scdv.dll
+ 
+data=DATAZ_\wsini_minigui.ini	\system\data\wsini.ini
+ 
+// miniGUI shell
+//
+#include <eshell.iby>
+ 
+// And the hell breaks loose :)
+// Let's just add bare minimum items enough to get graphics stack up and running
+// wserv wants ecom
+// libwfc wants openenv
+// freetype wants stdlib
+// openenv backend wants esock etc etc
+//
+#include <bafl.iby>
+#include <ecom.iby>
+#include <store.iby>
+#include <stdlib.iby>
+#include <openenv.iby>
+ 
+#include <c32.iby>
+#include <ecuart.iby>
+#include <irda.iby>
+#include <bluetooth.iby>
+#include <inetprotutil.iby>
+#include <network.iby>	
+#include <dial.iby>
+#include <crypto.iby>
+#include <certman.iby>
+#include <logeng.iby>
+#include <filetokens.iby>
+#include <asnpkcs.iby>
+#include <emime.iby>
+#include <scs.iby>
+#include <cflog.iby>
+
+file=\epoc32\release\ARMV5\urel\abclient.dll 				sys\bin\abclient.dll
+file=\epoc32\release\ARMV5\urel\Http.dll 					sys\bin\http.dll
+file=\epoc32\release\ARMV5\urel\Httputils.dll 				sys\bin\httputils.dll
+file=\epoc32\release\ARMV5\urel\securitymanager.dll 		sys\bin\securitymanager.dll
+file=\epoc32\release\ARMV5\urel\ocspsupportclient.dll 		sys\bin\ocspsupportclient.dll
+file=\epoc32\release\ARMV5\urel\siscontroller.dll 			sys\bin\siscontroller.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportclient.dll	sys\bin\devinfosupportclient.dll 
+file=\epoc32\release\ARMV5\urel\uissclient.dll 				sys\bin\uissclient.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportcommon.dll 	sys\bin\devinfosupportcommon.dll
+file=\epoc32\release\ARMV5\urel\ipcstream.dll 				sys\bin\ipcstream.dll
+
+// cenrep file for timezone server database
+data=\epoc32\data\z\private\10202be9\1020383e.txt		private\10202be9\1020383e.txt
+
+#endif /* __MINIGUI_OBY__ */
\ No newline at end of file
diff -r 5fabdb30d001 -r f9816ed9a757 windowing/windowserver/minigui/group/minigui_syborg.oby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/windowing/windowserver/minigui/group/minigui_syborg.oby	Thu Jul 22 16:35:02 2010 +0100
@@ -0,0 +1,114 @@
+/*
+* 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:
+* iwanj@users.sourceforge.net - modified to make it work for Symbian^3.
+*
+* Description:
+* This OBY File is used to build miniGUI ROM Images.
+*/
+
+#ifndef __MINIGUI_OBY__
+#define __MINIGUI_OBY__
+
+define OBEYFILE minigui
+define ROMDATE ##TODAY##
+
+#define _ARMV5
+#define SYMBIAN_BASE_USE_GCE
+#define SYMBIAN_EXCLUDE_SCDV
+#undef SYMBIAN_GRAPHICS_ADAPTATION
+#define SYMBIAN_GRAPHICS_ADAPTATION SGA_SW
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+#define SYMBIAN_GRAPHICS_USE_EGL_REF
+#define OPENWFCLIB_DRV <openwfc_ref.iby>
+#define __SYBORG__
+
+
+// Kernel
+//
+#include <header.iby>
+#include <base.iby>
+
+// NGA stack
+//
+#define SYMBIAN_GRAPHICS_USE_GCE
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+
+#include <gdi.iby>
+#include <bitgdi.iby>
+#include <fntstore.iby>
+#include <fbserv.iby>
+#include <iculayoutengine.iby>
+#include <freetype.iby>
+#include <directgdi.iby>
+#include <wserv.iby>
+#include <econs_wserv.iby>
+#include <surfaceupdate.iby>
+#include <surfacemanager.iby>
+file=\epoc32\release\ARMV5\urel\_generic_scdv.dll      sys\bin\scdv.dll
+
+data=DATAZ_\wsini_minigui.ini  \system\data\wsini.ini
+
+// miniGUI shell
+//
+#include <eshell.iby>
+
+// And the hell breaks loose :)
+// Let's just add bare minimum items enough to get graphics stack up and running
+// wserv wants ecom
+// libwfc wants openenv
+// freetype wants stdlib
+// openenv backend wants esock etc etc
+//
+#include <bafl.iby>
+#include <ecom.iby>
+#include <store.iby>
+#include <stdlib.iby>
+#include <openenv.iby>
+
+#include <c32.iby>
+#include <ecuart.iby>
+#include <irda.iby>
+#include <bluetooth.iby>
+#include <inetprotutil.iby>
+#include <network.iby>
+#include <dial.iby>
+#include <crypto.iby>
+#include <certman.iby>
+#include <logeng.iby>
+#include <filetokens.iby>
+#include <asnpkcs.iby>
+#include <emime.iby>
+#include <scs.iby>
+#include <cflog.iby>
+
+file=\epoc32\release\ARMV5\urel\abclient.dll                           sys\bin\abclient.dll
+file=\epoc32\release\ARMV5\urel\Http.dll                                       sys\bin\http.dll
+file=\epoc32\release\ARMV5\urel\Httputils.dll                          sys\bin\httputils.dll
+file=\epoc32\release\ARMV5\urel\securitymanager.dll            sys\bin\securitymanager.dll
+file=\epoc32\release\ARMV5\urel\ocspsupportclient.dll          sys\bin\ocspsupportclient.dll
+file=\epoc32\release\ARMV5\urel\siscontroller.dll                      sys\bin\siscontroller.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportclient.dll       sys\bin\devinfosupportclient.dll
+file=\epoc32\release\ARMV5\urel\uissclient.dll                                 sys\bin\uissclient.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportcommon.dll       sys\bin\devinfosupportcommon.dll
+file=\epoc32\release\ARMV5\urel\ipcstream.dll                          sys\bin\ipcstream.dll
+file=\epoc32\release\ARMV5\urel\usbcsc_bil.dll		sys\bin\usbcsc_bil.dll
+file=\epoc32\release\ARMV5\urel\usbdescriptors.dll	sys\bin\usbdescriptors.dll
+file=\epoc32\release\ARMV5\urel\usbhostmsclient.dll	sys\bin\usbhostmsclient.dll
+file=\epoc32\release\ARMV5\urel\usbdi_utils.dll		sys\bin\usbdi_utils.dll
+file=\epoc32\release\ARMV5\urel\iscapi.dll			sys\bin\iscapi.dll
+file=\epoc32\release\ARMV5\urel\isimessage.dll		sys\bin\isimessage.dll
+
+// cenrep file for timezone server database support
+data=\epoc32\data\z\private\10202be9\1020383e.txt		private\10202be9\1020383e.txt
+
+#endif /* __MINIGUI_OBY__ */
diff -r 5fabdb30d001 -r f9816ed9a757 windowing/windowserver/minigui/group/wsini_minigui-stripped.ini
Binary file windowing/windowserver/minigui/group/wsini_minigui-stripped.ini has changed