+2011-02-28 Adam Barth <abarth@webkit.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Teach JavaScriptGlue gyp build about DEPTH
+ https://bugs.webkit.org/show_bug.cgi?id=55421
+
+ Moves the previously JavaScriptGlue-specific GYP helper shell scripts
+ to the gyp directory in Source, where they can be shared by multiple
+ frameworks.
+
+ * Source/gyp: Added.
+ * Source/gyp/remove-headers-if-needed.sh: Copied from Source/JavaScriptGlue/gyp/remove-headers-if-needed.sh.
+ * Source/gyp/run-if-exists.sh: Copied from Source/JavaScriptGlue/gyp/run-if-exists.sh.
+ * Source/gyp/update-info-plist.sh: Copied from Source/JavaScriptGlue/gyp/update-info-plist.sh.
+
2011-02-28 Benjamin Poulain <benjamin.poulain@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
* ForwardingHeaders/wtf/HashTable.h: Added.
+2011-02-28 Adam Barth <abarth@webkit.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Teach JavaScriptGlue gyp build about DEPTH
+ https://bugs.webkit.org/show_bug.cgi?id=55421
+
+ After this path, we should set DEPTH to the Source directory, which is
+ a common point for all the frameworks that make up WebKit. These
+ changes to the GYP teach JavaScriptGlue how to find various files based
+ on DEPTH rather than based on the location of the xcodeproj file.
+
+ * gyp/JavaScriptGlue.gyp:
+ * gyp/remove-headers-if-needed.sh: Removed.
+ * gyp/run-if-exists.sh: Removed.
+ * gyp/update-info-plist.sh: Removed.
+
2011-02-28 Adam Barth <abarth@webkit.org>
Reviewed by Dimitri Glazkov.
'includes': [
'JavaScriptGlue.gypi',
],
- 'xcode_config_file': '../Configurations/DebugRelease.xcconfig',
+ 'xcode_config_file': '<(DEPTH)/JavaScriptGlue/Configurations/DebugRelease.xcconfig',
'targets': [
{
'target_name': 'JavaScriptGlue',
'Update Version'
],
'include_dirs': [
- '..',
- '../ForwardingHeaders',
- '../icu',
+ '<(DEPTH)/JavaScriptGlue',
+ '<(DEPTH)/JavaScriptGlue/ForwardingHeaders',
+ '<(DEPTH)/JavaScriptGlue/icu',
'<(PRODUCT_DIR)/include',
],
'sources': [
{
'postbuild_name': 'Check For Global Initializers',
'action': [
- 'sh', 'run-if-exists.sh', 'check-for-global-initializers'
+ 'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'
],
},
{
'postbuild_name': 'Check For Weak VTables and Externals',
'action': [
- 'sh', 'run-if-exists.sh', 'check-for-weak-vtables-and-externals'
+ 'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'
],
},
{
'postbuild_name': 'Remove Headers If Needed',
'action': [
- 'sh', 'remove-headers-if-needed.sh'
+ 'sh', '<(DEPTH)/gyp/remove-headers-if-needed.sh'
],
},
],
'conditions': [
['OS=="mac"', {
'mac_bundle': 1,
+ 'xcode_settings': {
+ # FIXME: Remove these overrides once JavaScriptGlue.xcconfig is
+ # used only by this project.
+ 'INFOPLIST_FILE': '<(DEPTH)/JavaScriptGlue/Info.plist',
+ 'EXPORTED_SYMBOLS_FILE': '<(DEPTH)/JavaScriptGlue/JavaScriptGlue.exp',
+ },
}],
],
},
'inputs': [],
'outputs': [],
'action': [
- 'sh', 'update-info-plist.sh'
+ 'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/JavaScriptGlue/Info.plist'
],
},
], # actions