Initial Contribution

1 files changed, 9 insertions, 47 deletions

diff --git a/WebKitTools/BuildSlaveSupport/build-launcher-app b/WebKitTools/BuildSlaveSupport/build-launcher-app
index 79f47bf..19b55c9 100755
--- a/WebKitTools/BuildSlaveSupport/build-launcher-app
+++ b/WebKitTools/BuildSlaveSupport/build-launcher-app
@@ -33,24 +33,14 @@ use strict;
 
 use FindBin;
 use lib "$FindBin::Bin/../Scripts";
-use Cwd 'realpath';
 use webkitdirs;
-use VCSUtils;
-
-my $tigerProductDir = realpath("$FindBin::Bin/../../WebKitBuildTiger");
-my $leopardProductDir = realpath("$FindBin::Bin/../../WebKitBuildLeopard");
-setBaseProductDir($tigerProductDir);
 
 my @xcodeBuildArguments = XcodeOptions();
-unshift @xcodeBuildArguments, "SYMROOT=$tigerProductDir";
-unshift @xcodeBuildArguments, "OBJROOT=$tigerProductDir";
-
 my $nightlyLauncherTemplatePath = "$FindBin::Bin/../WebKitLauncher";
 my $nightlyLauncherStagingPath = productDir() . "/WebKit.app";
 my $droseraProjectPath = "$FindBin::Bin/../Drosera/mac";
 my $droseraStagingPath = productDir() . "/DroseraLauncher.app";
 
-
 sub buildNightlyLauncher
 {
     chdir($nightlyLauncherTemplatePath);
@@ -59,41 +49,21 @@ sub buildNightlyLauncher
     chdirWebKit();
 }
 
-sub currentRevision
+sub currentSVNBranch
 {
     my $sourceDir = sourceDir();
-    if (isSVNDirectory($sourceDir)) {
-        return currentSVNRevision();
-    } elsif (isGitDirectory($sourceDir)) {
-        my $gitLog = `cd $sourceDir && LC_ALL=C git log --grep='git-svn-id: ' -n 1 | grep git-svn-id:`;
-        (my $revision) = ($gitLog =~ m/ +git-svn-id: .+@(\d+) /g);
-        return $revision;
-    }
-}
-
-sub currentBranch
-{
-    my $sourceDir = sourceDir();
-    my ($url, $branch);
-    if (isSVNDirectory($sourceDir)) {
-        my $svnInfo = `LC_ALL=C svn info $sourceDir | grep URL:`;
-        ($url) = ($svnInfo =~ m/URL: (.+)/g);
-    } elsif (isGitDirectory($sourceDir)) {
-        my $gitLog = `cd $sourceDir && LC_ALL=C git log --grep='git-svn-id: ' -n 1 | grep git-svn-id:`;
-        ($url) = ($gitLog =~ m/ +git-svn-id: (.+)@\d+ /g);
-    }
-    ($branch) = ($url =~ m/\/webkit\/(trunk|branches\/[^\/]+)/);
+    my $svnInfo = `LC_ALL=C svn info $sourceDir | grep URL:`;
+    (my $url) = ($svnInfo =~ m/URL: (.+)/g);
+    (my $branch) = ($url =~ m/\/svn\/webkit\/(trunk|branches\/[^\/]+)/);
     die "Unable to determine current SVN branch in $sourceDir" unless (defined $branch);
     $branch =~ s/^branches\///;
-    return $branch;
+    return $branch
 }
 
 sub copyNightlyLauncher
 {
-    my $revision = currentRevision();
-    my $branch = currentBranch();
-    my $configuration = configuration();
-
+    my $revision = currentSVNRevision();
+    my $branch = currentSVNBranch();
     my $infoPlist = "$nightlyLauncherStagingPath/Contents/Info.plist";
     my $versionFile = "$nightlyLauncherStagingPath/Contents/Resources/VERSION";
     my $branchFile = "$nightlyLauncherStagingPath/Contents/Resources/BRANCH";
@@ -119,10 +89,7 @@ sub copyNightlyLauncher
 
     my @frameworks = ("JavaScriptCore", "JavaScriptGlue", "WebCore", "WebKit");
     for my $framework (@frameworks) {
-        my $tigerFramework = "$tigerProductDir/$configuration/$framework.framework";
-        my $leopardFramework = "$leopardProductDir/$configuration/$framework.framework";
-        system("ditto", $tigerFramework, "$nightlyLauncherStagingPath/Contents/Frameworks/10.4/$framework.framework") == 0 or die "Failed copying $tigerFramework into $nightlyLauncherStagingPath";
-        system("ditto", $leopardFramework, "$nightlyLauncherStagingPath/Contents/Frameworks/10.5/$framework.framework") == 0 or die "Failed copying $leopardFramework into $nightlyLauncherStagingPath";
+        system("ditto", productDir() . "/$framework.framework", "$nightlyLauncherStagingPath/Contents/Resources/$framework.framework") == 0 or die "Failed copying $framework.framework into $nightlyLauncherStagingPath";
     }
 }
 
@@ -138,7 +105,7 @@ sub buildDroseraLauncher
 
 sub setDroseraLauncherVersion
 {
-    my $revision = currentRevision();
+    my $revision = currentSVNRevision();
     my $infoPlist = "$droseraStagingPath/Contents/Info.plist";
     my $data;
     open(IN, $infoPlist) or die "Couldn't open Info.plist in built application for reading";
@@ -153,11 +120,6 @@ sub setDroseraLauncherVersion
     close(OUT);
 }
 
-my $b = currentBranch();
-my $r = currentRevision();
-print "Branch: ", $b, "\n";
-print "Revision: ", $r, "\n";
-
 chdirWebKit();
 buildNightlyLauncher();
 copyNightlyLauncher();