Changeset 79970 in webkit

Timestamp:

Feb 28, 2011 11:06:12 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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 Gavin Barraclough <​barraclough@apple.com>

Reviewed by Sam Weinig & Darin Adler.

Bug 55423 - Clean up property tables in Structure

Encapsulate, reduce duplication of table search code,
and reduce the size of the tables (remove the index,
just maintain the tables in the correct order).

Shows a 0.5% - 1% progression on sunspider.

• ForwardingHeaders/wtf/HashTable.h: Added.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptGlue/ChangeLog (modified) (1 diff)
• Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp (modified) (7 diffs)
• Source/gyp (added)
• Source/gyp/remove-headers-if-needed.sh (moved) (moved from trunk/Source/JavaScriptGlue/gyp/remove-headers-if-needed.sh)
• Source/gyp/run-if-exists.sh (moved) (moved from trunk/Source/JavaScriptGlue/gyp/run-if-exists.sh) (1 diff)
• Source/gyp/update-info-plist.sh (moved) (moved from trunk/Source/JavaScriptGlue/gyp/update-info-plist.sh) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/JavaScriptGlue/ChangeLog

@@ -12 +12 @@
 
         * 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>

trunk/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp

@@ -3 +3 @@
     'JavaScriptGlue.gypi',
   ],
-  'xcode_config_file': '../Configurations/DebugRelease.xcconfig',
+  'xcode_config_file': '<(DEPTH)/JavaScriptGlue/Configurations/DebugRelease.xcconfig',
   'targets': [
     {
@@ -12 +12 @@
       ],
       'include_dirs': [
-        '..',
-        '../ForwardingHeaders',
-        '../icu',
+        '<(DEPTH)/JavaScriptGlue',
+        '<(DEPTH)/JavaScriptGlue/ForwardingHeaders',
+        '<(DEPTH)/JavaScriptGlue/icu',
         '<(PRODUCT_DIR)/include',
       ],
@@ -36 +36 @@
           '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'
           ],
         },
@@ -42 +42 @@
           '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'
           ],
         },
@@ -48 +48 @@
           'postbuild_name': 'Remove Headers If Needed',
           'action': [
-            'sh', 'remove-headers-if-needed.sh'
+            'sh', '<(DEPTH)/gyp/remove-headers-if-needed.sh'
           ],
         },
@@ -55 +55 @@
         ['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', 
+          },
         }],
       ],
@@ -67 +73 @@
           'outputs': [],
           'action': [
-            'sh', 'update-info-plist.sh'
+            'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/JavaScriptGlue/Info.plist'
           ],
         },

trunk/Source/gyp/run-if-exists.sh

@@ -1 +1 @@
 #!/bin/sh
 
-if [ -f ../../Tools/Scripts/$1 ]; then
-    ../../Tools/Scripts/$1 || exit $?;
+if [ -f $1 ]; then
+    $1 || exit $?;
 fi

trunk/Source/gyp/update-info-plist.sh

@@ -1 +1 @@
 # Touch Info.plist to let Xcode know it needs to copy it into the built product
 if [[ "${CONFIGURATION}" != "Production" ]]; then
-    touch "../Info.plist";
+    touch "$1";
 fi