Skip to content

Commit 7cb7354

Browse files
ddkilzerddkilzer
committed
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. Canonical link: https://commits.webkit.org/150680@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent f5c8a83 commit 7cb7354

6 files changed

Lines changed: 52 additions & 2 deletions

File tree

‎ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2014-05-06 David Kilzer <ddkilzer@apple.com>
2+
3+
Add Makefile targets for copying static libraries (LLVM and WKSI)
4+
<http://webkit.org/b/132619>
5+
6+
Reviewed by Mark Rowe.
7+
8+
* Makefile:
9+
(MODULES): Add WebKitLibraries.
10+
111
2014-05-06 Commit Queue <commit-queue@webkit.org>
212

313
Unreviewed, rolling out r168304.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MODULES = Source Tools
1+
MODULES = WebKitLibraries Source Tools
22

33
all:
44
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

‎Tools/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2014-05-06 David Kilzer <ddkilzer@apple.com>
2+
3+
Add Makefile targets for copying static libraries (LLVM and WKSI)
4+
<http://webkit.org/b/132619>
5+
6+
Reviewed by Mark Rowe.
7+
8+
* Scripts/copy-webkitlibraries-to-product-directory: Set a
9+
sensible default for product directory if not specified on
10+
either the command-line or in the environment (by Xcode) by
11+
calling productDir() in webkitdirs.pm.
12+
113
2014-05-06 Brady Eidson <beidson@apple.com>
214

315
Add WK2 SPI to prevent the previous back/forward item from remaining in the list

‎Tools/Scripts/copy-webkitlibraries-to-product-directory‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ my $productDir = shift @ARGV;
8484
if ($productDir) {
8585
$productDir = File::Spec->rel2abs($productDir);
8686
} else {
87-
$productDir = $ENV{BUILT_PRODUCTS_DIR};
87+
$productDir = $ENV{BUILT_PRODUCTS_DIR} || productDir();
8888
}
8989

9090
if (!$osxVersion) {

‎WebKitLibraries/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2014-05-06 David Kilzer <ddkilzer@apple.com>
2+
3+
Add Makefile targets for copying static libraries (LLVM and WKSI)
4+
<http://webkit.org/b/132619>
5+
6+
Reviewed by Mark Rowe.
7+
8+
* Makefile: Added.
9+
(libs): Install both LLVM and WKSI static libraries.
10+
(all): Add dependency on 'libs' target.
11+
(debug d): Set configuration, the call 'libs' target.
12+
(release r): Ditto.
13+
114
2014-05-05 Dean Jackson <dino@apple.com>
215

316
https://bugs.webkit.org/show_bug.cgi?id=132593

‎WebKitLibraries/Makefile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
SCRIPTS_PATH = ../Tools/Scripts
2+
3+
libs:
4+
perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm
5+
6+
all: libs
7+
8+
debug d:
9+
$(SCRIPTS_PATH)/set-webkit-configuration --debug
10+
@$(MAKE) libs
11+
12+
release r:
13+
$(SCRIPTS_PATH)/set-webkit-configuration --release
14+
@$(MAKE) libs
15+

0 commit comments

Comments
 (0)