Mercurial Mercurial > oss > FCL > sf > mw > opensrv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:11:54 +0000
branchCompilerCompatibility
changeset 7 f7fdc18fc271
parent 5 8bf259243755 (current diff)
parent 4 38249ef85f99 (diff)
Automatic merge from PDK_3.0.h
--- a/group/bld.inf	Mon Mar 08 21:44:08 2010 +0000
+++ b/group/bld.inf	Sun Mar 14 13:11:54 2010 +0000
@@ -1,8 +1,8 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002 - 2007 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"
+* 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".
 *
@@ -11,10 +11,10 @@
 *
 * Contributors:
 *
-* Description:  constant declaration class
- *                
- *
+* Description:  bld.inf
+*
 */
+
 // Project configuration file for dbus
 
 // Project platforms
--- a/isolationserver/tsrc/group/bld.inf	Mon Mar 08 21:44:08 2010 +0000
+++ b/isolationserver/tsrc/group/bld.inf	Sun Mar 14 13:11:54 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 - 2007 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"
+* 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".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description: bld.inf
+* Description:  bld.inf
 *
 */
 
 
 
+
 PRJ_PLATFORMS
 // specify the platforms your component needs to be built for here
 // defaults to WINS MARM so you can ignore this if you just build these
--- a/isolationserver/tsrc/inc/isolationserver.h	Mon Mar 08 21:44:08 2010 +0000
+++ b/isolationserver/tsrc/inc/isolationserver.h	Sun Mar 14 13:11:54 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 - 2007 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"
+* 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".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description:  isolationserver.h
+* Description:   isolationserver.h
 *
 */
 
 
 
+
 #ifndef ISOLATIONSERVER_H
 #define ISOLATIONSERVER_H
 
--- a/isolationserver/tsrc/src/isolationserver.cpp	Mon Mar 08 21:44:08 2010 +0000
+++ b/isolationserver/tsrc/src/isolationserver.cpp	Sun Mar 14 13:11:54 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 - 2007 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"
+* 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".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description:  isolationserver.cpp
+* Description:   isolationserver.cpp
 *
 */
 
 
 
+
 // INCLUDE FILES
 #include <StifTestInterface.h>
 #include "isolationserver.h"
--- a/isolationserver/tsrc/src/isolationserverBlocks.cpp	Mon Mar 08 21:44:08 2010 +0000
+++ b/isolationserver/tsrc/src/isolationserverBlocks.cpp	Sun Mar 14 13:11:54 2010 +0000
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 - 2007 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"
+* 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".
 *
@@ -11,12 +11,13 @@
 *
 * Contributors:
 *
-* Description:  isolationserverBlocks.cpp
+* Description:   isolationserverBlocks.cpp
 *
 */
 
 
 
+
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
--- a/opensrv_plat/group/bld.inf	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/group/bld.inf	Sun Mar 14 13:11:54 2010 +0000
@@ -1,8 +1,8 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002 - 2007 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"
+* 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".
 *
@@ -11,11 +11,11 @@
 *
 * Contributors:
 *
-* Description:  constant declaration class
- *                
- *
+* Description:  bld.inf
+*
 */
 
+
 #include <platform_paths.hrh>
 
 
--- a/opensrv_plat/messagequeue_api/tsrc/group/bld.inf	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/group/bld.inf	Sun Mar 14 13:11:54 2010 +0000
@@ -1,8 +1,8 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* 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"
+* 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".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 * 
-* Description:
+* Description: 
 *
 */
 
+
 PRJ_PLATFORMS
 // specify the platforms your component needs to be built for here
 // defaults to WINS MARM so you can ignore this if you just build these
--- a/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api.mmp	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api.mmp	Sun Mar 14 13:11:54 2010 +0000
@@ -1,9 +1,8 @@
-/*TYPE TESTCLASS*/
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+/*TYPE TESTCLASS*//*
+* 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"
+* 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".
 *
@@ -12,11 +11,12 @@
 *
 * Contributors:
 * 
-* Description: MMP file for STIF Test Framework's TestScripter 
+* Description:  MMP file for STIF Test Framework's TestScripter 
 * testclass test module.
 *
 */
 
+
 #include <platform_paths.hrh>
 
 TARGET          messagequeue_api.dll
--- a/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api.pkg	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api.pkg	Sun Mar 14 13:11:54 2010 +0000
@@ -1,8 +1,8 @@
 ;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+; 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"
+; 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".
 ;
@@ -11,9 +11,7 @@
 ;
 ; Contributors:
 ; 
-; Description:
-;
-; 	Installation file for STIF
+; Description: 
 ;
 
 ; Languages
--- a/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api_DoxyFile.txt	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api_DoxyFile.txt	Sun Mar 14 13:11:54 2010 +0000
@@ -2,7 +2,7 @@
 # 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"
+# 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".
 #
--- a/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api_nrm.mmp	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/group/messagequeue_api_nrm.mmp	Sun Mar 14 13:11:54 2010 +0000
@@ -1,9 +1,8 @@
-/*TYPE TESTCLASS*/
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+/*TYPE TESTCLASS*//*
+* 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"
+* 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".
 *
@@ -12,11 +11,12 @@
 *
 * Contributors:
 * 
-* Description: MMP file for STIF Test Framework's TestScripter 
+* Description:  MMP file for STIF Test Framework's TestScripter 
 * testclass test module.
 *
 */
 
+
 #include <platform_paths.hrh>
 
 TARGET          messagequeue_api.dll
--- a/opensrv_plat/messagequeue_api/tsrc/inc/messagequeue_api.h	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/inc/messagequeue_api.h	Sun Mar 14 13:11:54 2010 +0000
@@ -1,8 +1,8 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* 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"
+* 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".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 * 
-* Description: STIF testclass declaration
+* Description:  STIF testclass declaration
 *
 */
 
+
 #ifndef MESSAGEQUEUE_API_H
 #define MESSAGEQUEUE_API_H
 
--- a/opensrv_plat/messagequeue_api/tsrc/src/messagequeue_api.cpp	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/src/messagequeue_api.cpp	Sun Mar 14 13:11:54 2010 +0000
@@ -1,8 +1,8 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* 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"
+* 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".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 * 
-* Description: This file contains testclass implementation.
+* Description:  This file contains testclass implementation.
 *
 */
 
+
 // INCLUDE FILES
 #include <StifTestInterface.h>
 #include "messagequeue_api.h"
--- a/opensrv_plat/messagequeue_api/tsrc/src/messagequeue_apiBlocks.cpp	Mon Mar 08 21:44:08 2010 +0000
+++ b/opensrv_plat/messagequeue_api/tsrc/src/messagequeue_apiBlocks.cpp	Sun Mar 14 13:11:54 2010 +0000
@@ -1,8 +1,8 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* 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"
+* 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".
 *
@@ -11,10 +11,11 @@
 *
 * Contributors:
 * 
-* Description: This file contains testclass implementation.
+* Description:  This file contains testclass implementation.
 *
 */
 
+
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <StifParser.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/group/bld.inf	Sun Mar 14 13:11:54 2010 +0000
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2002 - 2007 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:  bld.inf
+*
+*/
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+	
+	DEFAULT
+
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+
+PRJ_EXPORTS
+
+
+	
+
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+#include "../../opensrv_plat/messagequeue_api/tsrc/group/bld.inf"
+	
+	
+	
+
+
+
+//  End of File
FCL/sf/mw/opensrv