Diff
Modified: trunk/ChangeLog (140938 => 140939)
--- trunk/ChangeLog 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/ChangeLog 2013-01-28 04:22:30 UTC (rev 140939)
@@ -1,3 +1,14 @@
+2013-01-27 David Farler <[email protected]>
+
+ 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 <[email protected]>
Allow building with arbitrary SDK and ARCHS with make + Xcode
Modified: trunk/Makefile (140938 => 140939)
--- trunk/Makefile 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/Makefile 2013-01-28 04:22:30 UTC (rev 140939)
@@ -4,11 +4,11 @@
@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
Modified: trunk/Makefile.shared (140938 => 140939)
--- trunk/Makefile.shared 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/Makefile.shared 2013-01-28 04:22:30 UTC (rev 140939)
@@ -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 @@
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: ;
Modified: trunk/Source/Makefile (140938 => 140939)
--- trunk/Source/Makefile 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/Source/Makefile 2013-01-28 04:22:30 UTC (rev 140939)
@@ -1,22 +1,14 @@
MODULES = WTF _javascript_Core 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
Modified: trunk/Tools/ChangeLog (140938 => 140939)
--- trunk/Tools/ChangeLog 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/Tools/ChangeLog 2013-01-28 04:22:30 UTC (rev 140939)
@@ -1,3 +1,14 @@
+2013-01-27 David Farler <[email protected]>
+
+ 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 <[email protected]>
Fixing atomicIncrement implementation for Windows by dropping support before XP SP2.
Modified: trunk/Tools/DumpRenderTree/Makefile (140938 => 140939)
--- trunk/Tools/DumpRenderTree/Makefile 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/Tools/DumpRenderTree/Makefile 2013-01-28 04:22:30 UTC (rev 140939)
@@ -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
Modified: trunk/Tools/Makefile (140938 => 140939)
--- trunk/Tools/Makefile 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/Tools/Makefile 2013-01-28 04:22:30 UTC (rev 140939)
@@ -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
Modified: trunk/Tools/Scripts/webkitdirs.pm (140938 => 140939)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-01-28 04:06:27 UTC (rev 140938)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-01-28 04:22:30 UTC (rev 140939)
@@ -80,8 +80,6 @@
my $baseProductDir;
my @baseProductDirOption;
my $configuration;
-my $xcodeSDK;
-my $xcodeSDKVersion;
my $configurationForVisualStudio;
my $configurationProductDir;
my $sourceDir;
@@ -275,17 +273,6 @@
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 @@
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 @@
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 @@
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 @@
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
