Remerge assorted integration fixes for Symbian^3, including Bug 2895 and Bug 2896
--- a/build/buildutils/generatej9zips.py Wed Jun 09 09:34:07 2010 +0300
+++ b/build/buildutils/generatej9zips.py Thu Jun 17 15:01:51 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/build/properties.xml Wed Jun 09 09:34:07 2010 +0300
+++ b/build/properties.xml Thu Jun 17 15:01:51 2010 +0100
@@ -27,6 +27,14 @@
<!--The environment properties -->
<property environment="env"/>
+ <!-- Set internal epoc root -->
+ <condition property="epocroot"
+ value="${env.EPOCROOT}"
+ else="">
+ <isset property="env.EPOCROOT"/>
+ </condition>
+
+
<!--The root of the source files -->
<property name="java.src.root" location="${ant.file.Properties}/../../"/>
@@ -42,9 +50,9 @@
<property name="platform.utilities.xml.file" value="utilities.fake.xml"/>
<!--The cldc/cdc class file locations -->
- <property name="bootclasspath.cldc" location="${java.src.root}/inc/classes.cldc.zip"/>
- <property name="bootclasspath.cdc" location="${java.src.root}/inc/classes.cdc.zip"/>
- <property name="bootclasspath.fp" location="${java.src.root}/inc/classes.fp.zip"/>
+ <property name="bootclasspath.cldc" location="${java.src.root}/inc/classes.cldc.zip;${epocroot}epoc32/jrt/classes.cldc.zip"/>
+ <property name="bootclasspath.cdc" location="${java.src.root}/inc/classes.cdc.zip;${epocroot}epoc32/jrt/classes.cdc.zip"/>
+ <property name="bootclasspath.fp" location="${java.src.root}/inc/classes.fp.zip;${epocroot}epoc32/jrt/classes.fp.zip"/>
@@ -60,13 +68,6 @@
<equals arg1="${target.cfg}" arg2="debug"/>
</condition>
- <!-- Set internal epoc root -->
- <condition property="epocroot"
- value="${env.EPOCROOT}"
- else="">
- <isset property="env.EPOCROOT"/>
- </condition>
-
<!--Location of eswt.jar. This is not needed in S60 Avkon,
but needed in S60 Qt. -->
<property name="eswt.jar" value=":${java.src.root}/javauis/bin/eswt.jar"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/java_s60_release.hrh Thu Jun 17 15:01:51 2010 +0100
@@ -0,0 +1,1 @@
+RD_JAVA_S60_RELEASE=9.2
--- a/javauis/lcdui_akn/javalcdui/build/javalcdui.pro Wed Jun 09 09:34:07 2010 +0300
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui.pro Thu Jun 17 15:01:51 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 Jun 09 09:34:07 2010 +0300
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp Thu Jun 17 15:01:51 2010 +0100
@@ -158,7 +158,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 Jun 09 09:34:07 2010 +0300
+++ b/javauis/lcdui_akn/lcdui/build/lcdui.mmp Thu Jun 17 15:01:51 2010 +0100
@@ -209,7 +209,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
#endif // RD_JAVA_NGA_ENABLED
--- a/javauis/lcdui_akn/lcdui/src/CMIDKeyDecoder.cpp Wed Jun 09 09:34:07 2010 +0300
+++ b/javauis/lcdui_akn/lcdui/src/CMIDKeyDecoder.cpp Thu Jun 17 15:01:51 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 Jun 09 09:34:07 2010 +0300
+++ b/javauis/m3g_akn/build/javam3g.pro Thu Jun 17 15:01:51 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 Jun 09 09:34:07 2010 +0300
+++ b/javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp Thu Jun 17 15:01:51 2010 +0100
@@ -76,7 +76,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