2007-10-01 Mark Rowe <mrowe@apple.com>

        * BuildSlaveSupport/build-launcher-dmg: Tweak once more to handle nightly builds for branches.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/build-launcher-dmg b/WebKitTools/BuildSlaveSupport/build-launcher-dmg
index 89321bf64c39fdb16714bc3e116ffbd583f31301..4dce7fbdd6c0f3f294de3b7ff65c7e3707271d6e 100755 (executable)
--- a/WebKitTools/BuildSlaveSupport/build-launcher-dmg
+++ b/WebKitTools/BuildSlaveSupport/build-launcher-dmg
@@ -86,10 +86,10 @@ sub buildDiskImage
 sub uploadNightlyDiskImage
 {
     my $buildTag = shift(@_);
-    my $nightlyRemoteDiskImagePath = "$nightlyRemotePath/builds/$buildTag/" . basename($nightlyLauncherDiskImagePath);
+    my $nightlyRemoteDiskImagePath = "$nightlyRemotePath/builds/$buildTag/mac/" . basename($nightlyLauncherDiskImagePath);
     my $revision = currentSVNRevision();
     system("rsync", "-vP", $nightlyLauncherDiskImagePath, "$nightlyRemoteHost:$nightlyRemoteDiskImagePath") == 0 or die "Failed uploading disk image";
-    system("ssh", $nightlyRemoteHost, $nightlyRemoteLatestPath, $buildTag, $nightlyRemoteDiskImagePath, $revision) == 0 or die "Failed linking disk image to latest";
+    system("ssh", $nightlyRemoteHost, $nightlyRemoteLatestPath, $buildTag, "mac", $nightlyRemoteDiskImagePath, $revision) == 0 or die "Failed linking disk image to latest";
 }
 
 sub uploadBuildSlaveDiskImage
@@ -101,15 +101,11 @@ sub uploadBuildSlaveDiskImage
 
 my $uploadTo;
 my $nightlyBuild = 0;
-my $buildTag = 'mac';
+my $buildTag = 'trunk';
 GetOptions('upload-to-host=s' => \$uploadTo,
            'upload-as-nightly!' => \$nightlyBuild,
            'tag=s' => \$buildTag);
 
-if ($buildTag ne 'mac') {
-    $buildTag = "mac-" . $buildTag;
-}
-
 chdirWebKit();
 buildDiskImage($buildTag);
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2f5700a69647badac33d747e3b8dbe59139ee808..397ff228393cad673096b182d7a93c5f03f2d2d1 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-01  Mark Rowe  <mrowe@apple.com>
+
+        * BuildSlaveSupport/build-launcher-dmg: Tweak once more to handle nightly builds for branches.
+
 2007-10-01  David Kilzer  <ddkilzer@webkit.org>
 
         Reviewed by Hyatt.