Changeset 80865 in webkit

Timestamp:

Mar 11, 2011 11:11:29 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-03-11 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Adam Barth.

Tweak dylib paths and add dtrace header generation action to JavaScriptCore gyp project.
​https://bugs.webkit.org/show_bug.cgi?id=56207

• JavaScriptCore.gypi: Added Tracing.d to the sources.
• gyp/generate-dtrace-header.sh: Added.
• gyp/JavaScriptCore.gyp: Updated dylib paths (now the project can see them),

and added DTrace header generating step.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.gypi (modified) (1 diff)
• gyp/JavaScriptCore.gyp (modified) (3 diffs)
• gyp/generate-dtrace-header.sh (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-11  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Tweak dylib paths and add dtrace header generation action to JavaScriptCore gyp project.
+        https://bugs.webkit.org/show_bug.cgi?id=56207
+
+        * JavaScriptCore.gypi: Added Tracing.d to the sources.
+        * gyp/generate-dtrace-header.sh: Added.
+        * gyp/JavaScriptCore.gyp: Updated dylib paths (now the project can see them),
+            and added DTrace header generating step.
+
 2011-03-10  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.gypi

@@ -540 +540 @@
             'runtime/TimeoutChecker.cpp',
             'runtime/Tracing.h',
+            'runtime/Tracing.d',
             'runtime/UString.cpp',
             'runtime/UStringConcatenate.h',

trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

@@ -45 +45 @@
         '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
         '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-        'libicucore.dylib',
-        'libobjc.dylib',
+        '/usr/lib/libicucore.dylib',
+        '/usr/lib/libobjc.dylib',
       ],
       'mac_framework_headers': [
@@ -134 +134 @@
       'target_name': 'Derived Sources',
       'type': 'none',
-      'actions': [{
-        'action_name': 'Generate Derived Sources',
-        'inputs': [],
-        'outputs': [],
-        'action': [
-          'sh', 'generate-derived-sources.sh',
-        ],
-      }],
+      'actions': [
+        {
+          'action_name': 'Generate Derived Sources',
+          'inputs': [],
+          'outputs': [],
+          'action': [
+            'sh', 'generate-derived-sources.sh',
+          ],
+        },
+        {
+          'action_name': 'Generate DTrace Header',
+          'inputs': [],
+           'outputs': [],
+           'action': [
+             'sh', '<(DEPTH)/JavaScriptCore/gyp/generate-dtrace-header.sh'
+            ]
+        }
+      ],
     },
     {
@@ -210 +220 @@
         '<@(jsc_files)',
         '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
-        'libedit.dylib',
+        '/usr/lib/libedit.dylib',
       ],
     },