# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1283339793 -3600
# Node ID 01fc9b7302d1a64918cec069c85cfadbf8dbc37f
# Parent  44d14dfed84d9546173348e350a5143a0ffb71e9
Revert incorrect RCL_3 drop:
Revision: 201033
Kit: 201035

diff -r 44d14dfed84d -r 01fc9b7302d1 aknlayoutcompiler/binary/AknLayoutCompiler-vc.exe
Binary file aknlayoutcompiler/binary/AknLayoutCompiler-vc.exe has changed
diff -r 44d14dfed84d -r 01fc9b7302d1 aknlayoutcompiler/binary/AknLayoutCompiler.exe
Binary file aknlayoutcompiler/binary/AknLayoutCompiler.exe has changed
diff -r 44d14dfed84d -r 01fc9b7302d1 aknlayoutcompiler/group/AknLayoutCompiler.mmp
--- a/aknlayoutcompiler/group/AknLayoutCompiler.mmp	Tue Aug 31 16:13:44 2010 +0300
+++ b/aknlayoutcompiler/group/AknLayoutCompiler.mmp	Wed Sep 01 12:16:33 2010 +0100
@@ -25,7 +25,7 @@
 SYSTEMINCLUDE   ../../inc
 
 SYSTEMINCLUDE   ../../toollibraries/arabica/include
-SYSTEMINCLUDE   ../../toollibraries/xerces-c/include
+SYSTEMINCLUDE   ../../toollibraries/xercesc/include
 
 MW_LAYER_SYSTEMINCLUDE
 
diff -r 44d14dfed84d -r 01fc9b7302d1 cdlcompiler/binary/CdlCompiler-vc.EXE
Binary file cdlcompiler/binary/CdlCompiler-vc.EXE has changed
diff -r 44d14dfed84d -r 01fc9b7302d1 cdlcompiler/binary/CdlCompiler.EXE
Binary file cdlcompiler/binary/CdlCompiler.EXE has changed
diff -r 44d14dfed84d -r 01fc9b7302d1 cdlcompiler/group/bld.inf
--- a/cdlcompiler/group/bld.inf	Tue Aug 31 16:13:44 2010 +0300
+++ b/cdlcompiler/group/bld.inf	Wed Sep 01 12:16:33 2010 +0100
@@ -21,14 +21,21 @@
 
 PRJ_EXPORTS
 
-/* ../binary/CdlCompiler.EXE /epoc32/tools/CdlCompiler.EXE  */
+../binary/CdlCompiler.exe /epoc32/tools/CdlCompiler.exe 
 
 PRJ_MMPFILES
 
-/* FIXME: Can we remove this later ? */
-/* defined(TOOLS) || defined(CWTOOLS) ||  */
-#if defined(TOOLS2)
-CdlCompiler.mmp
+#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
 #endif
 
 // End of File
diff -r 44d14dfed84d -r 01fc9b7302d1 package_definition.xml
--- a/package_definition.xml	Tue Aug 31 16:13:44 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="uitools" name="UI Tools" levels="compile encode tool if">
-  <collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
-   <component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
-    <meta rel="Api" href="uitools_pub/third_party_bitmap_palette_api/third_party_bitmap_palette_api.metaxml"/>
-    <unit bldFile="uitools_pub/third_party_bitmap_palette_api/group"/>
-   </component>
-  </collection>
-  <collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
-   <component id="uitools_cdl_api" name="CDL API" class="api" filter="s60">
-    <meta rel="Api" href="uitools_plat/cdl_api/cdl_api.metaxml"/>
-    <unit bldFile="uitools_plat/cdl_api/group"/>
-   </component>
-   <component id="uitools_layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
-    <meta rel="Api" href="uitools_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
-    <unit bldFile="uitools_plat/layout_system_private_api/group"/>
-   </component>
-  </collection>
-  <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
-    <unit bldFile="cdlcompilertoolkit/group"/>
-   </component>
-  </collection>
-  <collection id="cdlcompiler" name="CDL Compiler" level="compile">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
-    <unit bldFile="cdlcompiler/group"/>
-   </component>
-  </collection>
-  <collection id="gfxtools" name="Graphics Tools" level="tool">
-   <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
-    <unit bldFile="gfxtools/color/group"/>
-   </component>
-  </collection>
-  <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
-    <unit bldFile="../uitools/aknlayoutcompiler/group"/>
-   </component>
-  </collection>
-  <collection id="skincompiler" name="Skin Compiler" level="compile">
-   <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
-    <unit bldFile="skincompiler/AknSkinDescCompiler/group"/>
-   </component>
-  </collection>
-  <collection id="reszip" name="Resource Zip" level="encode">
-   <!-- collection is actually a component. Needs to be moved down a directory -->
-   <component id="reszip_build" filter="s60" name="Resource Zip Build">
-    <unit bldFile="reszip/group"/>
-   </component>
-  </collection>
-  <collection id="toollibraries" name="Tool Libraries" level="tool"/>
-  <collection id="svgtencoder" name="SVGT Encoder" level="encode">
-   <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
-    <unit bldFile="svgtencoder/svgtenc/standalone/group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>
diff -r 44d14dfed84d -r 01fc9b7302d1 package_map.xml
--- a/package_map.xml	Tue Aug 31 16:13:44 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<PackageMap root="sf" layer="mw"/>
diff -r 44d14dfed84d -r 01fc9b7302d1 reszip/group/bld.inf
--- a/reszip/group/bld.inf	Tue Aug 31 16:13:44 2010 +0300
+++ b/reszip/group/bld.inf	Wed Sep 01 12:16:33 2010 +0100
@@ -25,9 +25,9 @@
 
 PRJ_MMPFILES
 #ifndef TOOLS
-#ifndef TOOLS2
-reszip.mmp
-#endif
+    #ifndef TOOLS2
+        reszip.mmp
+    #endif
 #endif
 
 PRJ_TESTMMPFILES
diff -r 44d14dfed84d -r 01fc9b7302d1 reszip/inc/rescomp.h
--- a/reszip/inc/rescomp.h	Tue Aug 31 16:13:44 2010 +0300
+++ b/reszip/inc/rescomp.h	Wed Sep 01 12:16:33 2010 +0100
@@ -59,7 +59,7 @@
 	void LoadUnCompressedFileL(RFs& aFs, const TDesC& aName);
 	TBool FileIsBAFLCompressedL(RFs& aFs, const TDesC& aName);
 
-	void OptimizeDict();
+	void OptimizeDictL();
 	void FindEmbeddedDict(TDesC8& aMatch, TInt aStart);
 	void WriteHeaderL(RWriteStream& aStream);
 	void WriteDictionaryL(RWriteStream& aStream);
diff -r 44d14dfed84d -r 01fc9b7302d1 reszip/inc/resdict.h
--- a/reszip/inc/resdict.h	Tue Aug 31 16:13:44 2010 +0300
+++ b/reszip/inc/resdict.h	Wed Sep 01 12:16:33 2010 +0100
@@ -37,7 +37,7 @@
 	TInt Saved();
 	TDesC8& Data();
 	TInt Use();
-	void CreateEmbeddedDict(TInt aDictIndex,CDictArray* aDict);
+	void CreateEmbeddedDictL(TInt aDictIndex,CDictArray* aDict);
 public:
 	TBufC8<KMaxDictEntry> iData;
 	TInt iUses;
diff -r 44d14dfed84d -r 01fc9b7302d1 reszip/src/rescomp.cpp
--- a/reszip/src/rescomp.cpp	Tue Aug 31 16:13:44 2010 +0300
+++ b/reszip/src/rescomp.cpp	Wed Sep 01 12:16:33 2010 +0100
@@ -426,7 +426,7 @@
 
 	// Optimize Dictionary
 
-	OptimizeDict();
+	OptimizeDictL();
 
 	// Compress using optimized dictionary
 
@@ -527,7 +527,7 @@
 
 
 
-void CResComp::OptimizeDict()
+void CResComp::OptimizeDictL()
 	{
 	// Find referenced dicts
 	TInt entries = iDict->Count();
@@ -565,7 +565,7 @@
 
 	for (TInt zz=0; zz<newDictEntries; zz++)
 		{
-		iDict->At(zz).CreateEmbeddedDict(zz, iDict);
+		iDict->At(zz).CreateEmbeddedDictL(zz, iDict);
 		}
 	}
 
diff -r 44d14dfed84d -r 01fc9b7302d1 reszip/src/resdict.cpp
--- a/reszip/src/resdict.cpp	Tue Aug 31 16:13:44 2010 +0300
+++ b/reszip/src/resdict.cpp	Wed Sep 01 12:16:33 2010 +0100
@@ -48,7 +48,7 @@
 	}
 
 
-void TDictEntry::CreateEmbeddedDict(TInt aDictIndex,CDictArray* aDict)
+void TDictEntry::CreateEmbeddedDictL(TInt aDictIndex,CDictArray* aDict)
 	{
 	// Create list of embedded dictionary strings
 	iEmbedded = new(ELeave)CResEntry(aDict);
diff -r 44d14dfed84d -r 01fc9b7302d1 svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe
Binary file svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe has changed
diff -r 44d14dfed84d -r 01fc9b7302d1 svgtencoder/svgtenc/standalone/group/bld.inf
--- a/svgtencoder/svgtenc/standalone/group/bld.inf	Tue Aug 31 16:13:44 2010 +0300
+++ b/svgtencoder/svgtenc/standalone/group/bld.inf	Wed Sep 01 12:16:33 2010 +0100
@@ -30,8 +30,8 @@
 	//START TOOLS
 		//#if defined(TOOLS) 
 				../binary/svgtbinencode.exe	/epoc32/tools/svgtbinencode.exe
+				../binary/svgtbinencode	/epoc32/tools/svgtbinencode
 				../binary/xerces-c_2_6.dll	/epoc32/tools/xerces-c_2_6.dll
-				../binary/svgtbinencode	/epoc32/tools/svgtbinencode
 				// For Windows abld Support "Link with dynamic xerces-c.2.8.0"
 				//../lib_win/xerces-c_2.lib /epoc32/release/tools/rel/xerces-c_2.lib
 				//../lib_win/xerces-c_2.lib /epoc32/release/tools/deb/xerces-c_2.lib
diff -r 44d14dfed84d -r 01fc9b7302d1 uitools_info/nokia_uitools_metadata/package_definition.xml
--- a/uitools_info/nokia_uitools_metadata/package_definition.xml	Tue Aug 31 16:13:44 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition xmlns:sf="http://www.symbian.org/system-definition" schema="3.0.0" id-namespace="http://www.nokia.com/schema/drd/system-definition">
-  <package id="sf:uitools" name="UI Tools" levels="compile encode tool">
-    <collection id="sf:toollibraries" name="Tool Libraries" level="tool">
-      <component id="arabica" filter="s60" name="Arabica" target="desktop">
-        <unit base="../../toollibraries/arabica"/>
-      </component>
-      <component id="xercesc" filter="s60" name="Xerces C" target="desktop">
-        <unit base="../../toollibraries/xercesc"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 44d14dfed84d -r 01fc9b7302d1 uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h
--- a/uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h	Tue Aug 31 16:13:44 2010 +0300
+++ b/uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h	Wed Sep 01 12:16:33 2010 +0100
@@ -1,3 +1,20 @@
+/*
+* 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