Changeset 40556 in webkit
- Timestamp:
- Feb 3, 2009 4:39:11 PM (15 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r40430 r40556 1 2009-02-02 miggilin <mr.diggilin@gmail.com> 2 3 Reviewed by Darin Adler. 4 5 Change the way wxWidgets build gets arguments. 6 Change "checkForArgumentAndRemoveFromARGV" in build-webkit to check if the 7 argument passed matches one in ARGV exactly (allows, ie, --wx-args not to be 8 removed when --wx is checked for). 9 10 https://bugs.webkit.org/show_bug.cgi?id=23701 11 12 * Scripts/build-webkit: 13 * Scripts/webkitdirs.pm: 14 1 15 2009-01-30 Chris Fleizach <cfleizach@apple.com> 2 16 -
trunk/WebKitTools/Scripts/build-webkit
r38965 r40556 124 124 chdirWebKit(); 125 125 126 # FIXME: Migrate build-wxwebkit commands into build-webkit.127 126 if (isWx()) { 128 my @opts = ();129 127 $ENV{"WEBKITOUTPUTDIR"} = productDir(); 130 foreach (@ARGV) { 131 if ($_ eq "wxgc" || $_ eq "wxpython") { 132 push(@opts, $_); 133 } 134 } 128 129 my @opts = getWxArgs(); 130 135 131 if ($clean) { 136 132 push(@opts, "clean"); -
trunk/WebKitTools/Scripts/webkitdirs.pm
r40073 r40556 57 57 my $isGtk; 58 58 my $isWx; 59 my @wxArgs; 59 60 my $isChromium; 60 61 my $forceRun64Bit; … … 526 527 my $argToCheck = shift; 527 528 foreach my $opt (@ARGV) { 528 if ($opt =~ /^$argToCheck /i ) {529 @ARGV = grep(!/^$argToCheck /i, @ARGV);529 if ($opt =~ /^$argToCheck$/i ) { 530 @ARGV = grep(!/^$argToCheck$/i, @ARGV); 530 531 return 1; 531 532 } … … 575 576 return if defined($isWx); 576 577 $isWx = checkForArgumentAndRemoveFromARGV("--wx"); 578 } 579 580 sub getWxArgs() 581 { 582 if (!@wxArgs) { 583 @wxArgs = (""); 584 my $rawWxArgs = ""; 585 foreach my $opt (@ARGV) { 586 if ($opt =~ /^--wx-args/i ) { 587 @ARGV = grep(!/^--wx-args/i, @ARGV); 588 $rawWxArgs = $opt; 589 $rawWxArgs =~ s/--wx-args=//i; 590 } 591 } 592 @wxArgs = split(/,/, $rawWxArgs); 593 } 594 return @wxArgs; 577 595 } 578 596
Note: See TracChangeset
for help on using the changeset viewer.