Changeset 81693 in webkit


Ignore:
Timestamp:
Mar 22, 2011 2:02:44 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-03-22 Adam Barth <abarth@webkit.org>

Reviewed by Eric Seidel.

GYP build of JavaScriptCore should be able to link from an empty WebKitBuild directory
https://bugs.webkit.org/show_bug.cgi?id=56803

Previously, we thought we should generate the derived source files in
the shared intermediate build products directory, but there are
assumptions built into other parts of the Mac build system that the
derived source files will be generated in a particular subdirectory of
the build products directory.

This patch is a partial revert of the change that moved the derived
source files to the shared intermediate directory. After this patch,
the GYP build can build JavaScriptCore without help from the main
normal build system.

  • JavaScriptCore.gypi:
  • gyp/JavaScriptCore.gyp:
  • gyp/generate-derived-sources.sh:
  • gyp/generate-dtrace-header.sh:
Location:
trunk/Source/JavaScriptCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r81686 r81693  
     12011-03-22  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        GYP build of JavaScriptCore should be able to link from an empty WebKitBuild directory
     6        https://bugs.webkit.org/show_bug.cgi?id=56803
     7
     8        Previously, we thought we should generate the derived source files in
     9        the shared intermediate build products directory, but there are
     10        assumptions built into other parts of the Mac build system that the
     11        derived source files will be generated in a particular subdirectory of
     12        the build products directory.
     13
     14        This patch is a partial revert of the change that moved the derived
     15        source files to the shared intermediate directory.  After this patch,
     16        the GYP build can build JavaScriptCore without help from the main
     17        normal build system.
     18
     19        * JavaScriptCore.gypi:
     20        * gyp/JavaScriptCore.gyp:
     21        * gyp/generate-derived-sources.sh:
     22        * gyp/generate-dtrace-header.sh:
     23
    1242011-03-22  Jay Civelli  <jcivelli@chromium.org>
    225
  • trunk/Source/JavaScriptCore/JavaScriptCore.gypi

    r81655 r81693  
    690690            'os-win32/stdint.h',
    691691        ],
     692        'javascriptcore_derived_source_files': [
     693            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/ArrayPrototype.lut.h',
     694            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/DatePrototype.lut.h',
     695            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/HeaderDetection.h',
     696            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/JSONObject.lut.h',
     697            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/Lexer.lut.h',
     698            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/MathObject.lut.h',
     699            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/NumberConstructor.lut.h',
     700            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/RegExpConstructor.lut.h',
     701            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/RegExpJitTables.h',
     702            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/RegExpObject.lut.h',
     703            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/StringPrototype.lut.h',
     704            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/TracingDtrace.h',
     705            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/ObjectConstructor.lut.h',
     706        ],
    692707        'minidom_files': [
    693708            'API/tests/JSNode.c',
  • trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

    r81655 r81693  
    2929      '<(project_dir)/icu',
    3030    ],
    31     'derived_source_files': [
    32       '<(SHARED_INTERMEDIATE_DIR)/ArrayPrototype.lut.h',
    33       '<(SHARED_INTERMEDIATE_DIR)/DatePrototype.lut.h',
    34       '<(SHARED_INTERMEDIATE_DIR)/HeaderDetection.h',
    35       '<(SHARED_INTERMEDIATE_DIR)/JSONObject.lut.h',
    36       '<(SHARED_INTERMEDIATE_DIR)/Lexer.lut.h',
    37       '<(SHARED_INTERMEDIATE_DIR)/MathObject.lut.h',
    38       '<(SHARED_INTERMEDIATE_DIR)/NumberConstructor.lut.h',
    39       '<(SHARED_INTERMEDIATE_DIR)/RegExpConstructor.lut.h',
    40       '<(SHARED_INTERMEDIATE_DIR)/RegExpJitTables.h',
    41       '<(SHARED_INTERMEDIATE_DIR)/RegExpObject.lut.h',
    42       '<(SHARED_INTERMEDIATE_DIR)/StringPrototype.lut.h',
    43       '<(SHARED_INTERMEDIATE_DIR)/TracingDtrace.h',
    44       '<(SHARED_INTERMEDIATE_DIR)/ObjectConstructor.lut.h',
    45     ],
    4631  },
    4732  'targets': [
     
    5540      'include_dirs': [
    5641        '<@(javascriptcore_include_dirs)',
    57         '<(SHARED_INTERMEDIATE_DIR)',
     42        '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore',
    5843      ],
    5944      'sources': [
     
    6146        '<@(javascriptcore_publicheader_files)',
    6247        '<@(javascriptcore_privateheader_files)',
    63         '<@(derived_source_files)',
     48        '<@(javascriptcore_derived_source_files)',
    6449        '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
    6550        '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
     
    136121          'inputs': [],
    137122          'outputs': [
    138             '<@(derived_source_files)',
    139           ],
    140           'action': [
    141             'sh', 'generate-derived-sources.sh', '<(SHARED_INTERMEDIATE_DIR)'
     123            '<@(javascriptcore_derived_source_files)',
     124          ],
     125          'action': [
     126            'sh', 'generate-derived-sources.sh'
    142127          ],
    143128        },
     
    147132           'outputs': [],
    148133           'action': [
    149              'sh', '<(project_dir)/gyp/generate-dtrace-header.sh', '<(project_dir)', '<(SHARED_INTERMEDIATE_DIR)'
     134             'sh', '<(project_dir)/gyp/generate-dtrace-header.sh', '<(project_dir)'
    150135            ]
    151136        }
  • trunk/Source/JavaScriptCore/gyp/generate-derived-sources.sh

    r80882 r81693  
    11#!/bin/sh
    22
    3 mkdir -p "$1/docs"
    4 cd "$1"
     3mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore/docs"
     4cd "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore"
    55
    66/bin/ln -sfh "${SRCROOT}/.." JavaScriptCore
  • trunk/Source/JavaScriptCore/gyp/generate-dtrace-header.sh

    r80906 r81693  
    22
    33TRACING_D="$1/runtime/Tracing.d";
    4 TRACING_H="$2/TracingDtrace.h";
     4TRACING_H="$BUILT_PRODUCTS_DIR/DerivedSources/JavaScriptCore/TracingDtrace.h";
    55
    66if [[ "${HAVE_DTRACE}" = "1" && "${TRACING_D}" -nt "${TRACING_H}" ]]; then
Note: See TracChangeset for help on using the changeset viewer.