Changeset 81735 in webkit

Timestamp:

Mar 22, 2011 6:08:01 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-03-22 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Teach update-webkit about gyp
​https://bugs.webkit.org/show_bug.cgi?id=56881

This makes it possible for someone who builds from Xcode
to just run update-webkit --gyp and have the project files
generated after update automatically.

I also added a stand-alone "generate-project-files" script
wrapping Source/gyp/configure. This makes running gyp simpler
since most people will not have gyp or Source/gyp in their path.

• Scripts/build-webkit:
• Scripts/generate-project-files: Added.
• Scripts/update-webkit:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)
• Scripts/generate-project-files (added)
• Scripts/update-webkit (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-22  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Teach update-webkit about gyp
+        https://bugs.webkit.org/show_bug.cgi?id=56881
+
+        This makes it possible for someone who builds from Xcode
+        to just run update-webkit --gyp and have the project files
+        generated after update automatically.
+
+        I also added a stand-alone "generate-project-files" script
+        wrapping Source/gyp/configure.  This makes running gyp simpler
+        since most people will not have gyp or Source/gyp in their path.
+
+        * Scripts/build-webkit:
+        * Scripts/generate-project-files: Added.
+        * Scripts/update-webkit:
+
 2011-03-22  Anton D'Auria  <adauria@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -424 +424 @@
 # Generate the generate project files from .gyp files
 if ($useGYP) {
-    system("python", "Source/gyp/configure") == 0 or die "Failed to run Source/gyp/configure";
+    system("perl", "Tools/Scripts/generate-project-files") == 0 or die "Failed to run generate-project-files";
 }
 

trunk/Tools/Scripts/update-webkit

@@ -46 +46 @@
 my $quiet = '';
 my $showHelp;
+my $useGYP = 0;
 
 determineIsChromium();
@@ -54 +55 @@
     'h|help'  => \$showHelp,
     'q|quiet' => \$quiet,
+    'gyp' => \$useGYP,
 ); 
 
@@ -62 +64 @@
   -h|--help   show the help message
   -q|--quiet  pass -q to svn update for quiet updates
+  --gyp       generate project files from gyp after update
 __END__
     exit 1;
@@ -97 +100 @@
 
 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;