Title: [151523] trunk/Tools
- Revision
- 151523
- Author
- [email protected]
- Date
- 2013-06-12 13:46:18 -0700 (Wed, 12 Jun 2013)
Log Message
Remove last bits of GYP from build-webkit and update-webkit scripts
https://bugs.webkit.org/show_bug.cgi?id=117557
Reviewed by Ryosuke Niwa.
* Scripts/build-webkit:
* Scripts/update-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (151522 => 151523)
--- trunk/Tools/ChangeLog 2013-06-12 20:18:16 UTC (rev 151522)
+++ trunk/Tools/ChangeLog 2013-06-12 20:46:18 UTC (rev 151523)
@@ -1,5 +1,15 @@
2013-06-12 Hugo Parente Lima <[email protected]>
+ Remove last bits of GYP from build-webkit and update-webkit scripts
+ https://bugs.webkit.org/show_bug.cgi?id=117557
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/build-webkit:
+ * Scripts/update-webkit:
+
+2013-06-12 Hugo Parente Lima <[email protected]>
+
Remove forgotten unused Tools/Script/make-gypi script
https://bugs.webkit.org/show_bug.cgi?id=117558
Modified: trunk/Tools/Scripts/build-webkit (151522 => 151523)
--- trunk/Tools/Scripts/build-webkit 2013-06-12 20:18:16 UTC (rev 151522)
+++ trunk/Tools/Scripts/build-webkit 2013-06-12 20:46:18 UTC (rev 151523)
@@ -51,7 +51,6 @@
my $showHelp = 0;
my $clean = 0;
-my $useGYP = 0;
my $minimal = 0;
my $installHeaders;
my $installLibs;
@@ -113,7 +112,6 @@
--sdk=<sdk> Use a specific Xcode SDK (iOS and Mac only)
--device Use the current iphoneos.internal SDK (iOS only)
--simulator Use the current iphonesimulator SDK (iOS only)
- --gyp Use GYP-generated project files
--coverage Enable Code Coverage support (Mac only)
--blackberry Build the BlackBerry port on Mac/Linux
@@ -144,7 +142,6 @@
my %options = (
'help' => \$showHelp,
'clean' => \$clean,
- 'gyp' => \$useGYP,
'install-headers=s' => \$installHeaders,
'install-libs=s' => \$installLibs,
'prefix=s' => \$prefixPath,
@@ -207,11 +204,6 @@
die "Error: No WebKitLibraries directory found. Please do a fresh checkout.\n";
}
-# Generate the generate project files from .gyp files
-if ($useGYP) {
- system("perl", "Tools/Scripts/generate-project-files") == 0 or die "Failed to run generate-project-files";
-}
-
my @options = ();
if (isAppleMacWebKit()) {
@@ -334,9 +326,7 @@
} elsif (isAppleMacWebKit()) {
my @local_options = @options;
push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE";
- my $useGYPProject = $useGYP && ($project =~ "WebCore|_javascript_Core");
- my $projectPath = $useGYPProject ? "gyp/$project" : $project;
- $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
+ my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
$result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
} elsif (isAppleWinWebKit()) {
if ($project eq "WebKit") {
Modified: trunk/Tools/Scripts/update-webkit (151522 => 151523)
--- trunk/Tools/Scripts/update-webkit 2013-06-12 20:18:16 UTC (rev 151522)
+++ trunk/Tools/Scripts/update-webkit 2013-06-12 20:46:18 UTC (rev 151523)
@@ -45,7 +45,6 @@
# Handle options
my $quiet = '';
my $showHelp;
-my $useGYP = 0;
determineIsQt();
determineIsWinCairo();
@@ -55,7 +54,6 @@
my $getOptionsResult = GetOptions(
'h|help' => \$showHelp,
'q|quiet' => \$quiet,
- 'gyp' => \$useGYP,
);
if (!$getOptionsResult || $showHelp) {
@@ -63,7 +61,6 @@
Usage: @{[ basename($0) ]} [options]
-h|--help show the help message
-q|--quiet pass -q to svn update for quiet updates
- --gyp generate project files from gyp after update
--wincairo also update dependencies of the WinCairo port
__END__
exit 1;
@@ -94,11 +91,6 @@
setupAppleWinEnv() if isAppleWinWebKit();
-if ($useGYP) {
- print "Generating Project Files\n";
- system("perl", "Tools/Scripts/generate-project-files") == 0 or die "Failed to run generate-project-files";
-}
-
exit 0;
sub runSvnUpdate()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
