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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151523 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 54a6c0a26c8cbfc1b2a4df22677e211eef098e8f..c0c3f214111d1f77df34bfaf0bccfb09973f5e6b 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2013-06-12  Hugo Parente Lima  <hugo.lima@openbossa.org>
+
+        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  <hugo.lima@openbossa.org>
 
         Remove forgotten unused Tools/Script/make-gypi script

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 387221c2b9a5708ee0832ce26da42babd5a01969..e3dd91939b3d514030893f51a228c67837dd9e56 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -51,7 +51,6 @@ chdirWebKit();
 
 my $showHelp = 0;
 my $clean = 0;
-my $useGYP = 0;
 my $minimal = 0;
 my $installHeaders;
 my $installLibs;
@@ -113,7 +112,6 @@ Usage: $programName [options] [options to pass to build system]
   --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 @@ EOF
 my %options = (
     'help' => \$showHelp,
     'clean' => \$clean,
-    'gyp' => \$useGYP,
     'install-headers=s' => \$installHeaders,
     'install-libs=s' => \$installLibs,
     'prefix=s' => \$prefixPath,
@@ -207,11 +204,6 @@ if (!isQt() && !-d "WebKitLibraries") {
     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 @@ for my $dir (@projects) {
     } elsif (isAppleMacWebKit()) {
         my @local_options = @options;
         push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE";
-        my $useGYPProject = $useGYP && ($project =~ "WebCore|JavaScriptCore");
-        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") {

diff --git a/Tools/Scripts/update-webkit b/Tools/Scripts/update-webkit
index bdb97e62f43eab3e1f467a6a21af98c5c881018b..485eb748b3ddcccf27cceff873ec0cbd550277a9 100755 (executable)
--- a/Tools/Scripts/update-webkit
+++ b/Tools/Scripts/update-webkit
@@ -45,7 +45,6 @@ sub runGitUpdate();
 # Handle options
 my $quiet = '';
 my $showHelp;
-my $useGYP = 0;
 
 determineIsQt();
 determineIsWinCairo();
@@ -55,7 +54,6 @@ chdirWebKit();
 my $getOptionsResult = GetOptions(
     'h|help'  => \$showHelp,
     'q|quiet' => \$quiet,
-    'gyp' => \$useGYP,
 ); 
 
 if (!$getOptionsResult || $showHelp) {
@@ -63,7 +61,6 @@ if (!$getOptionsResult || $showHelp) {
 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 @@ if (-d "../Internal") {
 
 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()