# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1287753836 -3600
# Node ID 0553e2305d00eef81ec780f694f43a3842c98258
# Parent  26b2b12093af2c02eeacd473d25345bbf63bf381# Parent  461e71b327da27318f868bc9686b5db2460b93f3
Remerge changes for bug 2896 and tweak for generatej9zips.py

diff -r 26b2b12093af -r 0553e2305d00 build/buildutils/generatej9zips.py
--- a/build/buildutils/generatej9zips.py	Wed Oct 13 14:23:59 2010 +0300
+++ b/build/buildutils/generatej9zips.py	Fri Oct 22 14:23:56 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 = [
diff -r 26b2b12093af -r 0553e2305d00 javauis/lcdui_akn/javalcdui/build/javalcdui.pro
--- a/javauis/lcdui_akn/javalcdui/build/javalcdui.pro	Wed Oct 13 14:23:59 2010 +0300
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui.pro	Fri Oct 22 14:23:56 2010 +0100
@@ -48,7 +48,7 @@
         -lws32 \
         -lCentralRepository \ 
 #ifdef RD_JAVA_NGA_ENABLED
-	-llibegl \
+	-llibegl_sw \
 	-llibglesv1_cm
 #endif // RD_JAVA_NGA_ENABLED
 
diff -r 26b2b12093af -r 0553e2305d00 javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp
--- a/javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp	Wed Oct 13 14:23:59 2010 +0300
+++ b/javauis/lcdui_akn/javalcdui/build/javalcdui_0x2002DCBA.mmp	Fri Oct 22 14:23:56 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
diff -r 26b2b12093af -r 0553e2305d00 javauis/lcdui_akn/lcdui/build/lcdui.mmp
--- a/javauis/lcdui_akn/lcdui/build/lcdui.mmp	Wed Oct 13 14:23:59 2010 +0300
+++ b/javauis/lcdui_akn/lcdui/build/lcdui.mmp	Fri Oct 22 14:23:56 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
diff -r 26b2b12093af -r 0553e2305d00 javauis/m3g_akn/build/javam3g.pro
--- a/javauis/m3g_akn/build/javam3g.pro	Wed Oct 13 14:23:59 2010 +0300
+++ b/javauis/m3g_akn/build/javam3g.pro	Fri Oct 22 14:23:56 2010 +0100
@@ -32,7 +32,7 @@
         -lfbscli \
         -ljavalegacyutils \
 #ifdef RD_JAVA_NGA_ENABLED
-        -llibegl \
+        -llibegl_sw \
         -llibglesv1_cm \
 #else        
         -llibGLES_CM \
diff -r 26b2b12093af -r 0553e2305d00 javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp
--- a/javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp	Wed Oct 13 14:23:59 2010 +0300
+++ b/javauis/m3g_akn/build/javam3g_0x2002DCBE.mmp	Fri Oct 22 14:23:56 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