Changeset 27930 in webkit

Timestamp:

Nov 20, 2007 10:01:54 AM (16 years ago)

Author:

treat@webkit.org

Message:

• Prepend git branch name to $baseProductDir

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (3 diffs)
• Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-11-20  Adam Treat  <treat@kde.org>
+
+        Reviewed by David Kilzer.
+
+        * Prepend git branch name to $baseProductDir
+
+        * Scripts/VCSUtils.pm:
+        * Scripts/webkitdirs.pm:
+
 2007-11-20  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -30 +30 @@
 use warnings;
 use File::Spec;
+use webkitdirs;
 
 BEGIN {
@@ -45 +46 @@
 my $isGit;
 my $isSVN;
+my $gitBranch;
+my $isGitBranchBuild;
 
 sub isGitDirectory($)
@@ -58 +61 @@
     $isGit = isGitDirectory(".");
     return $isGit;
+}
+
+sub gitBranch()
+{
+    unless (defined $gitBranch) {
+        chomp($gitBranch = `git symbolic-ref -q HEAD`);
+        $gitBranch = "" if exitStatus($?);
+        $gitBranch =~ s#^refs/heads/##;
+        $gitBranch = "" if $gitBranch eq "master";
+    }
+
+    return $gitBranch;
+}
+
+sub isGitBranchBuild()
+{
+    my $branch = gitBranch();
+    chomp(my $override = `git config --bool branch.$branch.webKitBranchBuild`);
+    return 1 if $override eq "true";
+    return 0 if $override eq "false";
+
+    unless (defined $isGitBranchBuild) {
+        chomp(my $gitBranchBuild = `git config --bool core.webKitBranchBuild`);
+        $isGitBranchBuild = $gitBranchBuild eq "true";
+    }
+
+    return $isGitBranchBuild;
 }
 

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -32 +32 @@
 use File::Basename;
 use POSIX;
+use VCSUtils;
 
 BEGIN {
@@ -125 +126 @@
     if (!defined($baseProductDir)) {
         $baseProductDir = "$sourceDir/WebKitBuild";
+
+        if (isGit() && isGitBranchBuild()) {
+            my $branch = gitBranch();
+            $baseProductDir = "$baseProductDir/$branch";
+        }
+
         @baseProductDirOption = ("SYMROOT=$baseProductDir", "OBJROOT=$baseProductDir") if (isOSX());
         if (isCygwin()) {
@@ -722 +729 @@
     my $dir = baseProductDir();
     if (! -d $dir) {
-        mkdir $dir or die "Failed to create product directory " . $dir;
+        system "mkdir", "-p", "$dir";
+        if (! -d $dir) {
+            die "Failed to create product directory " . $dir;
+        }
     }
     $dir = $dir . "/$config";
     if (! -d $dir) {
-        mkdir $dir or die "Failed to create build directory " . $dir;
+        system "mkdir", "-p", "$dir";
+        if (! -d $dir) {
+            die "Failed to create build directory " . $dir;
+        }
     }