From a0fab15ab82e0c96d858cfe303ce80b861b236df Mon Sep 17 00:00:00 2001 From: "eric@webkit.org" Date: Tue, 22 Mar 2011 22:09:57 +0000 Subject: [PATCH] 2011-03-22 Eric Seidel 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 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 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 --- Source/JavaScriptCore/ChangeLog | 14 ++++++++++++++ Source/JavaScriptCore/gyp/JavaScriptCore.gyp | 8 ++++---- Source/{ => JavaScriptCore}/gyp/run-if-exists.sh | 0 Source/{ => JavaScriptCore}/gyp/update-info-plist.sh | 0 Source/JavaScriptGlue/ChangeLog | 14 ++++++++++++++ Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp | 8 ++++---- .../{ => JavaScriptGlue}/gyp/remove-headers-if-needed.sh | 0 Source/JavaScriptGlue/gyp/run-if-exists.sh | 5 +++++ Source/JavaScriptGlue/gyp/update-info-plist.sh | 4 ++++ Source/WebCore/ChangeLog | 14 ++++++++++++++ Source/WebCore/gyp/WebCore.gyp | 10 +++++----- Source/WebCore/gyp/run-if-exists.sh | 5 +++++ Source/WebCore/gyp/update-info-plist.sh | 4 ++++ 13 files changed, 73 insertions(+), 13 deletions(-) rename Source/{ => JavaScriptCore}/gyp/run-if-exists.sh (100%) mode change 100644 => 100755 rename Source/{ => JavaScriptCore}/gyp/update-info-plist.sh (100%) rename Source/{ => JavaScriptGlue}/gyp/remove-headers-if-needed.sh (100%) mode change 100644 => 100755 create mode 100755 Source/JavaScriptGlue/gyp/run-if-exists.sh create mode 100755 Source/JavaScriptGlue/gyp/update-info-plist.sh create mode 100755 Source/WebCore/gyp/run-if-exists.sh create mode 100755 Source/WebCore/gyp/update-info-plist.sh diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 9454569..a223161 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -2,6 +2,20 @@ 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 + + Reviewed by Adam Barth. + Add Profiling Configuration to JavaScriptCore gyp build https://bugs.webkit.org/show_bug.cgi?id=56862 diff --git a/Source/JavaScriptCore/gyp/JavaScriptCore.gyp b/Source/JavaScriptCore/gyp/JavaScriptCore.gyp index 945c1db..d7eae76 100644 --- 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 new mode 100755 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 8ade7af..facaa01 100644 --- a/Source/JavaScriptGlue/ChangeLog +++ b/Source/JavaScriptGlue/ChangeLog @@ -1,3 +1,17 @@ +2011-03-22 Eric Seidel + + 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 Reviewed by Eric Seidel. diff --git a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp index b970d4b..d516818 100644 --- 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 new mode 100755 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 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 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 2812289..0c02d52 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2011-03-22 Eric Seidel + + 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 Fix WebKit2 build. diff --git a/Source/WebCore/gyp/WebCore.gyp b/Source/WebCore/gyp/WebCore.gyp index 66264b9..f144fd7 100644 --- 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 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 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 -- 1.8.3.1