Apply patch 6. Cleanup syborg specific variation by allowing the project file to build one specially for it. Fix include macros for test apps. Further tuning how the variant is build appears in later patches. Explicitly including platform_paths seems to make debugging easier for carbide. This might be removed if its bad practice or causes issues.
--- a/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp Thu May 06 15:52:48 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp Thu May 06 18:24:48 2010 +0100
@@ -112,11 +112,6 @@
iDispChan.Close();
}
-/*
- * Temporary hack; whats the best config strategy for Syborg?
- */
-#define __SYBORG__
-
void COWFScreenDisplayInfo::ConstructL()
{
User::LeaveIfError(iDispChan.Open(iScreenNumber));
--- a/graphicscomposition/openwfcompositionengine/group/bld.inf Thu May 06 15:52:48 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/group/bld.inf Thu May 06 18:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -23,6 +23,8 @@
PRJ_MMPFILES
openwfc.mmp
+openwfchwref.mmp
+openwfchwsyborg.mmp
PRJ_TESTMMPFILES
owfsharect.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc.mmh Thu May 06 18:24:48 2010 +0100
@@ -0,0 +1,99 @@
+// Copyright (c) 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"
+// 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:
+// Common project include header for OpenWFC DLL implementations
+// The need for this common header is so that three different versions of the
+// implementation can be generated:
+// 1. WINSCW version (libWFC.dll)
+// 2. Nokia ARM Reference Boards version (libwfchwref.dll)
+// 3. Symbian Foundation Syborg Virtual Platform version (libwfchwsyborg.dll)
+//
+// Note for hardware platforms, the dll is aliased to libWFC.dll
+//
+//
+
+#include <WF/openwfcuids.hrh>
+
+NOEXPORTLIBRARY
+EPOCALLOWDLLDATA
+
+#ifdef WINS
+deffile SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(def/win32/libWFC.def)
+#else
+deffile SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(def/eabi/libWFC.def)
+#endif
+
+MACRO __KHR_EXPORTS
+TARGETTYPE dll
+CAPABILITY PowerMgmt ReadDeviceData WriteDeviceData ProtServ
+UID 0 KUidOpenWfcDllUidValue
+
+OPTION ARMCC -O3 -Otime --cpu 6
+ALWAYS_BUILD_AS_ARM
+
+OS_LAYER_SYSTEMINCLUDE
+OS_LAYER_LIBC_SYSTEMINCLUDE
+MACRO HG_NO_ALLOCA_H
+MACRO EGL_DLL
+
+USERINCLUDE ../composition/include
+USERINCLUDE ../common/include
+USERINCLUDE ../adaptation/include
+
+LIBRARY libEGL.lib
+LIBRARY euser.lib
+LIBRARY libc.lib
+LIBRARY libpthread.lib
+LIBRARY libm.lib
+LIBRARY hal.lib
+LIBRARY wfcinterop.lib
+LIBRARY surfacemanager.lib
+
+SOURCEPATH ../composition/src
+SOURCE wfcapi.c
+SOURCE wfccontext.c
+SOURCE wfcdevice.c
+SOURCE wfcelement.c
+SOURCE wfcimageprovider.c
+SOURCE wfcscene.c
+SOURCE wfcpipeline.c
+
+SOURCEPATH ../common/src
+SOURCE owfarray.c
+SOURCE owfattributes.c
+SOURCE owfdebug.c
+SOURCE owfimage.c
+SOURCE owflinkedlist.c
+SOURCE owfmemory.c
+SOURCE owfobject.c
+SOURCE owfpool.c
+SOURCE owfutils.c
+
+SOURCEPATH ../adaptation/src/Platform/OS/symbian
+SOURCE owfconsole.cpp
+SOURCE owfmessagequeue.c
+SOURCE owfmutex.c
+SOURCE owfsemaphore.c
+SOURCE owfthread.c
+SOURCE owfextensions.cpp
+
+SOURCEPATH ../adaptation/src/Platform/Graphics/symbian
+SOURCE owfdisplaycontext.cpp
+SOURCE owfscreen_displaychannel.cpp
+SOURCE owfnativestreamstub.cpp
+SOURCE owfnotifications.cpp
+
+
+
+SMPSAFE
+
--- a/graphicscomposition/openwfcompositionengine/group/openwfc.mmp Thu May 06 15:52:48 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-// Copyright (c) 2009-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"
-// 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:
-// libWFC.dll OpenWFC Sample Implementation
-//
-//
-
-#include <WF/openwfcuids.hrh>
-
-//macros to enable filtering debug log output.
-//DEBUG_LOG must also be defined to enable logging
-//(automatic if _DEBUG is defined, and DEBUG_DONOT_LOG is not defined)
-MACRO DEBUG_DONOT_LOG
-//MACRO DEBUG_LOG_FUNCTION=WFC_Element_
-//MACRO DEBUG_LOG_FILE=owfnotifications.c
-
-TARGET libWFC.dll
-NOEXPORTLIBRARY
-EPOCALLOWDLLDATA
-
-#ifdef WINS
-deffile SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(def/win32/libWFC.def)
-#else
-deffile SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(def/eabi/libWFC.def)
-#endif
-
-MACRO __KHR_EXPORTS
-TARGETTYPE dll
-CAPABILITY PowerMgmt ReadDeviceData WriteDeviceData ProtServ
-UID 0 KUidOpenWfcDllUidValue
-
-OPTION ARMCC -O3 -Otime --cpu 6
-ALWAYS_BUILD_AS_ARM
-
-OS_LAYER_SYSTEMINCLUDE
-OS_LAYER_LIBC_SYSTEMINCLUDE
-MACRO HG_NO_ALLOCA_H
-MACRO EGL_DLL
-
-USERINCLUDE ../composition/include
-USERINCLUDE ../common/include
-USERINCLUDE ../adaptation/include
-
-LIBRARY libEGL.lib
-LIBRARY euser.lib
-LIBRARY libc.lib
-LIBRARY libpthread.lib
-LIBRARY libm.lib
-LIBRARY hal.lib
-LIBRARY wfcinterop.lib
-LIBRARY surfacemanager.lib
-
-SOURCEPATH ../composition/src
-SOURCE wfcapi.c
-SOURCE wfccontext.c
-SOURCE wfcdevice.c
-SOURCE wfcelement.c
-SOURCE wfcimageprovider.c
-SOURCE wfcscene.c
-SOURCE wfcpipeline.c
-
-SOURCEPATH ../common/src
-SOURCE owfarray.c
-SOURCE owfattributes.c
-SOURCE owfdebug.c
-SOURCE owfimage.c
-SOURCE owflinkedlist.c
-SOURCE owfmemory.c
-SOURCE owfobject.c
-SOURCE owfpool.c
-SOURCE owfutils.c
-
-SOURCEPATH ../adaptation/src/Platform/OS/symbian
-SOURCE owfconsole.cpp
-SOURCE owfmessagequeue.c
-SOURCE owfmutex.c
-SOURCE owfsemaphore.c
-SOURCE owfthread.c
-SOURCE owfextensions.cpp
-
-SOURCEPATH ../adaptation/src/Platform/Graphics/symbian
-SOURCE owfdisplaycontext.cpp
-SOURCE owfscreen_displaychannel.cpp
-SOURCE owfnativestreamstub.cpp
-SOURCE owfnotifications.cpp
-
-
-
-SMPSAFE
-
--- a/graphicscomposition/openwfcompositionengine/group/openwfc_ref.iby Thu May 06 15:52:48 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc_ref.iby Thu May 06 18:24:48 2010 +0100
@@ -19,7 +19,12 @@
#include <egl.iby>
#include <openwfc_support.iby>
-REM OpenWFC SI
-file=ABI_DIR\BUILD_DIR\libWFC.dll \sys\bin\libWFC.dll
+#ifndef __SYBORG__
+file=ABI_DIR\BUILD_DIR\libwfchwref.dll \sys\bin\libwfchwref.dll
+alias \sys\bin\libwfchwref.dll \sys\bin\libWFC.dll
+#else
+file=ABI_DIR\BUILD_DIR\libwfchwsyborg.dll \sys\bin\libwfchwsyborg.dll
+alias \sys\bin\libwfchwsyborg.dll \sys\bin\libWFC.dll
+#endif
#endif // __OPENWFC_REF_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphicscomposition/openwfcompositionengine/group/openwfchwref.mmp Thu May 06 18:24:48 2010 +0100
@@ -0,0 +1,28 @@
+// Copyright (c) 2009-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"
+// 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:
+// OpenWFC Sample Implementation Hardware Reference
+//
+//
+
+
+//macros to enable filtering debug log output.
+//DEBUG_LOG must also be defined to enable logging
+//(automatic if _DEBUG is defined, and DEBUG_DONOT_LOG is not defined)
+MACRO DEBUG_DONOT_LOG
+//MACRO DEBUG_LOG_FUNCTION=WFC_Element_
+//MACRO DEBUG_LOG_FILE=owfnotifications.c
+
+#include "openwfc.mmh"
+
+TARGET libwfchwref.dll
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphicscomposition/openwfcompositionengine/group/openwfchwsyborg.mmp Thu May 06 18:24:48 2010 +0100
@@ -0,0 +1,33 @@
+// Copyright (c) 2009-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"
+// 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:
+// OpenWFC Sample Implementation for Syborg. This is the same as the reference
+// version, but differs in the area of the default screen rotation setting.
+// The reference version rotates the screen 270CW by default; the syborg version
+// does not.
+//
+//
+
+
+//macros to enable filtering debug log output.
+//DEBUG_LOG must also be defined to enable logging
+//(automatic if _DEBUG is defined, and DEBUG_DONOT_LOG is not defined)
+MACRO DEBUG_DONOT_LOG
+//MACRO DEBUG_LOG_FUNCTION=WFC_Element_
+//MACRO DEBUG_LOG_FILE=owfnotifications.c
+
+MACRO __SYBORG__
+
+#include "openwfc.mmh"
+
+TARGET libwfchwsyborg.dll
--- a/windowing/windowserver/test/t_integ/group/t_app1.mmp Thu May 06 15:52:48 2010 +0100
+++ b/windowing/windowserver/test/t_integ/group/t_app1.mmp Thu May 06 18:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -37,6 +37,7 @@
USERINCLUDE ../inc
+#include <platform_paths.hrh>
APP_LAYER_SYSTEMINCLUDE
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_SYSTEMINCLUDE
--- a/windowing/windowserver/test/t_integ/group/t_dsaapp.mmp Thu May 06 15:52:48 2010 +0100
+++ b/windowing/windowserver/test/t_integ/group/t_dsaapp.mmp Thu May 06 18:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -36,6 +36,8 @@
SOURCE t_dsaappview.cpp
USERINCLUDE ../inc
+
+#include <platform_paths.hrh>
APP_LAYER_SYSTEMINCLUDE
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_SYSTEMINCLUDE
--- a/windowing/windowserver/test/t_integ/group/t_fpsapp.mmp Thu May 06 15:52:48 2010 +0100
+++ b/windowing/windowserver/test/t_integ/group/t_fpsapp.mmp Thu May 06 18:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -36,6 +36,8 @@
SOURCE t_fpsappview.cpp
USERINCLUDE ../inc
+
+#include <platform_paths.hrh>
APP_LAYER_SYSTEMINCLUDE
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_SYSTEMINCLUDE
--- a/windowing/windowserver/test/t_integ/group/t_pseudoapp.mmp Thu May 06 15:52:48 2010 +0100
+++ b/windowing/windowserver/test/t_integ/group/t_pseudoapp.mmp Thu May 06 18:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -36,6 +36,7 @@
SOURCE t_pseudoappview.cpp
USERINCLUDE ../inc
+#include <platform_paths.hrh>
APP_LAYER_SYSTEMINCLUDE
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_SYSTEMINCLUDE
--- a/windowing/windowserver/test/t_integ/group/t_pseudoapp1.mmp Thu May 06 15:52:48 2010 +0100
+++ b/windowing/windowserver/test/t_integ/group/t_pseudoapp1.mmp Thu May 06 18:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -38,6 +38,7 @@
SOURCE t_pseudoappview.cpp
USERINCLUDE ../inc
+#include <platform_paths.hrh>
APP_LAYER_SYSTEMINCLUDE
MW_LAYER_SYSTEMINCLUDE
OS_LAYER_SYSTEMINCLUDE