Changeset 140939 in webkit
- Timestamp:
- Jan 27, 2013 8:22:30 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r140912 r140939 1 2013-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 1 12 2013-01-26 David Farler <dfarler@apple.com> 2 13 -
trunk/Makefile
r140912 r140939 5 5 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 6 6 7 debug d :7 debug d development dev develop: 8 8 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 9 9 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 10 10 11 release r :11 release r deployment dep deploy: 12 12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 13 13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done -
trunk/Makefile.shared
r140912 r140939 1 1 SCRIPTS_PATH ?= ../Tools/Scripts 2 XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) 2 3 3 SDK = /4 5 ifneq (,$(findstring iphoneos,$(SDK)))6 ARCHS = armv77 else ifneq (,$(findstring iphonesimulator,$(SDK)))8 ARCHS = i3869 else ifneq (,$(findstring macosx,$(SDK)))10 ARCHS = x86_6411 else12 ARCHS = x86_6413 endif14 15 ARCH_FLAGS=$(addprefix --arch ,$(ARCHS))16 4 DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default") 17 5 VERBOSITY ?= $(DEFAULT_VERBOSITY) … … 27 15 endif 28 16 29 define xcode-options 30 $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- --sdk $(SDK) $1 $(ARCH_FLAGS) $(ARGS)) 31 endef 17 all: 18 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) 32 19 33 all: 34 xcodebuild $(OTHER_OPTIONS) $(call xcode-options,) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} 20 debug d development dev develop: force 21 $(SCRIPTS_PATH)/set-webkit-configuration --debug 22 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) 35 23 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 24 release r deployment dep deploy: force 41 25 $(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]} ) 43 27 44 28 clean: 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]} ) 46 30 47 31 force: ; -
trunk/Source/Makefile
r140912 r140939 1 1 MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2 2 3 IOS_DONT_BUILD = WebKit24 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 endif10 2 11 3 all: … … 13 5 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 14 6 15 debug d :7 debug d development dev develop: 16 8 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 17 9 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 18 10 19 release r :11 release r deployment dep deploy: 20 12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 21 13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done -
trunk/Tools/ChangeLog
r140930 r140939 1 2013-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 1 12 2013-01-27 Zoltan Arvai <zarvai@inf.u-szeged.hu> 2 13 -
trunk/Tools/DumpRenderTree/Makefile
r140912 r140939 1 1 SCRIPTS_PATH = ../Scripts 2 3 ifneq (,$(findstring iphoneos,$(SDK)))4 OTHER_OPTIONS += -target All-iOS5 else ifneq (,$(findstring iphonesimulator,$(SDK)))6 OTHER_OPTIONS += -target All-iOS7 endif8 9 2 include ../../Makefile.shared -
trunk/Tools/Makefile
r140912 r140939 1 1 MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI 2 3 IOS_DONT_BUILD = WebKitTestRunner MiniBrowser TestWebKitAPI4 IPHONEOS_DONT_BUILD = DumpRenderTree5 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 endif12 2 13 3 all: … … 15 5 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 16 6 17 debug d :7 debug d development dev develop: 18 8 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 19 9 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 20 10 21 release r :11 release r deployment dep deploy: 22 12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 23 13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done -
trunk/Tools/Scripts/webkitdirs.pm
r140912 r140939 81 81 my @baseProductDirOption; 82 82 my $configuration; 83 my $xcodeSDK;84 my $xcodeSDKVersion;85 83 my $configurationForVisualStudio; 86 84 my $configurationProductDir; … … 276 274 { 277 275 return if defined $configuration; 278 279 # Look for explicit setting first280 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 289 276 determineBaseProductDir(); 290 277 if (open CONFIGURATION, "$baseProductDir/Configuration") { … … 315 302 316 303 determineBaseProductDir(); 317 318 # Look for explicit setting first319 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 settings333 # and allow for specifying architectures with both --arch and appending334 # Xcode-style ARCHS=(.*)335 @explicitArchs = sort keys %{{ map { $_ => 1 } @explicitArchs }};336 337 if (scalar(@explicitArchs)) {338 $architecture = join(' ', @explicitArchs) if @explicitArchs;339 return;340 }341 304 342 305 if (isGtk()) { … … 421 384 push(@args, '--release') if $configuration eq "Release"; 422 385 push(@args, '--32-bit') if $architecture ne "x86_64"; 423 push(@args, '--sdk', $xcodeSDK) if defined $xcodeSDK;424 386 push(@args, '--qt') if isQt(); 425 387 push(@args, '--gtk') if isGtk(); … … 435 397 } 436 398 437 sub determineXcodeSDK438 {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 xcodeSDK459 {460 determineXcodeSDK();461 return $xcodeSDK;462 }463 464 399 sub determineConfigurationForVisualStudio 465 400 { … … 586 521 determineConfiguration(); 587 522 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()); 591 524 } 592 525
Note: See TracChangeset
for help on using the changeset viewer.