From c6313daca854f79601cad3f29915e16a9d3f6e59 Mon Sep 17 00:00:00 2001 From: "ddkilzer@apple.com" Date: Wed, 7 May 2014 05:18:07 +0000 Subject: [PATCH] Add Makefile targets for copying static libraries (LLVM and WKSI) Reviewed by Mark Rowe. .: * Makefile: (MODULES): Add WebKitLibraries. Tools: * Scripts/copy-webkitlibraries-to-product-directory: Set a sensible default for product directory if not specified on either the command-line or in the environment (by Xcode) by calling productDir() in webkitdirs.pm. WebKitLibraries: * Makefile: Added. (libs): Install both LLVM and WKSI static libraries. (all): Add dependency on 'libs' target. (debug d): Set configuration, the call 'libs' target. (release r): Ditto. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168410 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 10 ++++++++++ Makefile | 2 +- Tools/ChangeLog | 12 ++++++++++++ .../copy-webkitlibraries-to-product-directory | 2 +- WebKitLibraries/ChangeLog | 13 +++++++++++++ WebKitLibraries/Makefile | 15 +++++++++++++++ 6 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 WebKitLibraries/Makefile diff --git a/ChangeLog b/ChangeLog index 37537fdece2a..63c21a924b01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-05-06 David Kilzer + + Add Makefile targets for copying static libraries (LLVM and WKSI) + + + Reviewed by Mark Rowe. + + * Makefile: + (MODULES): Add WebKitLibraries. + 2014-05-06 Commit Queue Unreviewed, rolling out r168304. diff --git a/Makefile b/Makefile index 14e331570111..326336491395 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -MODULES = Source Tools +MODULES = WebKitLibraries Source Tools all: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 8c54afe1b55c..57a29aa51aa2 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2014-05-06 David Kilzer + + Add Makefile targets for copying static libraries (LLVM and WKSI) + + + Reviewed by Mark Rowe. + + * Scripts/copy-webkitlibraries-to-product-directory: Set a + sensible default for product directory if not specified on + either the command-line or in the environment (by Xcode) by + calling productDir() in webkitdirs.pm. + 2014-05-06 Brady Eidson Add WK2 SPI to prevent the previous back/forward item from remaining in the list diff --git a/Tools/Scripts/copy-webkitlibraries-to-product-directory b/Tools/Scripts/copy-webkitlibraries-to-product-directory index 3327667f6670..c09d4f6aa288 100755 --- a/Tools/Scripts/copy-webkitlibraries-to-product-directory +++ b/Tools/Scripts/copy-webkitlibraries-to-product-directory @@ -84,7 +84,7 @@ my $productDir = shift @ARGV; if ($productDir) { $productDir = File::Spec->rel2abs($productDir); } else { - $productDir = $ENV{BUILT_PRODUCTS_DIR}; + $productDir = $ENV{BUILT_PRODUCTS_DIR} || productDir(); } if (!$osxVersion) { diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 4e65b52ced80..15048571991d 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,16 @@ +2014-05-06 David Kilzer + + Add Makefile targets for copying static libraries (LLVM and WKSI) + + + Reviewed by Mark Rowe. + + * Makefile: Added. + (libs): Install both LLVM and WKSI static libraries. + (all): Add dependency on 'libs' target. + (debug d): Set configuration, the call 'libs' target. + (release r): Ditto. + 2014-05-05 Dean Jackson https://bugs.webkit.org/show_bug.cgi?id=132593 diff --git a/WebKitLibraries/Makefile b/WebKitLibraries/Makefile new file mode 100644 index 000000000000..a85e03d25bb7 --- /dev/null +++ b/WebKitLibraries/Makefile @@ -0,0 +1,15 @@ +SCRIPTS_PATH = ../Tools/Scripts + +libs: + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm + +all: libs + +debug d: + $(SCRIPTS_PATH)/set-webkit-configuration --debug + @$(MAKE) libs + +release r: + $(SCRIPTS_PATH)/set-webkit-configuration --release + @$(MAKE) libs + -- 2.36.0