Changeset 20117 for S60/trunk/JavaScriptCore

Timestamp:

03/12/07 09:47:43 (22 months ago)

Author:

brmorris

Message:

borges, reviewed by Bradley

DESC: related with task 14594 for S60 build feature work
http://bugs.webkit.org/show_bug.cgi?id=13027

Location:

S60/trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• group/JavaScriptCore.mmp (modified) (1 diff)
• group/bld.inf (modified) (2 diffs)
• group/kjstest.mmp (modified) (1 diff)
• group/pcre.mmp (modified) (1 diff)
• group/pcretest.mmp (modified) (1 diff)

S60/trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-03-09   borges   <mario.g.borges@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

S60/trunk/JavaScriptCore/group/JavaScriptCore.mmp

@@ -21 +21 @@
 TARGET      JavaScriptCore_sdk.DLL
 #else
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
 TARGET      JavaScriptCore.DLL
 #endif

S60/trunk/JavaScriptCore/group/bld.inf

@@ -23 +23 @@
 
 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
@@ -37 +56 @@
 ..\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

S60/trunk/JavaScriptCore/group/kjstest.mmp

@@ -19 +19 @@
  */
 #ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
 #endif
 TARGET     kjstest.exe

S60/trunk/JavaScriptCore/group/pcre.mmp

@@ -19 +19 @@
  */
 #ifndef __BROWSER_SDK
-#include <domain\osextensions\platform_paths.hrh>
+#include <domain/osextensions/platform_paths.hrh>
 #endif
 TARGET          pcre.lib

S60/trunk/JavaScriptCore/group/pcretest.mmp

@@ -25 +25 @@
 #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