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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79970 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 6f51843df541110c9b7c7421022a2d5c19b8ce58..51e7c7ba5a12cb2821e8f5f6d8284364d5b12b25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+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.

diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog
index 2dc9dd69d783da6f32f09f80a2ddd19e7f384c3c..cd5a2c52dd18634f863cd87bc9b1eddbae63a219 100644 (file)
--- a/Source/JavaScriptGlue/ChangeLog
+++ b/Source/JavaScriptGlue/ChangeLog
@@ -12,6 +12,23 @@
 
         * 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.

diff --git a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
index 49f36a03fd5c648fe283f95dabbb2e2dfbf96bf6..2a1573cc2622b687fb621a02c7e7d6a327b5c761 100644 (file)
--- a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
+++ b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
@@ -2,7 +2,7 @@
   'includes': [
     'JavaScriptGlue.gypi',
   ],
-  'xcode_config_file': '../Configurations/DebugRelease.xcconfig',
+  'xcode_config_file': '<(DEPTH)/JavaScriptGlue/Configurations/DebugRelease.xcconfig',
   'targets': [
     {
       'target_name': 'JavaScriptGlue',
@@ -11,9 +11,9 @@
         'Update Version'
       ],
       'include_dirs': [
-        '..',
-        '../ForwardingHeaders',
-        '../icu',
+        '<(DEPTH)/JavaScriptGlue',
+        '<(DEPTH)/JavaScriptGlue/ForwardingHeaders',
+        '<(DEPTH)/JavaScriptGlue/icu',
         '<(PRODUCT_DIR)/include',
       ],
       'sources': [
@@ -35,25 +35,31 @@
         {
           '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', 
+          },
         }],
       ],
     },
@@ -66,7 +72,7 @@
           'inputs': [],
           'outputs': [],
           'action': [
-            'sh', 'update-info-plist.sh'
+            'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/JavaScriptGlue/Info.plist'
           ],
         },
       ], # actions

diff --git a/Source/JavaScriptGlue/gyp/run-if-exists.sh b/Source/JavaScriptGlue/gyp/run-if-exists.sh
deleted file mode 100644 (file)
index 29cae8c..0000000
--- a/Source/JavaScriptGlue/gyp/run-if-exists.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -f ../../Tools/Scripts/$1 ]; then
-    ../../Tools/Scripts/$1 || exit $?;
-fi

diff --git a/Source/JavaScriptGlue/gyp/remove-headers-if-needed.sh b/Source/gyp/remove-headers-if-needed.sh
similarity index 100%
rename from Source/JavaScriptGlue/gyp/remove-headers-if-needed.sh
rename to Source/gyp/remove-headers-if-needed.sh

diff --git a/Source/gyp/run-if-exists.sh b/Source/gyp/run-if-exists.sh
new file mode 100644 (file)
index 0000000..242ffc8
--- /dev/null
+++ b/Source/gyp/run-if-exists.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f $1 ]; then
+    $1 || exit $?;
+fi

diff --git a/Source/JavaScriptGlue/gyp/update-info-plist.sh b/Source/gyp/update-info-plist.sh
similarity index 83%
rename from Source/JavaScriptGlue/gyp/update-info-plist.sh
rename to Source/gyp/update-info-plist.sh
index 5064a8d9aec6d54d13cd030e810a34d1485703bb..d02ecce4502f583526e1223e133667baae4d0de6 100755 (executable)
--- a/Source/JavaScriptGlue/gyp/update-info-plist.sh
+++ b/Source/gyp/update-info-plist.sh
@@ -1,4 +1,4 @@
 # 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