2011-03-22 Eric Seidel <eric@webkit.org>

        Reviewed by Adam Barth.

        Make it possible to build JavaScriptCore and WebCore gyp builds outside of Source
        https://bugs.webkit.org/show_bug.cgi?id=56867

        This should make it possible to build the gyp-generated JavaScriptCore.xcodeproj
        from a JavaScriptCore directory outside of Source.

        * gyp/JavaScriptCore.gyp:
        * gyp/run-if-exists.sh: Added.
        * gyp/update-info-plist.sh: Added.
2011-03-22  Eric Seidel  <eric@webkit.org>

        Reviewed by Adam Barth.

        Make it possible to build JavaScriptCore and WebCore gyp builds outside of Source
        https://bugs.webkit.org/show_bug.cgi?id=56867

        This should make it possible to build the gyp-generated JavaScriptGlue.xcodeproj
        from a JavaScriptGlue directory outside of Source.

        * gyp/JavaScriptGlue.gyp:
        * gyp/run-if-exists.sh: Added.
        * gyp/update-info-plist.sh: Added.
2011-03-22  Eric Seidel  <eric@webkit.org>

        Reviewed by Adam Barth.

        Make it possible to build JavaScriptCore and WebCore gyp builds outside of Source
        https://bugs.webkit.org/show_bug.cgi?id=56867

        This should make it possible to build the gyp-generated WebCore.xcodeproj
        from a WebCore directory outside of Source.

        * gyp/WebCore.gyp:
        * gyp/run-if-exists.sh: Added.
        * gyp/update-info-plist.sh: Added.

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 945456939792742f354c4f568457b83590de19a2..a223161371a5847af6e5127cad1b27fc8f2456f9 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-03-22  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make it possible to build JavaScriptCore and WebCore gyp builds outside of Source
+        https://bugs.webkit.org/show_bug.cgi?id=56867
+
+        This should make it possible to build the gyp-generated JavaScriptCore.xcodeproj
+        from a JavaScriptCore directory outside of Source.
+
+        * gyp/JavaScriptCore.gyp:
+        * gyp/run-if-exists.sh: Added.
+        * gyp/update-info-plist.sh: Added.
+
 2011-03-22  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.

diff --git a/Source/JavaScriptCore/gyp/JavaScriptCore.gyp b/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
index 945c1dbc12dc6650f308120d42186ec42b7969bc..d7eae76cb65d1e0d8aefb063934b2c4b44335955 100644 (file)
--- a/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
+++ b/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
@@ -100,19 +100,19 @@
         {
           'postbuild_name': 'Check For Global Initializers',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'
           ],
         },
         {
           'postbuild_name': 'Check For Exit Time Destructors',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-exit-time-destructors'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-exit-time-destructors'
           ],
         },
         {
           'postbuild_name': 'Check For Weak VTables and Externals',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'
           ],
         },
       ],
@@ -160,7 +160,7 @@
         'inputs': [],
          'outputs': [],
          'action': [
-           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
+           'sh', '<(project_dir)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
           ]
       }],
     },

diff --git a/Source/gyp/run-if-exists.sh b/Source/JavaScriptCore/gyp/run-if-exists.sh
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from Source/gyp/run-if-exists.sh
rename to Source/JavaScriptCore/gyp/run-if-exists.sh

diff --git a/Source/gyp/update-info-plist.sh b/Source/JavaScriptCore/gyp/update-info-plist.sh
similarity index 100%
rename from Source/gyp/update-info-plist.sh
rename to Source/JavaScriptCore/gyp/update-info-plist.sh

diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog
index 8ade7afc3cf2c3a2525fa1fbf230bbad00140b1e..facaa01d1885dcb15d064292f9de0d5aa8c6fbad 100644 (file)
--- a/Source/JavaScriptGlue/ChangeLog
+++ b/Source/JavaScriptGlue/ChangeLog
@@ -1,3 +1,17 @@
+2011-03-22  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make it possible to build JavaScriptCore and WebCore gyp builds outside of Source
+        https://bugs.webkit.org/show_bug.cgi?id=56867
+
+        This should make it possible to build the gyp-generated JavaScriptGlue.xcodeproj
+        from a JavaScriptGlue directory outside of Source.
+
+        * gyp/JavaScriptGlue.gyp:
+        * gyp/run-if-exists.sh: Added.
+        * gyp/update-info-plist.sh: Added.
+
 2011-03-22  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
index b970d4b5b53cfe283fc24f29799cce5d73894c34..d51681815b15149ef58b34f9e0f54c3dd56b1523 100644 (file)
--- a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
+++ b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
@@ -62,19 +62,19 @@
         {
           'postbuild_name': 'Check For Global Initializers',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'
           ],
         },
         {
           'postbuild_name': 'Check For Weak VTables and Externals',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'
           ],
         },
         {
           'postbuild_name': 'Remove Headers If Needed',
           'action': [
-            'sh', '<(DEPTH)/gyp/remove-headers-if-needed.sh'
+            'sh', '<(project_dir)/gyp/remove-headers-if-needed.sh'
           ],
         },
       ],
@@ -99,7 +99,7 @@
         'inputs': [],
          'outputs': [],
          'action': [
-           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
+           'sh', '<(project_dir)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
           ]
       }],
     },

diff --git a/Source/gyp/remove-headers-if-needed.sh b/Source/JavaScriptGlue/gyp/remove-headers-if-needed.sh
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from Source/gyp/remove-headers-if-needed.sh
rename to Source/JavaScriptGlue/gyp/remove-headers-if-needed.sh

diff --git a/Source/JavaScriptGlue/gyp/run-if-exists.sh b/Source/JavaScriptGlue/gyp/run-if-exists.sh
new file mode 100755 (executable)
index 0000000..242ffc8
--- /dev/null
+++ b/Source/JavaScriptGlue/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/JavaScriptGlue/gyp/update-info-plist.sh
new file mode 100755 (executable)
index 0000000..d02ecce
--- /dev/null
+++ b/Source/JavaScriptGlue/gyp/update-info-plist.sh
@@ -0,0 +1,4 @@
+# Touch Info.plist to let Xcode know it needs to copy it into the built product
+if [[ "${CONFIGURATION}" != "Production" ]]; then
+    touch "$1";
+fi

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2812289952bc899ba7cc82a5487ad971492cc1b6..0c02d523dfebc082685bd07b5ce17c7d888d98fc 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-03-22  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make it possible to build JavaScriptCore and WebCore gyp builds outside of Source
+        https://bugs.webkit.org/show_bug.cgi?id=56867
+
+        This should make it possible to build the gyp-generated WebCore.xcodeproj
+        from a WebCore directory outside of Source.
+
+        * gyp/WebCore.gyp:
+        * gyp/run-if-exists.sh: Added.
+        * gyp/update-info-plist.sh: Added.
+
 2011-03-22  Anders Carlsson  <andersca@apple.com>
 
         Fix WebKit2 build.

diff --git a/Source/WebCore/gyp/WebCore.gyp b/Source/WebCore/gyp/WebCore.gyp
index 66264b91023cd853eb1240e8a89cd7f02a8eeed5..f144fd745b6b7d1192bfcde4b7c5ad104e788893 100644 (file)
--- a/Source/WebCore/gyp/WebCore.gyp
+++ b/Source/WebCore/gyp/WebCore.gyp
@@ -169,25 +169,25 @@
         {
           'postbuild_name': 'Check For Global Initializers',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'
           ],
         },
         {
           'postbuild_name': 'Check For Exit Time Destructors',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-exit-time-destructors'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-exit-time-destructors'
           ],
         },
         {
           'postbuild_name': 'Check For Weak VTables and Externals',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'
           ],
         },
         {
           'postbuild_name': 'Check For Inappropriate Files in Framework',
           'action': [
-            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-inappropriate-files-in-framework'
+            'sh', '<(project_dir)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-inappropriate-files-in-framework'
           ],
         },
       ],
@@ -228,7 +228,7 @@
         'inputs': [],
          'outputs': [],
          'action': [
-           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
+           'sh', '<(project_dir)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
           ]
       }],
     },

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

diff --git a/Source/WebCore/gyp/update-info-plist.sh b/Source/WebCore/gyp/update-info-plist.sh
new file mode 100755 (executable)
index 0000000..d02ecce
--- /dev/null
+++ b/Source/WebCore/gyp/update-info-plist.sh
@@ -0,0 +1,4 @@
+# Touch Info.plist to let Xcode know it needs to copy it into the built product
+if [[ "${CONFIGURATION}" != "Production" ]]; then
+    touch "$1";
+fi