diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Tools/Scripts/update-webkit | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Tools/Scripts/update-webkit')
| -rwxr-xr-x | Tools/Scripts/update-webkit | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Tools/Scripts/update-webkit b/Tools/Scripts/update-webkit index c6e54f3..5c132ae 100755 --- a/Tools/Scripts/update-webkit +++ b/Tools/Scripts/update-webkit @@ -45,6 +45,7 @@ sub runGitUpdate(); # Handle options my $quiet = ''; my $showHelp; +my $useGYP = 0; determineIsChromium(); @@ -53,6 +54,7 @@ chdirWebKit(); my $getOptionsResult = GetOptions( 'h|help' => \$showHelp, 'q|quiet' => \$quiet, + 'gyp' => \$useGYP, ); if (!$getOptionsResult || $showHelp) { @@ -61,6 +63,7 @@ Usage: @{[ basename($0) ]} [options] --chromium also update dependencies of the chromium port -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,6 +100,11 @@ 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() |