Binary file cdlcompiler/binary/CdlCompiler.EXE has changed

--- a/cdlcompiler/group/bld.inf	Thu May 27 13:53:15 2010 +0300
+++ b/cdlcompiler/group/bld.inf	Fri Jun 11 14:37:49 2010 +0300
@@ -21,21 +21,14 @@
 
 PRJ_EXPORTS
 
-../binary/CdlCompiler.EXE /epoc32/tools/CdlCompiler.EXE 
+/* ../binary/CdlCompiler.EXE /epoc32/tools/CdlCompiler.EXE  */
 
 PRJ_MMPFILES
 
-#if defined(TOOLS) || defined(CWTOOLS) || defined(TOOLS2)
-
-/*
- * NOTICE! CdlCompiler is not compiled any more during usual build.
- * It is just exported from ../binary directory.
- * If you really want compile AknLayoutCompiler from sources you need to 
- * uncomment below line, build this project and copy 
- * /epoc32/tools/AknLayoutCompiler.exe to ../binary directory and 
- * put the binary to version control.
- */
-// CdlCompiler.mmp
+/* FIXME: Can we remove this later ? */
+/* defined(TOOLS) || defined(CWTOOLS) ||  */
+#if defined(TOOLS2)
+CdlCompiler.mmp
 #endif
 
 // End of File

--- a/gfxtools/Color/group/bld.inf	Thu May 27 13:53:15 2010 +0300
+++ b/gfxtools/Color/group/bld.inf	Fri Jun 11 14:37:49 2010 +0300
@@ -19,14 +19,14 @@
 #include <platform_paths.hrh>
 
 PRJ_PLATFORMS
-CWTOOLS TOOLS
+CWTOOLS TOOLS TOOLS2
 
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-#if defined(TOOLS) || defined(CWTOOLS)
-../group/Color.mmp
-/* gnumakefile ../group/convcolor.mk */
+#if defined(TOOLS) || defined(CWTOOLS) || defined(TOOLS2)
+Color.mmp
+/* gnumakefile convcolor.mk */
 #endif
 
 // End of File

--- a/svgtencoder/svgtenc/standalone/group/bld.inf	Thu May 27 13:53:15 2010 +0300
+++ b/svgtencoder/svgtenc/standalone/group/bld.inf	Fri Jun 11 14:37:49 2010 +0300
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
+
 #include <platform_paths.hrh>
 
 PRJ_PLATFORMS

--- a/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp	Thu May 27 13:53:15 2010 +0300
+++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp	Fri Jun 11 14:37:49 2010 +0300
@@ -11,9 +11,10 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
+
 #include <platform_paths.hrh>
 
 TARGET				svgtbinencode.exe

--- a/svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk	Thu May 27 13:53:15 2010 +0300
+++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk	Fri Jun 11 14:37:49 2010 +0300
@@ -11,7 +11,7 @@
 #
 # Contributors:
 #
-# Description: 
+# Description:
 #
 
 PROGRAM=/home/nokia/standalone/group/svgtbinencode.exe

--- a/uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h	Thu May 27 13:53:15 2010 +0300
+++ b/uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h	Fri Jun 11 14:37:49 2010 +0300
@@ -1,19 +1,3 @@
-/*
-* 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: 
-*
-*/
 // Cdlcompat.h
 
 #ifndef CDLCOMPAT_H