--- a/build/buildutils/generatej9zips.py Wed Sep 01 12:33:18 2010 +0100
+++ b/build/buildutils/generatej9zips.py Thu Sep 02 15:46:18 2010 +0100
@@ -26,7 +26,7 @@
self.currentDestRoot = None
def convert(self):
- self.createPackages("weme")
+ # self.createPackages("weme")
self.createPackages("wece")
return
@@ -325,8 +325,8 @@
('winscw/udeb/z/resource/ive/lib/jclFoundation11/locale.zip', 'locale.fp.zip'),
('winscw/udeb/z/resource/ive/lib/jclCdc11/locale.zip', 'locale.cdc.zip'),
('../../../../../../info.txt', None),
- ('../../../../copyright.txt', None),
- ('../../../../../ReleaseNotes-12-10-2009.doc', 'releasenotes/ReleaseNotes.doc')
+ ('../../../../../copyright.txt', None),
+ #('../../../../../ReleaseNotes-12-10-2009.doc', 'releasenotes/ReleaseNotes.doc')
]
j9FilesToIgnore = [
--- a/javauis/lcdui_akn/javalcdui/build/javalcdui.pro Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui.pro Thu Sep 02 15:46:18 2010 +0100
@@ -48,7 +48,7 @@
-lws32 \
-lCentralRepository \
#ifdef RD_JAVA_NGA_ENABLED
- -llibegl \
+ -llibegl_sw \
-llibglesv1_cm
#endif // RD_JAVA_NGA_ENABLED
--- a/javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp Thu Sep 02 15:46:18 2010 +0100
@@ -157,7 +157,7 @@
LIBRARY hwrmlightclient.lib
LIBRARY gfxtrans.lib
LIBRARY CentralRepository.lib
-LIBRARY libegl.lib
+LIBRARY libegl_sw.lib
LIBRARY libglesv1_cm.lib
LIBRARY javautils.lib
LIBRARY libpthread.lib
--- a/javauis/lcdui_akn/lcdui/build/lcdui.mmp Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/lcdui/build/lcdui.mmp Thu Sep 02 15:46:18 2010 +0100
@@ -208,7 +208,7 @@
#endif //RD_JAVA_ADVANCED_TACTILE_FEEDBACK
#ifdef RD_JAVA_NGA_ENABLED
-LIBRARY libEGL.lib
+LIBRARY libEGL_sw.lib
LIBRARY libGLESv1_CM.lib
LIBRARY alfdecoderserverclient.lib
LIBRARY goommonitor.lib
--- a/javauis/lcdui_akn/lcdui/src/CMIDKeyDecoder.cpp Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/lcdui_akn/lcdui/src/CMIDKeyDecoder.cpp Thu Sep 02 15:46:18 2010 +0100
@@ -222,9 +222,12 @@
TRAP(err, repository = CRepository::NewL(KCRUidMidpLcdui));
// 2 bytes in scan code
TBuf8<2> scanCodeBuffer;
- CleanupStack::PushL(repository);
- err = repository->Get(KAdditionalSelectKeyMapping,scanCodeBuffer);
- CleanupStack::PopAndDestroy(repository);
+ if (err == KErrNone)
+ {
+ CleanupStack::PushL(repository);
+ err = repository->Get(KAdditionalSelectKeyMapping,scanCodeBuffer);
+ CleanupStack::PopAndDestroy(repository);
+ }
if (err == KErrNone)
{
TUint8 scanCodeLeft = scanCodeBuffer[0];
--- a/javauis/m3g_akn/build/javam3g.pro Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/m3g_akn/build/javam3g.pro Thu Sep 02 15:46:18 2010 +0100
@@ -32,7 +32,7 @@
-lfbscli \
-ljavalegacyutils \
#ifdef RD_JAVA_NGA_ENABLED
- -llibegl \
+ -llibegl_sw \
-llibglesv1_cm \
#else
-llibGLES_CM \
--- a/javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp Wed Sep 01 12:33:18 2010 +0100
+++ b/javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp Thu Sep 02 15:46:18 2010 +0100
@@ -75,7 +75,7 @@
LIBRARY ezlib.lib
LIBRARY fbscli.lib
LIBRARY javalegacyutils.lib
-LIBRARY libegl.lib
+LIBRARY libegl_sw.lib
LIBRARY libglesv1_cm.lib
LIBRARY libGLES_CM.lib
LIBRARY m3gcore.lib