Commit f34e21fe authored by dglazkov@chromium.org's avatar dglazkov@chromium.org

2011-03-11 Dimitri Glazkov <dglazkov@chromium.org>

        Reviewed by Adam Barth.

        Start using derived sources correctly and link minidom with JavaScriptCore gyp project.
        https://bugs.webkit.org/show_bug.cgi?id=56217

        * gyp/JavaScriptCore.gyp: Added derived source files and passing of shared directory
            to the scripts.
        * gyp/generate-derived-sources.sh: Changed to use passed directory.
        * gyp/generate-dtrace-header.sh: Ditto.

git-svn-id: svn://svn.chromium.org/blink/trunk@80882 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ab05d7a5
2011-03-11 Dimitri Glazkov <dglazkov@chromium.org>
Reviewed by Adam Barth.
Start using derived sources correctly and link minidom with JavaScriptCore gyp project.
https://bugs.webkit.org/show_bug.cgi?id=56217
* gyp/JavaScriptCore.gyp: Added derived source files and passing of shared directory
to the scripts.
* gyp/generate-derived-sources.sh: Changed to use passed directory.
* gyp/generate-dtrace-header.sh: Ditto.
2011-03-11 Eric Carlson <eric.carlson@apple.com> 2011-03-11 Eric Carlson <eric.carlson@apple.com>
Reviewed by Sam Weinig. Reviewed by Sam Weinig.
......
...@@ -26,6 +26,21 @@ ...@@ -26,6 +26,21 @@
'<(DEPTH)/JavaScriptCore/wtf/unicode', '<(DEPTH)/JavaScriptCore/wtf/unicode',
'<(PRODUCT_DIR)/DerivedSources/JavaScriptCore', '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore',
], ],
'derived_source_files': [
'<(SHARED_INTERMEDIATE_DIR)/ArrayPrototype.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/DatePrototype.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/HeaderDetection.h',
'<(SHARED_INTERMEDIATE_DIR)/JSONObject.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/Lexer.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/MathObject.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/NumberConstructor.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/RegExpConstructor.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/RegExpJitTables.h',
'<(SHARED_INTERMEDIATE_DIR)/RegExpObject.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/StringPrototype.lut.h',
'<(SHARED_INTERMEDIATE_DIR)/TracingDtrace.h',
'<(SHARED_INTERMEDIATE_DIR)/ObjectConstructor.lut.h',
],
}, },
'targets': [ 'targets': [
{ {
...@@ -42,6 +57,7 @@ ...@@ -42,6 +57,7 @@
'<@(javascriptcore_files)', '<@(javascriptcore_files)',
'<@(javascriptcore_publicheader_files)', '<@(javascriptcore_publicheader_files)',
'<@(javascriptcore_privateheader_files)', '<@(javascriptcore_privateheader_files)',
'<@(derived_source_files)',
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework', '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
'/usr/lib/libicucore.dylib', '/usr/lib/libicucore.dylib',
...@@ -137,9 +153,11 @@ ...@@ -137,9 +153,11 @@
{ {
'action_name': 'Generate Derived Sources', 'action_name': 'Generate Derived Sources',
'inputs': [], 'inputs': [],
'outputs': [], 'outputs': [
'<@(derived_source_files)',
],
'action': [ 'action': [
'sh', 'generate-derived-sources.sh', 'sh', 'generate-derived-sources.sh', '<(SHARED_INTERMEDIATE_DIR)'
], ],
}, },
{ {
...@@ -147,7 +165,7 @@ ...@@ -147,7 +165,7 @@
'inputs': [], 'inputs': [],
'outputs': [], 'outputs': [],
'action': [ 'action': [
'sh', '<(DEPTH)/JavaScriptCore/gyp/generate-dtrace-header.sh' 'sh', '<(DEPTH)/JavaScriptCore/gyp/generate-dtrace-header.sh', '<(SHARED_INTERMEDIATE_DIR)'
] ]
} }
], ],
......
#!/bin/sh #!/bin/sh
mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore/docs" mkdir -p "$1/docs"
cd "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" cd "$1"
/bin/ln -sfh "${SRCROOT}/.." JavaScriptCore /bin/ln -sfh "${SRCROOT}/.." JavaScriptCore
export JavaScriptCore="JavaScriptCore" export JavaScriptCore="JavaScriptCore"
......
#!/bin/sh #!/bin/sh
TRACING_D="${SRCROOT}/runtime/Tracing.d"; TRACING_D="${SRCROOT}/../runtime/Tracing.d";
TRACING_H="${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore/TracingDtrace.h"; TRACING_H="$1/TracingDtrace.h";
if [[ "${HAVE_DTRACE}" = "1" && "${TRACING_D}" -nt "${TRACING_H}" ]]; then if [[ "${HAVE_DTRACE}" = "1" && "${TRACING_D}" -nt "${TRACING_H}" ]]; then
dtrace -h -o "${TRACING_H}" -s "${TRACING_D}"; dtrace -h -o "${TRACING_H}" -s "${TRACING_D}";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment