[Webkit-unassigned] [Bug 13027] [S60] related build file updates for S60 builds only
bugzilla-daemon at webkit.org
bugzilla-daemon at webkit.org
Mon Mar 12 08:12:18 PDT 2007
http://bugs.webkit.org/show_bug.cgi?id=13027
------- Comment #4 from mario.g.borges at nokia.com 2007-03-12 08:12 PDT -------
(From update of attachment 13565)
Index: JavaScriptCore/ChangeLog
===================================================================
--- JavaScriptCore/ChangeLog (revision 20093)
+++ JavaScriptCore/ChangeLog (working copy)
@@ -1,3 +1,16 @@
+2007-03-09 borges <mario.g.borges at nokia.com>
+
+ reviewed by Bradley
+
+ DESC: related with task 14594 for S60 build feature work
+ http://bugs.webkit.org/show_bug.cgi?id=13027
+
+ * group/JavaScriptCore.mmp:
+ * group/bld.inf:
+ * group/kjstest.mmp:
+ * group/pcre.mmp:
+ * group/pcretest.mmp:
+
vbradley, reviewed by Yongjun
DESC: merge r19917 to s60/trunk. ALAA-6XSF7U : Reduce stack overflow counter
http://bugs.webkit.org/show_bug.cgi?id=12928
Index: JavaScriptCore/group/JavaScriptCore.mmp
===================================================================
--- JavaScriptCore/group/JavaScriptCore.mmp (revision 20093)
+++ JavaScriptCore/group/JavaScriptCore.mmp (working copy)
@@ -20,7 +20,7 @@
#if defined(__BROWSER_SDK)
TARGET JavaScriptCore_sdk.DLL
#else
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
TARGET JavaScriptCore.DLL
#endif
TARGETTYPE dll
Index: JavaScriptCore/group/bld.inf
===================================================================
--- JavaScriptCore/group/bld.inf (revision 20093)
+++ JavaScriptCore/group/bld.inf (working copy)
@@ -22,6 +22,25 @@ PRJ_PLATFORMS
DEFAULT
PRJ_EXPORTS
+
+
+#ifndef __BROWSER_SDK
+#include <domain/osextensions/platform_paths.hrh>
+..\kjs\internal.h MW_LAYER_SDK_EXPORT_PATH(javascriptcore\internal.h)
+..\kjs\interpreter.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\interpreter.h)
+..\kjs\object.h MW_LAYER_SDK_EXPORT_PATH(javascriptcore\object.h)
+..\kjs\protect.h MW_LAYER_SDK_EXPORT_PATH(javascriptcore\protect.h)
+..\kjs\stdint.h MW_LAYER_SDK_EXPORT_PATH(javascriptcore\stdint.h)
+
+..\bindings\npruntime.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\npruntime.h)
+..\bindings\npruntime_impl.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\npruntime_impl.h)
+..\bindings\npruntime_priv.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\npruntime_priv.h)
+..\bindings\runtime.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\runtime.h)
+..\bindings\runtime_object.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\runtime_object.h)
+..\bindings\runtime_root.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\runtime_root.h)
+..\bindings\NP_jsobject.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\NP_jsobject.h)
+..\bindings\c\c_utility.h
MW_LAYER_SDK_EXPORT_PATH(javascriptcore\c_utility.h)
+#else
..\kjs\internal.h \epoc32\include\oem\javascriptcore\internal.h
..\kjs\interpreter.h \epoc32\include\oem\javascriptcore\interpreter.h
..\kjs\object.h \epoc32\include\oem\javascriptcore\object.h
@@ -36,6 +55,9 @@ PRJ_EXPORTS
..\bindings\runtime_root.h
\epoc32\include\oem\javascriptcore\runtime_root.h
..\bindings\NP_jsobject.h
\epoc32\include\oem\javascriptcore\NP_jsobject.h
..\bindings\c\c_utility.h
\epoc32\include\oem\javascriptcore\c_utility.h
+#endif //#ifndef __BROWSER_SDK
+
+
PRJ_MMPFILES
pcre.mmp
JavaScriptCore.mmp
Index: JavaScriptCore/group/kjstest.mmp
===================================================================
--- JavaScriptCore/group/kjstest.mmp (revision 20093)
+++ JavaScriptCore/group/kjstest.mmp (working copy)
@@ -18,7 +18,7 @@
*
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET kjstest.exe
TARGETTYPE exe
Index: JavaScriptCore/group/pcre.mmp
===================================================================
--- JavaScriptCore/group/pcre.mmp (revision 20093)
+++ JavaScriptCore/group/pcre.mmp (working copy)
@@ -18,7 +18,7 @@
*
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET pcre.lib
TARGETTYPE lib
Index: JavaScriptCore/group/pcretest.mmp
===================================================================
--- JavaScriptCore/group/pcretest.mmp (revision 20093)
+++ JavaScriptCore/group/pcretest.mmp (working copy)
@@ -24,7 +24,14 @@ UID 0
#include "defs.mmpi"
-SYSTEMINCLUDE \epoc32\include\libc \epoc32\include
+#ifndef __BROWSER_SDK
+#include <domain/osextensions/platform_paths.hrh>
+MW_LAYER_SYSTEMINCLUDE
+#else
+SYSTEMINCLUDE \epoc32\include
+#endif __BROWSER_SDK
+
+SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE ..\pcre ..\kjs
SOURCEPATH ..\pcre
SOURCE pcretest.c
Index: MemoryManager/ChangeLog
===================================================================
--- MemoryManager/ChangeLog (revision 20093)
+++ MemoryManager/ChangeLog (working copy)
@@ -1,3 +1,13 @@
+2007-03-09 borges <mario.g.borges at nokia.com>
+
+ reviewed by Bradley
+
+ DESC: related with task 14594 for S60 build feature work
+ http://bugs.webkit.org/show_bug.cgi?id=13027
+
+ * Group/MemMan.mmp:
+ * Group/MemManTest.mmp:
+
2007-01-09 spadma <Sachin.Padma at nokia.com>
Reviewed by Yongjun.
Index: MemoryManager/Group/MemMan.mmp
===================================================================
--- MemoryManager/Group/MemMan.mmp (revision 20093)
+++ MemoryManager/Group/MemMan.mmp (working copy)
@@ -41,7 +41,7 @@
#if defined(__BROWSER_SDK)
TARGET MemMan_sdk.dll
#else
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
TARGET MemMan.dll
#endif
Index: MemoryManager/Group/MemManTest.mmp
===================================================================
--- MemoryManager/Group/MemManTest.mmp (revision 20093)
+++ MemoryManager/Group/MemManTest.mmp (working copy)
@@ -39,7 +39,7 @@
*
==============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET MemManTest.exe
TARGETTYPE exe
Index: WebCore/ChangeLog
===================================================================
--- WebCore/ChangeLog (revision 20093)
+++ WebCore/ChangeLog (working copy)
@@ -1,3 +1,16 @@
+2007-03-09 borges <mario.g.borges at nokia.com>
+
+ reviewed by Bradley
+
+ DESC: related with task 14594 for S60 build feature work
+ http://bugs.webkit.org/show_bug.cgi?id=13027
+
+ WARNING: NO TEST CASES ADDED OR CHANGED
+
+ * group/KHTML.mmp:
+ * group/KWQ.mmp:
+ * group/WebCore.mmp:
+
vbradley, reviewed by Zalan
DESC: [S60] MLIO-6YCACU: Browser freeze and panic in
symbianoggplay.sourceforge.com
http://bugs.webkit.org/show_bug.cgi?id=12831
Index: WebCore/group/KHTML.mmp
===================================================================
--- WebCore/group/KHTML.mmp (revision 20093)
+++ WebCore/group/KHTML.mmp (working copy)
@@ -10,7 +10,7 @@
* ============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET KHTML.lib
TARGETTYPE lib
Index: WebCore/group/KWQ.mmp
===================================================================
--- WebCore/group/KWQ.mmp (revision 20093)
+++ WebCore/group/KWQ.mmp (working copy)
@@ -10,7 +10,7 @@
* ============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET KWQ.lib
Index: WebCore/group/WebCore.mmp
===================================================================
--- WebCore/group/WebCore.mmp (revision 20093)
+++ WebCore/group/WebCore.mmp (working copy)
@@ -12,7 +12,7 @@
#if defined(__BROWSER_SDK)
TARGET WebCore_sdk.dll
#else
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
TARGET WebCore.dll
#endif
TARGETTYPE dll
Index: WebKit/ChangeLog
===================================================================
--- WebKit/ChangeLog (revision 20093)
+++ WebKit/ChangeLog (working copy)
@@ -1,3 +1,20 @@
+2007-03-09 borges <mario.g.borges at nokia.com>
+
+ reviewed by Bradley
+
+ DESC: related with task 14594 for S60 build feature work
+ http://bugs.webkit.org/show_bug.cgi?id=13027
+
+ * group/BrowserCache.mmp:
+ * group/BrowserRec.mmp:
+ * group/BrowserView.mmp:
+ * group/Plugin.mmp:
+ * group/ResLoaderTest.mmp:
+ * group/bld.inf:
+ * group/renderer.mmpi:
+ * group/resloader.mmp:
+ * group/webkit.mmp:
+
yinxcai, reviewed by Yongjun
DESC: Browser: page info not shown correctly after going back to secure page
HMNN-6YNH7J
http://bugs.webkit.org/show_bug.cgi?id=12989
Index: WebKit/group/BrowserCache.mmp
===================================================================
--- WebKit/group/BrowserCache.mmp (revision 20093)
+++ WebKit/group/BrowserCache.mmp (working copy)
@@ -41,7 +41,7 @@
#if defined(__BROWSER_SDK)
TARGET BrowserCache_sdk.dll
#else
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
TARGET BrowserCache.dll
#endif
TARGETTYPE dll
Index: WebKit/group/BrowserRec.mmp
===================================================================
--- WebKit/group/BrowserRec.mmp (revision 20093)
+++ WebKit/group/BrowserRec.mmp (working copy)
@@ -41,7 +41,7 @@
#if defined(__BROWSER_SDK)
TARGET BrowserRec_sdk.DLL
#else
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
TARGET BrowserRec.DLL
#endif
Index: WebKit/group/BrowserView.mmp
===================================================================
--- WebKit/group/BrowserView.mmp (revision 20093)
+++ WebKit/group/BrowserView.mmp (working copy)
@@ -39,7 +39,7 @@
*
==============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET browserview.lib
@@ -101,7 +101,7 @@ USERINCLUDE ..\..\..\ToolBar\inc
#endif
#ifndef __BROWSER_SDK
-MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
#else
SYSTEMINCLUDE \epoc32\include \epoc32\include\oem
#endif
Index: WebKit/group/Plugin.mmp
===================================================================
--- WebKit/group/Plugin.mmp (revision 20093)
+++ WebKit/group/Plugin.mmp (working copy)
@@ -38,7 +38,7 @@
*
==============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET Plugin.lib
TARGETTYPE lib
@@ -68,7 +68,7 @@ USERINCLUDE ..\..\WEBCORE\bridge
SYSTEMINCLUDE ..\..\MemoryManager\Inc
#ifndef __BROWSER_SDK
-MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
#else
SYSTEMINCLUDE \epoc32\include \epoc32\include\oem
#endif
Index: WebKit/group/ResLoaderTest.mmp
===================================================================
--- WebKit/group/ResLoaderTest.mmp (revision 20093)
+++ WebKit/group/ResLoaderTest.mmp (working copy)
@@ -39,7 +39,7 @@
*
==============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET ResLoaderTest.app
TARGETTYPE app
Index: WebKit/group/bld.inf
===================================================================
--- WebKit/group/bld.inf (revision 20093)
+++ WebKit/group/bld.inf (working copy)
@@ -39,7 +39,7 @@
*
==============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
PRJ_PLATFORMS
@@ -66,7 +66,7 @@ PRJ_EXPORTS
..\Plugin\inc\prcpucfg.h MW_LAYER_SDK_EXPORT_PATH(prcpucfg.h)
..\Plugin\inc\prtypes.h MW_LAYER_SDK_EXPORT_PATH(prtypes.h)
..\Plugin\inc\PluginAdapterInterface.h
MW_LAYER_SDK_EXPORT_PATH(PluginAdapterInterface.h)
-..\Plugin\inc\obsolete\protypes.h \epoc32\include\obsolete\protypes.h
+..\Plugin\inc\obsolete\protypes.h
MW_LAYER_SDK_EXPORT_PATH(obsolete\protypes.h)
..\Plugin\inc\BrowserPluginInterface.h
MW_LAYER_SDK_EXPORT_PATH(BrowserPluginInterface.h)
..\Plugin\inc\CEcomBrowserPluginInterface.h
MW_LAYER_SDK_EXPORT_PATH(CEcomBrowserPluginInterface.h)
Index: WebKit/group/renderer.mmpi
===================================================================
--- WebKit/group/renderer.mmpi (revision 20093)
+++ WebKit/group/renderer.mmpi (working copy)
@@ -39,7 +39,7 @@
*
==============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
MACRO __OOM__
Index: WebKit/group/resloader.mmp
===================================================================
--- WebKit/group/resloader.mmp (revision 20093)
+++ WebKit/group/resloader.mmp (working copy)
@@ -40,7 +40,7 @@
*
==============================================================================
*/
#ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
#endif
TARGET ResLoader.lib
@@ -126,7 +126,7 @@ SYSTEMINCLUDE ..\..\MemoryManager\Inc
#ifndef __BROWSER_SDK
SYSTEMINCLUDE ..\..\..\..\HttpFilters\HTTPFilterAcceptHeader
SYSTEMINCLUDE ..\..\..\..\HttpFilters\HTTPFilterAcceptHeader\inc
-MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
#else
SYSTEMINCLUDE \epoc32\include \epoc32\include\oem
#endif
Index: WebKit/group/webkit.mmp
===================================================================
--- WebKit/group/webkit.mmp (revision 20093)
+++ WebKit/group/webkit.mmp (working copy)
@@ -41,7 +41,7 @@
#if defined(__BROWSER_SDK)
TARGET browserengine_sdk.dll
#else
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
TARGET browserengine.dll
#endif
TARGETTYPE dll
@@ -109,7 +109,7 @@ USERINCLUDE ..\BrowserCore\Misc\Inc
USERINCLUDE ..\..\..\..\inc
USERINCLUDE ..\..\..\PageScaler\inc
USERINCLUDE ..\..\..\HistoryProvider\inc
-MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
USERINCLUDE ..\..\..\ToolBar\inc
#else
SYSTEMINCLUDE \Epoc32\include \Epoc32\include\oem
--
Configure bugmail: http://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
More information about the webkit-unassigned
mailing list