WebKit Bugzilla
Attachment 371456 Details for
Bug 198589
: Add --[no]-xcbuild to build-* scripts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198589-20190605172029.patch (text/plain), 8.22 KB, created by
Jonathan Bedard
on 2019-06-05 17:20:33 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Jonathan Bedard
Created:
2019-06-05 17:20:33 PDT
Size:
8.22 KB
patch
obsolete
>Index: Tools/ChangeLog >=================================================================== >--- Tools/ChangeLog (revision 246133) >+++ Tools/ChangeLog (working copy) >@@ -1,3 +1,25 @@ >+2019-06-05 Jonathan Bedard <jbedard@apple.com> >+ >+ Add --[no]-xcbuild to build-* scripts >+ https://bugs.webkit.org/show_bug.cgi?id=198589 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ The --no-xcbuild flag is needed for ASan builds, and right now, only >+ build-webkit supports it. We should add this flag to all of the build-* >+ scripts used by run-webkit-tests. >+ >+ * Scripts/build-api-tests: >+ * Scripts/build-dumprendertree: >+ * Scripts/build-imagediff: >+ * Scripts/build-lldbwebkittester: >+ * Scripts/build-webkit: >+ * Scripts/build-webkittestrunner: >+ * Scripts/webkitdirs.pm: >+ (XcodeOptions): >+ (setUsingXCBuild): >+ (canUseXCBuild): Deleted. >+ > 2019-06-05 Alex Christensen <achristensen@webkit.org> > > Re-enable safe browsing in WKWebView >Index: Tools/Scripts/build-api-tests >=================================================================== >--- Tools/Scripts/build-api-tests (revision 246128) >+++ Tools/Scripts/build-api-tests (working copy) >@@ -35,19 +35,22 @@ use POSIX; > my $showHelp = 0; > my $clean = 0; > my $wtfOnly = 0; >+my $xcbuild = undef; > > my $programName = basename($0); > my $usage = <<EOF; > Usage: $programName [options] [options to pass to build system] >- --help Show this help message >- --clean Clean up the build directory >- --wtf-only Only build TestWTF and its dependencies >+ --help Show this help message >+ --clean Clean up the build directory >+ --wtf-only Only build TestWTF and its dependencies >+ --[no-]xcbuild Force the use of XCBuild or not > EOF > > GetOptions( > 'help' => \$showHelp, > 'clean' => \$clean, > 'wtf-only' => \$wtfOnly, >+ 'xcbuild!' => \$xcbuild, > ); > > if ($showHelp) { >@@ -55,6 +58,8 @@ if ($showHelp) { > exit 1; > } > >+setUsingXCBuild($xcbuild); >+ > checkRequiredSystemConfig(); > setConfiguration(); > chdirWebKit(); >Index: Tools/Scripts/build-dumprendertree >=================================================================== >--- Tools/Scripts/build-dumprendertree (revision 246128) >+++ Tools/Scripts/build-dumprendertree (working copy) >@@ -37,18 +37,21 @@ use POSIX; > > my $showHelp = 0; > my $clean = 0; >+my $xcbuild = undef; > > my $programName = basename($0); > my $usage = <<EOF; > Usage: $programName [options] [options to pass to build system] >- --help Show this help message >- --clean Clean up the build directory >- --gtk Build the GTK+ port >+ --help Show this help message >+ --clean Clean up the build directory >+ --gtk Build the GTK+ port >+ --[no-]xcbuild Force the use of XCBuild or not > EOF > > GetOptions( > 'help' => \$showHelp, > 'clean' => \$clean, >+ 'xcbuild!' => \$xcbuild, > ); > > if ($showHelp) { >@@ -56,6 +59,8 @@ if ($showHelp) { > exit 1; > } > >+setUsingXCBuild($xcbuild); >+ > checkRequiredSystemConfig(); > setConfiguration(); > chdirWebKit(); >Index: Tools/Scripts/build-imagediff >=================================================================== >--- Tools/Scripts/build-imagediff (revision 246128) >+++ Tools/Scripts/build-imagediff (working copy) >@@ -37,17 +37,20 @@ use POSIX; > > my $showHelp = 0; > my $clean = 0; >+my $xcbuild = undef; > > my $programName = basename($0); > my $usage = <<EOF; > Usage: $programName [options] [options to pass to build system] >- --help Show this help message >- --clean Clean up the build directory >+ --help Show this help message >+ --clean Clean up the build directory >+ --[no-]xcbuild Force the use of XCBuild or not > EOF > > my $result = GetOptions( > 'help' => \$showHelp, > 'clean' => \$clean, >+ 'xcbuild!' => \$xcbuild, > ); > > if ($showHelp or not $result) { >@@ -55,6 +58,8 @@ if ($showHelp or not $result) { > exit 1; > } > >+setUsingXCBuild($xcbuild); >+ > checkRequiredSystemConfig(); > setConfiguration(); > chdirWebKit(); >Index: Tools/Scripts/build-lldbwebkittester >=================================================================== >--- Tools/Scripts/build-lldbwebkittester (revision 246128) >+++ Tools/Scripts/build-lldbwebkittester (working copy) >@@ -38,17 +38,20 @@ sub buildProjectOrDie($$); > > my $showHelp; > my $clean = 0; >+my $xcbuild = undef; > > my $programName = basename($0); > my $usage = <<EOF; > Usage: $programName [options] [options to pass to build system] >- --help Show this help message >- --clean Clean up the build directory >+ --help Show this help message >+ --clean Clean up the build directory >+ --[no-]xcbuild Force the use of XCBuild or not > EOF > > my $result = GetOptions( > "help" => \$showHelp, > "clean" => \$clean, >+ 'xcbuild!' => \$xcbuild, > ); > > if ($showHelp || !$result) { >@@ -61,6 +64,8 @@ if (!isAppleMacWebKit()) { > exit 1; > } > >+setUsingXCBuild($xcbuild); >+ > checkRequiredSystemConfig(); > setConfiguration(); > chdirWebKit(); >Index: Tools/Scripts/build-webkit >=================================================================== >--- Tools/Scripts/build-webkit (revision 246128) >+++ Tools/Scripts/build-webkit (working copy) >@@ -73,11 +73,11 @@ my $coverageSupport = 0; > my $shouldRunStaticAnalyzer = 0; > my $noExperimentalFeatures = 0; > my $ltoMode = "default"; >-my $xcbuild = undef; > my $startTime = time(); > my $archs32bit = 0; > my $skipLibraryUpdate = 0; > my $useCCache = -1; >+my $xcbuild = undef; > > my @features = getFeatureOptionList(); > >@@ -182,6 +182,7 @@ if ($useCCache == 1) { > $ENV{'WK_USE_CCACHE'} = "NO"; > } > >+setUsingXCBuild($xcbuild); > > my $productDir = productDir(); > >@@ -211,17 +212,6 @@ my @options = (); > if (isAppleCocoaWebKit()) { > push @options, XcodeOptions(); > >- if (not defined $xcbuild) { >- $xcbuild = canUseXCBuild(); >- } >- >- if ($xcbuild) { >- push @options, "-UseNewBuildSystem=YES"; >- push @options, "USE_NEW_BUILD_SYSTEM=YES"; >- } else { >- push @options, "-UseNewBuildSystem=NO"; >- } >- > sub option($$) > { > my ($feature, $isEnabled) = @_; >Index: Tools/Scripts/build-webkittestrunner >=================================================================== >--- Tools/Scripts/build-webkittestrunner (revision 246128) >+++ Tools/Scripts/build-webkittestrunner (working copy) >@@ -34,17 +34,20 @@ use POSIX; > > my $showHelp = 0; > my $clean = 0; >+my $xcbuild = undef; > > my $programName = basename($0); > my $usage = <<EOF; > Usage: $programName [options] [options to pass to build system] >- --help Show this help message >- --clean Clean up the build directory >+ --help Show this help message >+ --clean Clean up the build directory >+ --[no-]xcbuild Force the use of XCBuild or not > EOF > > GetOptions( > 'help' => \$showHelp, > 'clean' => \$clean, >+ 'xcbuild!' => \$xcbuild, > ); > > if ($showHelp) { >@@ -52,6 +55,8 @@ if ($showHelp) { > exit 1; > } > >+setUsingXCBuild($xcbuild); >+ > checkRequiredSystemConfig(); > setConfiguration(); > chdirWebKit(); >Index: Tools/Scripts/webkitdirs.pm >=================================================================== >--- Tools/Scripts/webkitdirs.pm (revision 246128) >+++ Tools/Scripts/webkitdirs.pm (working copy) >@@ -93,6 +93,7 @@ BEGIN { > &shutDownIOSSimulatorDevice > &willUseIOSDeviceSDK > &willUseIOSSimulatorSDK >+ &setUsingXCBuild > DO_NOT_USE_OPEN_COMMAND > SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT > USE_OPEN_COMMAND >@@ -154,6 +155,7 @@ my $portName; > my $shouldUseGuardMalloc; > my $shouldNotUseNinja; > my $xcodeVersion; >+my $usingXCBuild = undef; > > my $unknownPortProhibited = 0; > >@@ -868,6 +870,12 @@ sub XcodeOptions > push @options, "CODE_SIGNING_REQUIRED=NO"; > } > } >+ if (defined $usingXCBuild && $usingXCBuild) { >+ push @options, "-UseNewBuildSystem=YES"; >+ push @options, "USE_NEW_BUILD_SYSTEM=YES"; >+ } else { >+ push @options, "-UseNewBuildSystem=NO"; >+ } > push @options, argumentsForXcode(); > return @options; > } >@@ -895,9 +903,9 @@ sub XcodeStaticAnalyzerOption() > return "RUN_CLANG_STATIC_ANALYZER=YES"; > } > >-sub canUseXCBuild() >+sub setUsingXCBuild($) > { >- return 0; >+ ($usingXCBuild) = @_; > } > > my $passedConfiguration;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=371456">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
ap
:
review-
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198589
: 371456