Skip to content

Commit 3f2a810

Browse files
bitjammerwebkit-commit-queue
bitjammer
authored and
webkit-commit-queue
committed
Makefiles should work for arbitrary SDKs and architectures on Apple ports
https://bugs.webkit.org/show_bug.cgi?id=107863 Patch by David Farler <dfarler@apple.com> on 2013-02-07 Reviewed by Mark Rowe. .: * Makefile: Allow SDKROOT, ARCHS outside of $(ARGS). Setting ARCHS => ONLY_ACTIVE_ARCH=NO. * Makefile.shared: options to webkitdirs based on SDKROOT * Source/Makefile: don't build WebKit2 for iOS Tools: * DumpRenderTree/Makefile: SDKROOT=iphone* => -target All-iOS * Makefile: Only build some projects for iOS Canonical link: https://commits.webkit.org/127451@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142207 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 4d6095d commit 3f2a810

7 files changed

Lines changed: 57 additions & 5 deletions

File tree

‎ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2013-02-07 David Farler <dfarler@apple.com>
2+
3+
Makefiles should work for arbitrary SDKs and architectures on Apple ports
4+
https://bugs.webkit.org/show_bug.cgi?id=107863
5+
6+
Reviewed by Mark Rowe.
7+
8+
* Makefile:
9+
Allow SDKROOT, ARCHS outside of $(ARGS).
10+
Setting ARCHS => ONLY_ACTIVE_ARCH=NO.
11+
* Makefile.shared: options to webkitdirs based on SDKROOT
12+
* Source/Makefile: don't build WebKit2 for iOS
13+
114
2013-02-07 Martin Robinson <mrobinson@igalia.com>
215

316
[GTK] Cleanup command-line defines

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ all:
44
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
55
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
66

7-
debug d development dev develop:
7+
debug d:
88
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
99
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
1010

11-
release r deployment dep deploy:
11+
release r:
1212
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
1313
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
1414

‎Makefile.shared‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
SCRIPTS_PATH ?= ../Tools/Scripts
2-
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
2+
3+
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $(ARGS)
4+
5+
ifneq (,$(SDKROOT))
6+
XCODE_OPTIONS += SDKROOT=$(SDKROOT)
7+
endif
8+
9+
ifneq (,$(ARCHS))
10+
XCODE_OPTIONS += ARCHS="$(ARCHS)"
11+
XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
12+
endif
313

414
DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
515
VERBOSITY ?= $(DEFAULT_VERBOSITY)

‎Source/Makefile‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
22

3+
ifneq (,$(findstring iphoneos,$(SDKROOT)))
4+
MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit
5+
else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
6+
MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit
7+
endif
8+
39
all:
410
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
511
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
612

7-
debug d development dev develop:
13+
debug d:
814
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
915
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
1016

11-
release r deployment dep deploy:
17+
release r:
1218
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
1319
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
1420

‎Tools/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2013-02-07 David Farler <dfarler@apple.com>
2+
3+
Makefiles should work for arbitrary SDKs and architectures on Apple ports
4+
https://bugs.webkit.org/show_bug.cgi?id=107863
5+
6+
Reviewed by Mark Rowe.
7+
8+
* DumpRenderTree/Makefile: SDKROOT=iphone* => -target All-iOS
9+
* Makefile: Only build some projects for iOS
10+
111
2013-02-07 Roger Fong <roger_fong@apple.com>
212

313
Unreviewed. Another temporary EWS bot fix. It'll totally work this time.

‎Tools/DumpRenderTree/Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
SCRIPTS_PATH = ../Scripts
2+
3+
ifneq (,$(findstring iphoneos,$(SDKROOT)))
4+
OTHER_OPTIONS += -target All-iOS
5+
else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
6+
OTHER_OPTIONS += -target All-iOS
7+
endif
8+
29
include ../../Makefile.shared

‎Tools/Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
22

3+
ifneq (,$(findstring iphoneos,$(SDKROOT)))
4+
MODULES = ../Source/ThirdParty/gtest/xcode
5+
else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
6+
MODULES = DumpRenderTree ../Source/ThirdParty/gtest/xcode
7+
endif
8+
39
all:
410
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
511
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done

0 commit comments

Comments
 (0)