Changeset 80906 in webkit

Timestamp:

Mar 11, 2011 5:05:44 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-03-11 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Eric Seidel.

Introduce project_dir variable and make paths a whole lot saner. Ok, a little bit saner.
​https://bugs.webkit.org/show_bug.cgi?id=56231

• JavaScriptCore.gypi: Added project_dir variable.
• gyp/JavaScriptCore.gyp: Changed to use project_dir, rather than DEPTH/JavaScriptCore.
• gyp/generate-dtrace-header.sh: Changed to use project_dir.

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-11  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Introduce project_dir variable and make paths a whole lot saner. Ok, a little bit saner.
+        https://bugs.webkit.org/show_bug.cgi?id=56231
+
+        * JavaScriptCore.gypi: Added project_dir variable.
+        * gyp/JavaScriptCore.gyp: Changed to use project_dir, rather than DEPTH/JavaScriptCore.
+        * gyp/generate-dtrace-header.sh: Changed to use project_dir.
+
 2011-03-11  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/JavaScriptCore/JavaScriptCore.gypi

@@ -1 +1 @@
 {
     'variables': {
+        'project_dir': [ '<(DEPTH)/JavaScriptCore' ],
         # These headers are part of JavaScriptCore's public API in the Apple Mac build.
         'javascriptcore_publicheader_files': [

trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

@@ -4 +4 @@
     '../JavaScriptCore.gypi',
   ],
-  'xcode_config_file': '<(DEPTH)/JavaScriptCore/Configurations/DebugRelease.xcconfig',
+  'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
   'variables': {
     # FIXME: We should use a header map instead of listing these explicitly.
     'javascriptcore_include_dirs': [
       '<(DEPTH)', # Some paths in API include JavaScriptCore/
-      '<(DEPTH)/JavaScriptCore',
-      '<(DEPTH)/JavaScriptCore/ForwardingHeaders',
-      '<(DEPTH)/JavaScriptCore/API',
-      '<(DEPTH)/JavaScriptCore/assembler',
-      '<(DEPTH)/JavaScriptCore/collector/handles',
-      '<(DEPTH)/JavaScriptCore/bytecode',
-      '<(DEPTH)/JavaScriptCore/bytecompiler',
-      '<(DEPTH)/JavaScriptCore/debugger',
-      '<(DEPTH)/JavaScriptCore/icu',
-      '<(DEPTH)/JavaScriptCore/interpreter',
-      '<(DEPTH)/JavaScriptCore/jit',
-      '<(DEPTH)/JavaScriptCore/parser',
-      '<(DEPTH)/JavaScriptCore/profiler',
-      '<(DEPTH)/JavaScriptCore/runtime',
-      '<(DEPTH)/JavaScriptCore/wtf',
-      '<(DEPTH)/JavaScriptCore/wtf/unicode',
-      '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore',
+      '<(project_dir)',
+      '<(project_dir)/ForwardingHeaders',
+      '<(project_dir)/API',
+      '<(project_dir)/assembler',
+      '<(project_dir)/collector/handles',
+      '<(project_dir)/bytecode',
+      '<(project_dir)/bytecompiler',
+      '<(project_dir)/debugger',
+      '<(project_dir)/icu',
+      '<(project_dir)/interpreter',
+      '<(project_dir)/jit',
+      '<(project_dir)/parser',
+      '<(project_dir)/profiler',
+      '<(project_dir)/runtime',
+      '<(project_dir)/wtf',
+      '<(project_dir)/wtf/unicode',
+      '<(SHARED_INTERMEDIATE_DIR)',
     ],
     'derived_source_files': [
@@ -70 +70 @@
         '<@(javascriptcore_privateheader_files)',
       ],
-      'xcode_config_file': '<(DEPTH)/JavaScriptCore/Configurations/JavaScriptCore.xcconfig',
+      'xcode_config_file': '<(project_dir)/Configurations/JavaScriptCore.xcconfig',
       'sources/': [
         ['exclude', 'qt'],
@@ -120 +120 @@
             # FIXME: Remove these overrides once JavaScriptCore.xcconfig is
             # used only by this project.
-            'GCC_PREFIX_HEADER': '<(DEPTH)/JavaScriptCore/JavaScriptCorePrefix.h',
-            'INFOPLIST_FILE': '<(DEPTH)/JavaScriptCore/Info.plist',
+            'GCC_PREFIX_HEADER': '<(project_dir)/JavaScriptCorePrefix.h',
+            'INFOPLIST_FILE': '<(project_dir)/Info.plist',
             # This setting mirrors the setting in Base.xcconfig, with
             # one difference noted below.
@@ -166 +166 @@
            'outputs': [],
            'action': [
-             'sh', '<(DEPTH)/JavaScriptCore/gyp/generate-dtrace-header.sh', '<(SHARED_INTERMEDIATE_DIR)'
+             'sh', '<(project_dir)/gyp/generate-dtrace-header.sh', '<(project_dir)', '<(SHARED_INTERMEDIATE_DIR)'
             ]
         }
@@ -179 +179 @@
          'outputs': [],
          'action': [
-           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/JavaScriptCore/Info.plist'
+           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
           ]
       }],

trunk/Source/JavaScriptCore/gyp/generate-dtrace-header.sh

@@ -1 +1 @@
 #!/bin/sh
 
-TRACING_D="${SRCROOT}/../runtime/Tracing.d";
-TRACING_H="$1/TracingDtrace.h";
+TRACING_D="$1/runtime/Tracing.d";
+TRACING_H="$2/TracingDtrace.h";
 
 if [[ "${HAVE_DTRACE}" = "1" && "${TRACING_D}" -nt "${TRACING_H}" ]]; then