Skip to content
Permalink
Browse files
2010-07-20 Tony Chang <tony@chromium.org>
        Reviewed by David Levin.

        [chromium] only pass --force to gclient sync if explicitly stated
        https://bugs.webkit.org/show_bug.cgi?id=42581

        * BuildSlaveSupport/build.webkit.org-config/master.cfg: bots should
              always pass --force since it's hard to do manual cleanups
        * Scripts/update-webkit-chromium: only pass --force if --force is
              passed in

Canonical link: https://commits.webkit.org/54586@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63748 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
idealisms committed Jul 20, 2010
1 parent 20b7eec commit 77c5e546f6a37e0efed7897a0a7f0bb98be251d2
Showing with 23 additions and 3 deletions.
  1. +1 −1 WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
  2. +12 −0 WebKitTools/ChangeLog
  3. +10 −2 WebKitTools/Scripts/update-webkit-chromium
@@ -65,7 +65,7 @@ class InstallChromiumDependencies(shell.ShellCommand):
name = "gclient"
description = ["updating chromium dependencies"]
descriptionDone = ["updated chromium dependencies"]
command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium"]
command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium", "--force"]
haltOnFailure = True


@@ -1,3 +1,15 @@
2010-07-20 Tony Chang <tony@chromium.org>

Reviewed by David Levin.

[chromium] only pass --force to gclient sync if explicitly stated
https://bugs.webkit.org/show_bug.cgi?id=42581

* BuildSlaveSupport/build.webkit.org-config/master.cfg: bots should
always pass --force since it's hard to do manual cleanups
* Scripts/update-webkit-chromium: only pass --force if --force is
passed in

2010-07-19 Anders Carlsson <andersca@apple.com>

Fix build.
@@ -29,6 +29,7 @@
# Update script for the WebKit Chromium Port.

use File::Path;
use Getopt::Long;

chdir("WebKit/chromium") or die $!;

@@ -47,11 +48,18 @@ if (`gclient --version`) {
if (! -e ".gclient") {
# If .gclient configuration file doesn't exist, create it.
print "Configuring gclient...\n";
system($gclientPath,
system($gclientPath,
"config",
"--spec=solutions=[{'name':'./','url':None}]") == 0 or die $!;
}

my $force = 0;
GetOptions(
'force' => \$force,
);

# Execute gclient sync.
print "Updating chromium port dependencies using gclient...\n";
system($gclientPath, "sync", "--force") == 0 or die $!;
my @gclientArgs = ($gclientPath, "sync");
push @gclientArgs, "--force" if $force;
system(@gclientArgs) == 0 or die $!;

0 comments on commit 77c5e54

Please sign in to comment.