Title: [168410] trunk
- Revision
- 168410
- Author
- ddkil...@apple.com
- Date
- 2014-05-06 22:18:07 -0700 (Tue, 06 May 2014)
Log Message
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.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (168409 => 168410)
--- trunk/ChangeLog 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/ChangeLog 2014-05-07 05:18:07 UTC (rev 168410)
@@ -1,3 +1,13 @@
+2014-05-06 David Kilzer <ddkil...@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-qu...@webkit.org>
Unreviewed, rolling out r168304.
Modified: trunk/Makefile (168409 => 168410)
--- trunk/Makefile 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/Makefile 2014-05-07 05:18:07 UTC (rev 168410)
@@ -1,4 +1,4 @@
-MODULES = Source Tools
+MODULES = WebKitLibraries Source Tools
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
Modified: trunk/Tools/ChangeLog (168409 => 168410)
--- trunk/Tools/ChangeLog 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/Tools/ChangeLog 2014-05-07 05:18:07 UTC (rev 168410)
@@ -1,3 +1,15 @@
+2014-05-06 David Kilzer <ddkil...@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 <beid...@apple.com>
Add WK2 SPI to prevent the previous back/forward item from remaining in the list
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (168409 => 168410)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-05-07 05:18:07 UTC (rev 168410)
@@ -84,7 +84,7 @@
if ($productDir) {
$productDir = File::Spec->rel2abs($productDir);
} else {
- $productDir = $ENV{BUILT_PRODUCTS_DIR};
+ $productDir = $ENV{BUILT_PRODUCTS_DIR} || productDir();
}
if (!$osxVersion) {
Modified: trunk/WebKitLibraries/ChangeLog (168409 => 168410)
--- trunk/WebKitLibraries/ChangeLog 2014-05-07 05:15:47 UTC (rev 168409)
+++ trunk/WebKitLibraries/ChangeLog 2014-05-07 05:18:07 UTC (rev 168410)
@@ -1,3 +1,16 @@
+2014-05-06 David Kilzer <ddkil...@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 <d...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=132593
Added: trunk/WebKitLibraries/Makefile (0 => 168410)
--- trunk/WebKitLibraries/Makefile (rev 0)
+++ trunk/WebKitLibraries/Makefile 2014-05-07 05:18:07 UTC (rev 168410)
@@ -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
+
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
