Changeset 151523 in webkit

Timestamp:

Jun 12, 2013 1:46:18 PM (11 years ago)

Author:

Hugo Parente Lima

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (5 diffs)
• Scripts/update-webkit (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/Scripts/build-webkit

@@ -52 +52 @@
 my $showHelp = 0;
 my $clean = 0;
-my $useGYP = 0;
 my $minimal = 0;
 my $installHeaders;
@@ -114 +113 @@
   --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)
 
@@ -145 +143 @@
     'help' => \$showHelp,
     'clean' => \$clean,
-    'gyp' => \$useGYP,
     'install-headers=s' => \$installHeaders,
     'install-libs=s' => \$installLibs,
@@ -206 +203 @@
 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";
 }
 
@@ -335 +327 @@
         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()) {

trunk/Tools/Scripts/update-webkit

@@ -46 +46 @@
 my $quiet = '';
 my $showHelp;
-my $useGYP = 0;
 
 determineIsQt();
@@ -56 +55 @@
     'h|help'  => \$showHelp,
     'q|quiet' => \$quiet,
-    'gyp' => \$useGYP,
 ); 
 
@@ -64 +62 @@
   -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__
@@ -94 +91 @@
 
 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;