--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Wed Aug 18 10:48:09 2010 +0300
@@ -0,0 +1,61 @@
+<?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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Wed Aug 18 10:48:09 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
Binary file svgtencoder/svgtenc/standalone/binary/svgtbinencode has changed
Binary file svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe has changed
--- a/svgtencoder/svgtenc/standalone/group/bld.inf Tue Jul 06 15:24:03 2010 +0300
+++ b/svgtencoder/svgtenc/standalone/group/bld.inf Wed Aug 18 10:48:09 2010 +0300
@@ -31,6 +31,7 @@
//#if defined(TOOLS)
../binary/svgtbinencode.exe /epoc32/tools/svgtbinencode.exe
../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
--- a/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp Tue Jul 06 15:24:03 2010 +0300
+++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp Wed Aug 18 10:48:09 2010 +0300
@@ -25,7 +25,7 @@
// level 3. Also require RTTI.
option MSVC /GX /W3 /GR
-option GCC -w -DXML_LIBRARY
+option GCC -w -DXML_LIBRARY -m32
SOURCEPATH ../Internal/xmlReader/src
SOURCE MyRXMLReader.cpp
--- a/svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk Tue Jul 06 15:24:03 2010 +0300
+++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk Wed Aug 18 10:48:09 2010 +0300
@@ -1,22 +1,6 @@
-#
-# 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:
-#
-
-PROGRAM=/home/nokia/standalone/group/svgtbinencode.exe
-OBJS=/home/nokia/standalone/group
-PARENT_DIR=/home/nokia/standalone/group
+PROGRAM=svgtbinencode
+OBJS=.
+PARENT_DIR=.
SOURCES_CPP=../Internal/Gfx2D/src/GfxFloatFixPt.cpp \
../Internal/Gfx2D/src/Gfxtrignometric.cpp \
../Internal/Gfx2D/src/GfxGc/GfxColor.cpp \
@@ -166,9 +150,14 @@
# /I"$(STLPORT_INC)"
VPATH=$(PARENT_DIR)
-CC=g++ -g
+
+# Uncomment this, to generate a debug version.
+# debug=-g3
+
+CC=g++ -O2 -m32 $(debug)
+
LINK=ld
-LINK32_FLAGS=/home/nokia/standalone/lib_linux/libxercesenc-c.so.28
+LINK32_FLAGS=-L../lib_linux -lxercesenc-c
DEFINES =-I "../Internal/SVGEngine/inc" \
-I "../Internal/Gfx2D/inc" \
-I "../Internal/Gfx2D/VGRasterizer/inc" \
@@ -181,12 +170,12 @@
-I "../Internal/Path/inc" -D ARM -D NDEBUG -D _CONSOLE -D _MBCS
#/YX /FD /c
#CLFLAGS = /Od /nologo /GF -W4 /Fd -GX
-CLFLAGS =-ansi -umacro -fms-extensions -w -fshort-wchar -g3
+CLFLAGS =-ansi -umacro -fms-extensions -w -fshort-wchar $(debug)
#/nologo /MT /GX
$(PROGRAM) : $(OBJECTS_CPP_REL) $(OBJECTS_C_REL)
# echo $(SOURCES_CPP)
# echo $(SOURCES_C)
- g++ -g3 -lstdc++ -o $(PROGRAM) $(OBJECTS_CPP_REL) $(OBJECTS_C_REL) $(LINK32_FLAGS)
+ $(CC) -lstdc++ -lpthread -o $(PROGRAM) $(OBJECTS_CPP_REL) $(OBJECTS_C_REL) $(LINK32_FLAGS)
#DEB : $(OBJECTS_CPP_DEB)
echo "DEB build Called"
@@ -247,5 +236,3 @@
find -name *.o -type f -exec rm {} \;
FORCE:
-
-
Binary file svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.a has changed
Binary file svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.so.28 has changed
Binary file svgtencoder/svgtenc/standalone/lib_win/libxercesenc-c.a has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/uitools_info/nokia_uitools_metadata/package_definition.xml Wed Aug 18 10:48:09 2010 +0300
@@ -0,0 +1,13 @@
+<?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>