Add Makefile targets for copying static libraries (LLVM and WKSI)

<http://webkit.org/b/132619>

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

diff --git a/ChangeLog b/ChangeLog
index 37537fdece2a21e94772ddd8f5ee63e95fe25405..63c21a924b01a71f883bf1eea2e9fce5cd7bdc5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-06  David Kilzer  <ddkilzer@apple.com>
+
+        Add Makefile targets for copying static libraries (LLVM and WKSI)
+        <http://webkit.org/b/132619>
+
+        Reviewed by Mark Rowe.
+
+        * Makefile:
+        (MODULES): Add WebKitLibraries.
+
 2014-05-06  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r168304.

diff --git a/Makefile b/Makefile
index 14e33157011157797dac62c494bac0bf254d7c2f..326336491395aff16d8828e931329945403ee809 100644 (file)
--- 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 8c54afe1b55cea753fc37633a647212e9542a701..57a29aa51aa22d0fb19405a5b18858b7196ff09f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2014-05-06  David Kilzer  <ddkilzer@apple.com>
+
+        Add Makefile targets for copying static libraries (LLVM and WKSI)
+        <http://webkit.org/b/132619>
+
+        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  <beidson@apple.com>
 
         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 3327667f6670fae8fc8b76039ebefb319abdd1c5..c09d4f6aa288fc2a9cb7c96b3ea45653d24e4934 100755 (executable)
--- 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 4e65b52ced803eea54e6bad23e5fb2e1b51ac9af..15048571991d1d2d4033cfa8a1fcb3c8a25e60f2 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,16 @@
+2014-05-06  David Kilzer  <ddkilzer@apple.com>
+
+        Add Makefile targets for copying static libraries (LLVM and WKSI)
+        <http://webkit.org/b/132619>
+
+        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  <dino@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=132593

diff --git a/WebKitLibraries/Makefile b/WebKitLibraries/Makefile
new file mode 100644 (file)
index 0000000..a85e03d
--- /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
+