Changeset 140939 in webkit


Ignore:
Timestamp:
Jan 27, 2013 8:22:30 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

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.
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r140912 r140939  
     12013-01-27  David Farler  <dfarler@apple.com>
     2
     3        REGRESSION (r140912): Broke specifying non-trivial ARCHS value to make / build-webkit
     4        https://bugs.webkit.org/show_bug.cgi?id=108028
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * Makefile: Reverted.
     9        * Makefile.shared: Reverted.
     10        * Source/Makefile: Reverted.
     11
    1122013-01-26  David Farler  <dfarler@apple.com>
    213
  • trunk/Makefile

    r140912 r140939  
    55        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    66
    7 debug d:
     7debug d development dev develop:
    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:
     11release r deployment dep deploy:
    1212        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    1313        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
  • trunk/Makefile.shared

    r140912 r140939  
    11SCRIPTS_PATH ?= ../Tools/Scripts
     2XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
    23
    3 SDK = /
    4 
    5 ifneq (,$(findstring iphoneos,$(SDK)))
    6         ARCHS = armv7
    7 else ifneq (,$(findstring iphonesimulator,$(SDK)))
    8         ARCHS = i386
    9 else ifneq (,$(findstring macosx,$(SDK)))
    10         ARCHS = x86_64
    11 else
    12         ARCHS = x86_64
    13 endif
    14 
    15 ARCH_FLAGS=$(addprefix --arch ,$(ARCHS))
    164DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
    175VERBOSITY ?= $(DEFAULT_VERBOSITY)
     
    2715endif
    2816
    29 define xcode-options
    30          $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- --sdk $(SDK) $1 $(ARCH_FLAGS) $(ARGS))
    31 endef
     17all:
     18        ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
    3219
    33 all:
    34         xcodebuild $(OTHER_OPTIONS) $(call xcode-options,) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
     20debug d development dev develop: force
     21        $(SCRIPTS_PATH)/set-webkit-configuration --debug
     22        ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
    3523
    36 debug d: force
    37         $(SCRIPTS_PATH)/set-webkit-configuration --debug
    38         xcodebuild $(OTHER_OPTIONS) $(call xcode-options, --configuration Debug) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
    39 
    40 release r: force
     24release r deployment dep deploy: force
    4125        $(SCRIPTS_PATH)/set-webkit-configuration --release
    42         xcodebuild $(OTHER_OPTIONS) $(call xcode-options, --configuration Release) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
     26        ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
    4327
    4428clean:
    45         xcodebuild $(OTHER_OPTIONS) -alltargets clean $(call xcode-options,) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]}
     29        ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
    4630
    4731force: ;
  • trunk/Source/Makefile

    r140912 r140939  
    11MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
    2 
    3 IOS_DONT_BUILD = WebKit2
    4 
    5 ifneq (,$(findstring iphoneos,$(SDK)))
    6         MODULES = $(filter-out $(IOS_DONT_BUILD),$(MODULES))
    7 else ifneq (,$(findstring iphonesimulator,$(SDK)))
    8         MODULES = $(subst $(IOS_DONT_BUILD),$(MODULES))
    9 endif
    102
    113all:
     
    135        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    146
    15 debug d:
     7debug d development dev develop:
    168        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    179        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    1810
    19 release r:
     11release r deployment dep deploy:
    2012        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    2113        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
  • trunk/Tools/ChangeLog

    r140930 r140939  
     12013-01-27  David Farler  <dfarler@apple.com>
     2
     3        REGRESSION (r140912): Broke specifying non-trivial ARCHS value to make / build-webkit
     4        https://bugs.webkit.org/show_bug.cgi?id=108028
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * DumpRenderTree/Makefile: Reverted.
     9        * Makefile: Reverted.
     10        * Scripts/webkitdirs.pm: Reverted.
     11
    1122013-01-27  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
    213
  • trunk/Tools/DumpRenderTree/Makefile

    r140912 r140939  
    11SCRIPTS_PATH = ../Scripts
    2 
    3 ifneq (,$(findstring iphoneos,$(SDK)))
    4         OTHER_OPTIONS += -target All-iOS
    5 else ifneq (,$(findstring iphonesimulator,$(SDK)))
    6         OTHER_OPTIONS += -target All-iOS
    7 endif
    8 
    92include ../../Makefile.shared
  • trunk/Tools/Makefile

    r140912 r140939  
    11MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
    2 
    3 IOS_DONT_BUILD = WebKitTestRunner MiniBrowser TestWebKitAPI
    4 IPHONEOS_DONT_BUILD = DumpRenderTree
    5 
    6 ifneq (,$(findstring iphoneos,$(SDK)))
    7         MODULES = $(filter-out $(IOS_DONT_BUILD),$(MODULES))
    8         MODULES = $(filter-out $(IPHONEOS_DONT_BUILD),$(MODULES))
    9 else ifneq (,$(findstring iphonesimulator,$(SDK)))
    10         MODULES = $(filter-out $(IOS_DONT_BUILD),$(MODULES))
    11 endif
    122
    133all:
     
    155        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    166
    17 debug d:
     7debug d development dev develop:
    188        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    199        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    2010
    21 release r:
     11release r deployment dep deploy:
    2212        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    2313        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
  • trunk/Tools/Scripts/webkitdirs.pm

    r140912 r140939  
    8181my @baseProductDirOption;
    8282my $configuration;
    83 my $xcodeSDK;
    84 my $xcodeSDKVersion;
    8583my $configurationForVisualStudio;
    8684my $configurationProductDir;
     
    276274{
    277275    return if defined $configuration;
    278 
    279     # Look for explicit setting first
    280     for (my $i = 0; $i <= $#ARGV; $i++) {
    281         my $opt = $ARGV[$i];
    282         if ($opt =~ /^--config(uration)$/) {
    283             splice(@ARGV, $i, 1);
    284             $configuration = splice(@ARGV, $i, 1);
    285             return;
    286         }
    287     }
    288 
    289276    determineBaseProductDir();
    290277    if (open CONFIGURATION, "$baseProductDir/Configuration") {
     
    315302
    316303    determineBaseProductDir();
    317 
    318     # Look for explicit setting first
    319     my @explicitArchs;
    320     for (my $i = 0; $i <= $#ARGV; $i++) {
    321         my $opt = $ARGV[$i];
    322 
    323         if ($opt =~ /^--arch(itecture)?$/) {
    324             splice(@ARGV, $i, 1);
    325             push @explicitArchs, splice(@ARGV, $i--, 1);
    326         } elsif ($opt =~ /^ARCHS=(.*)$/) {
    327             push @explicitArchs, split(/\w/, $1);
    328             splice(@ARGV, $i--, 1);
    329         }
    330     }
    331 
    332     # Make explicit arch settings forgiving – remove duplicate settings
    333     # and allow for specifying architectures with both --arch and appending
    334     # Xcode-style ARCHS=(.*)
    335     @explicitArchs = sort keys %{{ map { $_ => 1 } @explicitArchs }};
    336 
    337     if (scalar(@explicitArchs)) {
    338         $architecture = join(' ', @explicitArchs) if @explicitArchs;
    339         return;
    340     }
    341304
    342305    if (isGtk()) {
     
    421384    push(@args, '--release') if $configuration eq "Release";
    422385    push(@args, '--32-bit') if $architecture ne "x86_64";
    423     push(@args, '--sdk', $xcodeSDK) if defined $xcodeSDK;
    424386    push(@args, '--qt') if isQt();
    425387    push(@args, '--gtk') if isGtk();
     
    435397}
    436398
    437 sub determineXcodeSDK
    438 {
    439     return if defined $xcodeSDK;
    440     for (my $i = 0; $i <= $#ARGV; $i++) {
    441         my $opt = $ARGV[$i];
    442         if ($opt =~ /^--sdk$/i) {
    443             splice(@ARGV, $i, 1);
    444             $xcodeSDK = splice(@ARGV, $i, 1);
    445         } elsif ($opt =~ /^--device$/i) {
    446             splice(@ARGV, $i, 1);
    447             $xcodeSDK = 'iphoneos.internal';
    448         } elsif ($opt =~ /^--sim(ulator)?/i) {
    449             splice(@ARGV, $i, 1);
    450             $xcodeSDK = 'iphonesimulator';
    451         }
    452     }
    453     $xcodeSDK ||= '/';
    454 
    455     chomp $xcodeSDK;
    456 }
    457 
    458 sub xcodeSDK
    459 {
    460     determineXcodeSDK();
    461     return $xcodeSDK;
    462 }
    463 
    464399sub determineConfigurationForVisualStudio
    465400{
     
    586521    determineConfiguration();
    587522    determineArchitecture();
    588     determineXcodeSDK();
    589     my @archFlags = map { ('-arch', $_) } split(/ /, $architecture);
    590     return (@baseProductDirOption, "-configuration", $configuration, "-sdk", $xcodeSDK, @archFlags, argumentsForXcode());
     523    return (@baseProductDirOption, "-configuration", $configuration, "ARCHS=$architecture", argumentsForXcode());
    591524}
    592525
Note: See TracChangeset for help on using the changeset viewer.