.: Allow building with arbitrary SDK and ARCHS with make + Xcode

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

Patch by David Farler <dfarler@apple.com> on 2013-01-26
Reviewed by David Kilzer.

* Makefile:
Removed references to legacy Xcode configurations.
* Makefile.shared:
Added default ARCHS + SDK settings and parameterized xcodebuild calls.
* Source/Makefile:
iOS does not build WebKit2.

Tools: 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-01-26
Reviewed by David Kilzer.

* Makefile:
Added temporary filters for projects not yet building on iOS.
* DumpRenderTree/Makefile:
Building with iOS SDKs -> -target All-iOS
* Scripts/webkitdirs.pm:
(determineConfiguration):
Added --configuration switch detection.
(determineArchitecture):
Added --architecture and ARCH=(.*) switch detection.
(argumentsForConfiguration):
(determineXcodeSDK):
Look for --device, --simulator, and --sdk switches.
(xcodeSDK):
Added.
(XcodeOptions):
Determine Xcode SDK and generate -arch switches.

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

diff --git a/ChangeLog b/ChangeLog
index 93fa76f..b987b3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-01-26  David Farler  <dfarler@apple.com>
+
+        Allow building with arbitrary SDK and ARCHS with make + Xcode
+        https://bugs.webkit.org/show_bug.cgi?id=107863
+
+        Reviewed by David Kilzer.
+
+        * Makefile:
+        Removed references to legacy Xcode configurations.
+        * Makefile.shared:
+        Added default ARCHS + SDK settings and parameterized xcodebuild calls.
+        * Source/Makefile:
+        iOS does not build WebKit2.
+
 2013-01-25  Jussi Kukkonen  <jussi.kukkonen@intel.com>
 
         [CMake][EFL] Build ThirdParty/leveldb when IndexedDB is enabled

diff --git a/Makefile b/Makefile
index 19d889a..14e3315 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 7c8deb8..ac2aa09 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,6 +1,18 @@
 SCRIPTS_PATH ?= ../Tools/Scripts
-XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
 
+SDK = /
+
+ifneq (,$(findstring iphoneos,$(SDK)))
+       ARCHS = armv7
+else ifneq (,$(findstring iphonesimulator,$(SDK)))
+       ARCHS = i386
+else ifneq (,$(findstring macosx,$(SDK)))
+       ARCHS = x86_64
+else
+       ARCHS = x86_64
+endif
+
+ARCH_FLAGS=$(addprefix --arch ,$(ARCHS))
 DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
 VERBOSITY ?= $(DEFAULT_VERBOSITY)
 
@@ -14,18 +26,22 @@ OUTPUT_FILTER = $(SCRIPTS_PATH)/filter-build-webkit
 endif
 endif
 
+define xcode-options
+        $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- --sdk $(SDK) $1 $(ARCH_FLAGS) $(ARGS))
+endef
+
 all:
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+       xcodebuild $(OTHER_OPTIONS) $(call xcode-options,) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
 
-debug d development dev develop: force
+debug d: force
        $(SCRIPTS_PATH)/set-webkit-configuration --debug
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+       xcodebuild $(OTHER_OPTIONS) $(call xcode-options, --configuration Debug) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
 
-release r deployment dep deploy: force
+release r: force
        $(SCRIPTS_PATH)/set-webkit-configuration --release
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+       xcodebuild $(OTHER_OPTIONS) $(call xcode-options, --configuration Release) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
 
 clean:
-       ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
+       xcodebuild $(OTHER_OPTIONS) -alltargets clean $(call xcode-options,) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
 
 force: ;

diff --git a/Source/Makefile b/Source/Makefile
index 258c2f2..d9398af 100644 (file)
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -1,14 +1,22 @@
 MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
 
+IOS_DONT_BUILD = WebKit2
+
+ifneq (,$(findstring iphoneos,$(SDK)))
+       MODULES = $(filter-out $(IOS_DONT_BUILD),$(MODULES))
+else ifneq (,$(findstring iphonesimulator,$(SDK)))
+       MODULES = $(subst $(IOS_DONT_BUILD),$(MODULES))
+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 44d4d74..c006523 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,27 @@
+2013-01-26  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 David Kilzer.
+
+        * Makefile:
+        Added temporary filters for projects not yet building on iOS.
+        * DumpRenderTree/Makefile:
+        Building with iOS SDKs -> -target All-iOS
+        * Scripts/webkitdirs.pm:
+        (determineConfiguration):
+        Added --configuration switch detection.
+        (determineArchitecture):
+        Added --architecture and ARCH=(.*) switch detection.
+        (argumentsForConfiguration):
+        (determineXcodeSDK):
+        Look for --device, --simulator, and --sdk switches.
+        (xcodeSDK):
+        Added.
+        (XcodeOptions):
+        Determine Xcode SDK and generate -arch switches.
+
 2013-01-25  Jochen Eisinger  <jochen@chromium.org>
 
         [chromium] move tracking of the top loading frame to TestRunner library

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

diff --git a/Tools/Makefile b/Tools/Makefile
index adc3ae6..771f0e3 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -1,14 +1,24 @@
 MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
 
+IOS_DONT_BUILD = WebKitTestRunner MiniBrowser TestWebKitAPI
+IPHONEOS_DONT_BUILD = DumpRenderTree
+
+ifneq (,$(findstring iphoneos,$(SDK)))
+       MODULES = $(filter-out $(IOS_DONT_BUILD),$(MODULES))
+       MODULES = $(filter-out $(IPHONEOS_DONT_BUILD),$(MODULES))
+else ifneq (,$(findstring iphonesimulator,$(SDK)))
+       MODULES = $(filter-out $(IOS_DONT_BUILD),$(MODULES))
+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/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 8d37a8c..e9406e3 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -80,6 +80,8 @@ my $numberOfCPUs;
 my $baseProductDir;
 my @baseProductDirOption;
 my $configuration;
+my $xcodeSDK;
+my $xcodeSDKVersion;
 my $configurationForVisualStudio;
 my $configurationProductDir;
 my $sourceDir;
@@ -273,6 +275,17 @@ sub setBaseProductDir($)
 sub determineConfiguration
 {
     return if defined $configuration;
+
+    # Look for explicit setting first
+    for (my $i = 0; $i <= $#ARGV; $i++) {
+        my $opt = $ARGV[$i];
+        if ($opt =~ /^--config(uration)$/) {
+            splice(@ARGV, $i, 1);
+            $configuration = splice(@ARGV, $i, 1);
+            return;
+        }
+    }
+
     determineBaseProductDir();
     if (open CONFIGURATION, "$baseProductDir/Configuration") {
         $configuration = <CONFIGURATION>;
@@ -302,6 +315,30 @@ sub determineArchitecture
 
     determineBaseProductDir();
 
+    # Look for explicit setting first
+    my @explicitArchs;
+    for (my $i = 0; $i <= $#ARGV; $i++) {
+        my $opt = $ARGV[$i];
+
+        if ($opt =~ /^--arch(itecture)?$/) {
+            splice(@ARGV, $i, 1);
+            push @explicitArchs, splice(@ARGV, $i--, 1);
+        } elsif ($opt =~ /^ARCHS=(.*)$/) {
+            push @explicitArchs, split(/\w/, $1);
+            splice(@ARGV, $i--, 1);
+        }
+    }
+
+    # Make explicit arch settings forgiving – remove duplicate settings
+    # and allow for specifying architectures with both --arch and appending
+    # Xcode-style ARCHS=(.*)
+    @explicitArchs = sort keys %{{ map { $_ => 1 } @explicitArchs }};
+
+    if (scalar(@explicitArchs)) {
+        $architecture = join(' ', @explicitArchs) if @explicitArchs;
+        return;
+    }
+
     if (isGtk()) {
         determineConfigurationProductDir();
         my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile`;
@@ -383,6 +420,7 @@ sub argumentsForConfiguration()
     push(@args, '--debug') if $configuration eq "Debug";
     push(@args, '--release') if $configuration eq "Release";
     push(@args, '--32-bit') if $architecture ne "x86_64";
+    push(@args, '--sdk', $xcodeSDK) if defined $xcodeSDK;
     push(@args, '--qt') if isQt();
     push(@args, '--gtk') if isGtk();
     push(@args, '--efl') if isEfl();
@@ -396,6 +434,33 @@ sub argumentsForConfiguration()
     return @args;
 }
 
+sub determineXcodeSDK
+{
+    return if defined $xcodeSDK;
+    for (my $i = 0; $i <= $#ARGV; $i++) {
+        my $opt = $ARGV[$i];
+        if ($opt =~ /^--sdk$/i) {
+            splice(@ARGV, $i, 1);
+            $xcodeSDK = splice(@ARGV, $i, 1);
+        } elsif ($opt =~ /^--device$/i) {
+            splice(@ARGV, $i, 1);
+            $xcodeSDK = 'iphoneos.internal';
+        } elsif ($opt =~ /^--sim(ulator)?/i) {
+            splice(@ARGV, $i, 1);
+            $xcodeSDK = 'iphonesimulator';
+        }
+    }
+    $xcodeSDK ||= '/';
+
+    chomp $xcodeSDK;
+}
+
+sub xcodeSDK
+{
+    determineXcodeSDK();
+    return $xcodeSDK;
+}
+
 sub determineConfigurationForVisualStudio
 {
     return if defined $configurationForVisualStudio;
@@ -520,7 +585,9 @@ sub XcodeOptions
     determineBaseProductDir();
     determineConfiguration();
     determineArchitecture();
-    return (@baseProductDirOption, "-configuration", $configuration, "ARCHS=$architecture", argumentsForXcode());
+    determineXcodeSDK();
+    my @archFlags = map { ('-arch', $_) } split(/ /, $architecture);
+    return (@baseProductDirOption, "-configuration", $configuration, "-sdk", $xcodeSDK, @archFlags, argumentsForXcode());
 }
 
 sub XcodeOptionString