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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142207 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index a187a99fe94b54f148cb445b093ea6b217cdb392..f2c8ee9f4e10415f45e395b33e3cf2963e1c820b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-07  David Farler  <dfarler@apple.com>
+
+        Makefiles should work for arbitrary SDKs and architectures on Apple ports
+        https://bugs.webkit.org/show_bug.cgi?id=107863
+
+        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
+
 2013-02-07  Martin Robinson  <mrobinson@igalia.com>
 
         [GTK] Cleanup command-line defines

diff --git a/Makefile b/Makefile
index 19d889ad390c783ef5a37fd525663f2cce9ed144..14e33157011157797dac62c494bac0bf254d7c2f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-debug d development dev develop:
+debug d:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-release r deployment dep deploy:
+release r:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 

diff --git a/Makefile.shared b/Makefile.shared
index 7c8deb83cb76bd6bd1bd2859d3afe4af7de620d7..ee723d830dea51d1ce9e2d1ad8c985eeca2d4f3f 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,5 +1,15 @@
 SCRIPTS_PATH ?= ../Tools/Scripts
-XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $(ARGS)
+
+ifneq (,$(SDKROOT))
+       XCODE_OPTIONS += SDKROOT=$(SDKROOT)
+endif
+
+ifneq (,$(ARCHS))
+       XCODE_OPTIONS += ARCHS="$(ARCHS)"
+       XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
+endif
 
 DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
 VERBOSITY ?= $(DEFAULT_VERBOSITY)

diff --git a/Source/Makefile b/Source/Makefile
index 258c2f2e77051afae16b4f5acc672b7451d42e95..3f9ca719a4fe9167198e046d18902bd2941bd7e9 100644 (file)
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -1,14 +1,20 @@
 MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
 
+ifneq (,$(findstring iphoneos,$(SDKROOT)))
+       MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit
+else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
+       MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit
+endif
+
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-debug d development dev develop:
+debug d:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-release r deployment dep deploy:
+release r:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0e7f31b823db95e07e1c93365d5d48969046319b..4cc747e7feabff6a86af2b17a9102f9b44441eee 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2013-02-07  David Farler  <dfarler@apple.com>
+
+        Makefiles should work for arbitrary SDKs and architectures on Apple ports
+        https://bugs.webkit.org/show_bug.cgi?id=107863
+
+        Reviewed by Mark Rowe.
+
+        * DumpRenderTree/Makefile: SDKROOT=iphone* => -target All-iOS
+        * Makefile: Only build some projects for iOS
+
 2013-02-07  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. Another temporary EWS bot fix. It'll totally work this time.

diff --git a/Tools/DumpRenderTree/Makefile b/Tools/DumpRenderTree/Makefile
index 1f1dbbcb30fd47748dc187236083301f6dd7b6b5..344ef480b1f10948174f2e0a52b7e9b3efbd8b11 100644 (file)
--- a/Tools/DumpRenderTree/Makefile
+++ b/Tools/DumpRenderTree/Makefile
@@ -1,2 +1,9 @@
 SCRIPTS_PATH = ../Scripts
+
+ifneq (,$(findstring iphoneos,$(SDKROOT)))
+       OTHER_OPTIONS += -target All-iOS
+else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
+       OTHER_OPTIONS += -target All-iOS
+endif
+
 include ../../Makefile.shared

diff --git a/Tools/Makefile b/Tools/Makefile
index adc3ae63ae539b4cccd79cfebcf026d1b023fac5..930ff8ea8217559fd46c1208a31fcf5366c8ba5a 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -1,5 +1,11 @@
 MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
 
+ifneq (,$(findstring iphoneos,$(SDKROOT)))
+       MODULES = ../Source/ThirdParty/gtest/xcode
+else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
+       MODULES = DumpRenderTree ../Source/ThirdParty/gtest/xcode
+endif
+
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done