[Cmake-commits] CMake branch, next, updated. v2.8.2-485-gff93e6f

[Zach Mullen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ff93e6f65dc70bde382664c2590f3c27130d909a (commit)
       via  7dbc1a2ebd140461c2478e6fdd54eb919f66c25d (commit)
       via  a3d796b9065374ea246b4ffeacc92b7c76120c9b (commit)
      from  137fed46687377477487365a3e5ad38c3b2e151d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff93e6f65dc70bde382664c2590f3c27130d909a
commit ff93e6f65dc70bde382664c2590f3c27130d909a
Merge: 137fed4 7dbc1a2
Author:     Zach Mullen <zach.mullen at kitware.com>
AuthorDate: Wed Aug 18 10:00:45 2010 -0400
Commit:     Zach Mullen <zach.mullen at kitware.com>
CommitDate: Wed Aug 18 10:00:45 2010 -0400

    Merge branch 'fix-cdash-version-uri' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dbc1a2ebd140461c2478e6fdd54eb919f66c25d
commit 7dbc1a2ebd140461c2478e6fdd54eb919f66c25d
Author:     Zach Mullen <zach.mullen at kitware.com>
AuthorDate: Wed Aug 18 09:58:27 2010 -0400
Commit:     Zach Mullen <zach.mullen at kitware.com>
CommitDate: Wed Aug 18 09:58:27 2010 -0400

    Fix hard-coded CDash URI in version query

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 3a777d5..d12fde0 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -410,10 +410,14 @@ std::string cmCTest::GetCDashVersion()
   //First query the server.  If that fails, fall back to the local setting
   std::string response;
   std::string url = "http://";
-  url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
-  
+  url += this->GetCTestConfiguration("DropSite");
+
+  std::string cdashUri = this->GetCTestConfiguration("DropLocation");
+  cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php"));
+
+  url += cdashUri + "/api/getversion.php";
   int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
-  
+
   return res ? this->GetCTestConfiguration("CDashVersion") : response;
 #else
   return this->GetCTestConfiguration("CDashVersion");

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCTest.cxx                |   10 +++++++---
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake