REGRESSION (r140912): Broke specifying non-trivial ARCHS value to make / build-webkit

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

Patch by David Farler <dfarler@apple.com> on 2013-01-27
Reviewed by Dan Bernstein.

.:

* Makefile: Reverted.
* Makefile.shared: Reverted.
* Source/Makefile: Reverted.

Tools:

* DumpRenderTree/Makefile: Reverted.
* Makefile: Reverted.
* Scripts/webkitdirs.pm: Reverted.

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

diff --git a/ChangeLog b/ChangeLog
index b987b3d..0aa3bf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-27  David Farler  <dfarler@apple.com>
+
+        REGRESSION (r140912): Broke specifying non-trivial ARCHS value to make / build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=108028
+
+        Reviewed by Dan Bernstein.
+
+        * Makefile: Reverted.
+        * Makefile.shared: Reverted.
+        * Source/Makefile: Reverted.
+
 2013-01-26  David Farler  <dfarler@apple.com>
 
         Allow building with arbitrary SDK and ARCHS with make + Xcode

diff --git a/Makefile b/Makefile
index 14e3315..19d889a 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:
+debug d development dev develop:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-release r:
+release r deployment dep deploy:
        @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 ac2aa09..7c8deb8 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,18 +1,6 @@
 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)
 
@@ -26,22 +14,18 @@ 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) $(call xcode-options,) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
-debug d: force
+debug d development dev develop: force
        $(SCRIPTS_PATH)/set-webkit-configuration --debug
-       xcodebuild $(OTHER_OPTIONS) $(call xcode-options, --configuration Debug) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
-release r: force
+release r deployment dep deploy: force
        $(SCRIPTS_PATH)/set-webkit-configuration --release
-       xcodebuild $(OTHER_OPTIONS) $(call xcode-options, --configuration Release) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
 clean:
-       xcodebuild $(OTHER_OPTIONS) -alltargets clean $(call xcode-options,) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
+       ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
 force: ;

diff --git a/Source/Makefile b/Source/Makefile
index d9398af..258c2f2 100644 (file)
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -1,22 +1,14 @@
 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:
+debug d development dev develop:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-release r:
+release r deployment dep deploy:
        @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 bc5bd7b..cfcacfd 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-27  David Farler  <dfarler@apple.com>
+
+        REGRESSION (r140912): Broke specifying non-trivial ARCHS value to make / build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=108028
+
+        Reviewed by Dan Bernstein.
+
+        * DumpRenderTree/Makefile: Reverted.
+        * Makefile: Reverted.
+        * Scripts/webkitdirs.pm: Reverted.
+
 2013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
 
         Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.

diff --git a/Tools/DumpRenderTree/Makefile b/Tools/DumpRenderTree/Makefile
index 366f8d9..1f1dbbc 100644 (file)
--- a/Tools/DumpRenderTree/Makefile
+++ b/Tools/DumpRenderTree/Makefile
@@ -1,9 +1,2 @@
 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 771f0e3..adc3ae6 100644 (file)
--- a/Tools/Makefile
+++ b/Tools/Makefile
@@ -1,24 +1,14 @@
 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:
+debug d development dev develop:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-release r:
+release r deployment dep deploy:
        @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 e9406e3..8d37a8c 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -80,8 +80,6 @@ my $numberOfCPUs;
 my $baseProductDir;
 my @baseProductDirOption;
 my $configuration;
-my $xcodeSDK;
-my $xcodeSDKVersion;
 my $configurationForVisualStudio;
 my $configurationProductDir;
 my $sourceDir;
@@ -275,17 +273,6 @@ 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>;
@@ -315,30 +302,6 @@ 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`;
@@ -420,7 +383,6 @@ 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();
@@ -434,33 +396,6 @@ 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;
@@ -585,9 +520,7 @@ sub XcodeOptions
     determineBaseProductDir();
     determineConfiguration();
     determineArchitecture();
-    determineXcodeSDK();
-    my @archFlags = map { ('-arch', $_) } split(/ /, $architecture);
-    return (@baseProductDirOption, "-configuration", $configuration, "-sdk", $xcodeSDK, @archFlags, argumentsForXcode());
+    return (@baseProductDirOption, "-configuration", $configuration, "ARCHS=$architecture", argumentsForXcode());
 }
 
 sub XcodeOptionString