[Cmake-commits] CMake branch, master, updated. v2.8.9-225-g508ed69
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, master has been updated via 508ed6940b447c2fb6b5fe4f036138ce57ab3c4c (commit) from 6ef858b50195ece350800de746e5c8126dfbae94 (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=508ed6940b447c2fb6b5fe4f036138ce57ab3c4c commit 508ed6940b447c2fb6b5fe4f036138ce57ab3c4c Author: Kitware Robot AuthorDate: Tue Sep 4 00:01:03 2012 -0400 Commit: Kitware Robot CommitDate: Tue Sep 4 00:01:03 2012 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d038f28..fa9b708 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 9) -set(CMake_VERSION_TWEAK 20120903) +set(CMake_VERSION_TWEAK 20120904) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-341-g14c6c72
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 14c6c727e05ab306b4268126ec942c8fa19a1bff (commit) via c0f89e9c146ebb2cbb3c228f09c295875256d989 (commit) from 4501785e4beb907230ba8b6b2d0bdeaeda4d3fdd (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=14c6c727e05ab306b4268126ec942c8fa19a1bff commit 14c6c727e05ab306b4268126ec942c8fa19a1bff Merge: 4501785 c0f89e9 Author: Brad King AuthorDate: Mon Sep 3 16:33:19 2012 -0400 Commit: CMake Topic Stage CommitDate: Mon Sep 3 16:33:19 2012 -0400 Merge topic 'magrathea-release-DT_RUNPATH' into next c0f89e9 magrathea: Tell cmELF about DT_RUNPATH (#13497) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0f89e9c146ebb2cbb3c228f09c295875256d989 commit c0f89e9c146ebb2cbb3c228f09c295875256d989 Author: Brad King AuthorDate: Mon Sep 3 11:11:45 2012 -0400 Commit: Brad King CommitDate: Mon Sep 3 16:30:33 2012 -0400 magrathea: Tell cmELF about DT_RUNPATH (#13497) Our Linux release machine 'magrathea' has a very old Linux to help build portable binaries. It is so old that does not define the DT_RUNPATH constant. Define the correct value in the build flags to activate handling of ELF RUNPATH entries in the binary release. diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake index 1b2ae02..60c1a88 100644 --- a/Utilities/Release/magrathea_release.cmake +++ b/Utilities/Release/magrathea_release.cmake @@ -3,6 +3,8 @@ set(HOST magrathea) set(MAKE_PROGRAM "make") set(CC gcc332s) set(CXX c++332s) +set(CFLAGS -DDT_RUNPATH=29) +set(CXXFLAGS -DDT_RUNPATH=29) set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a --- Summary of changes: Utilities/Release/magrathea_release.cmake |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-339-g4501785
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 4501785e4beb907230ba8b6b2d0bdeaeda4d3fdd (commit)
via 014afaee8ec78763f9d731a90e72263b6c7539d3 (commit)
from 4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8 (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=4501785e4beb907230ba8b6b2d0bdeaeda4d3fdd
commit 4501785e4beb907230ba8b6b2d0bdeaeda4d3fdd
Merge: 4b2710c 014afae
Author: Brad King
AuthorDate: Mon Sep 3 12:17:56 2012 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 3 12:17:56 2012 -0400
Merge topic 'ctest-svn-update' into next
014afae cmCTestSVN: Do not hide base class DoRevision method
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=014afaee8ec78763f9d731a90e72263b6c7539d3
commit 014afaee8ec78763f9d731a90e72263b6c7539d3
Author: Brad King
AuthorDate: Mon Sep 3 12:16:12 2012 -0400
Commit: Brad King
CommitDate: Mon Sep 3 12:16:12 2012 -0400
cmCTestSVN: Do not hide base class DoRevision method
Since cmCTestSVN overrides the Revision structure the DoRevision method
signature changes. Rename the new signature to avoid hiding the
original.
diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index 2fd4440..9628ee9 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -354,7 +354,7 @@ private:
{
if(strcmp(name, "logentry") == 0)
{
- this->SVN->DoRevision(this->Rev, this->Changes);
+ this->SVN->DoRevisionSVN(this->Rev, this->Changes);
}
else if(strcmp(name, "path") == 0 && !this->CData.empty())
{
@@ -423,8 +423,8 @@ void cmCTestSVN::LoadRevisions(SVNInfo &svninfo)
}
//
-void cmCTestSVN::DoRevision(Revision const& revision,
-std::vector const& changes)
+void cmCTestSVN::DoRevisionSVN(Revision const& revision,
+ std::vector const& changes)
{
// Guess the base checkout path from the changes if necessary.
if(this->RootInfo->Base.empty() && !changes.empty())
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index 571af8c..9fc2008 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -78,8 +78,8 @@ private:
void GuessBase(SVNInfo &svninfo, std::vector const& changes);
- void DoRevision(Revision const& revision,
- std::vector const& changes);
+ void DoRevisionSVN(Revision const& revision,
+ std::vector const& changes);
void WriteXMLGlobal(std::ostream& xml);
---
Summary of changes:
Source/CTest/cmCTestSVN.cxx |6 +++---
Source/CTest/cmCTestSVN.h |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-337-g4b2710c
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 4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8 (commit)
via 7f25f559edddb9bb59ae84c889cbb34da259a8f6 (commit)
from 7fbbd9218d02c7c9aac1cae564319dceb19cc9bb (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=4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8
commit 4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8
Merge: 7fbbd92 7f25f55
Author: Brad King
AuthorDate: Mon Sep 3 10:57:03 2012 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 3 10:57:03 2012 -0400
Merge topic 'ctest-svn-update' into next
7f25f55 cmCTestSVN: Rename 'SVNInfo' members to 'SVNRepo'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f25f559edddb9bb59ae84c889cbb34da259a8f6
commit 7f25f559edddb9bb59ae84c889cbb34da259a8f6
Author: Brad King
AuthorDate: Mon Sep 3 10:54:59 2012 -0400
Commit: Brad King
CommitDate: Mon Sep 3 10:54:59 2012 -0400
cmCTestSVN: Rename 'SVNInfo' members to 'SVNRepo'
Without this some compilers complain with errors such as:
Source/CTest/cmCTestSVN.cxx:60: error: declaration of
'cmCTestSVN::SVNInfo& cmCTestSVN::InfoParser::SVNInfo'
Source/CTest/cmCTestSVN.h:37: error: changes meaning of 'SVNInfo' from
'struct cmCTestSVN::SVNInfo'
because the member 'SVNInfo' of the nested InfoParser and LogParser
structs hides the cmCTestSVN::SVNInfo type name.
diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index c439281..2fd4440 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -48,7 +48,7 @@ public:
const char* prefix,
std::string& rev,
SVNInfo& svninfo):
- Rev(rev), SVNInfo(svninfo)
+ Rev(rev), SVNRepo(svninfo)
{
this->SetLog(&svn->Log, prefix);
this->RegexRev.compile("^Revision: ([0-9]+)");
@@ -57,7 +57,7 @@ public:
}
private:
std::string& Rev;
- cmCTestSVN::SVNInfo& SVNInfo;
+ cmCTestSVN::SVNInfo& SVNRepo;
cmsys::RegularExpression RegexRev;
cmsys::RegularExpression RegexURL;
cmsys::RegularExpression RegexRoot;
@@ -69,11 +69,11 @@ private:
}
else if(this->RegexURL.find(this->Line))
{
- this->SVNInfo.URL = this->RegexURL.match(1);
+ this->SVNRepo.URL = this->RegexURL.match(1);
}
else if(this->RegexRoot.find(this->Line))
{
- this->SVNInfo.Root = this->RegexRoot.match(1);
+ this->SVNRepo.Root = this->RegexRoot.match(1);
}
return true;
}
@@ -301,12 +301,12 @@ class cmCTestSVN::LogParser: public
cmCTestVC::OutputLogger,
{
public:
LogParser(cmCTestSVN* svn, const char* prefix, SVNInfo& svninfo):
-OutputLogger(svn->Log, prefix), SVN(svn), SVNInfo(svninfo)
+OutputLogger(svn->Log, prefix), SVN(svn), SVNRepo(svninfo)
{ this->InitializeParser(); }
~LogParser() { this->CleanupParser(); }
private:
cmCTestSVN* SVN;
- cmCTestSVN::SVNInfo& SVNInfo;
+ cmCTestSVN::SVNInfo& SVNRepo;
typedef cmCTestSVN::Revision Revision;
typedef cmCTestSVN::Change Change;
@@ -328,7 +328,7 @@ private:
if(strcmp(name, "logentry") == 0)
{
this->Rev = Revision();
- this->Rev.SVNInfo = &SVNInfo;
+ this->Rev.SVNInfo = &SVNRepo;
if(const char* rev = this->FindAttribute(atts, "revision"))
{
this->Rev.Rev = rev;
@@ -359,7 +359,7 @@ private:
else if(strcmp(name, "path") == 0 && !this->CData.empty())
{
std::string orig_path(&this->CData[0], this->CData.size());
- std::string new_path = SVNInfo.BuildLocalPath( orig_path );
+ std::string new_path = SVNRepo.BuildLocalPath( orig_path );
this->CurChange.Path.assign(new_path);
this->Changes.push_back(this->CurChange);
}
---
Summary of changes:
Source/CTest/cmCTestSVN.cxx | 16
1 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.9-335-g7fbbd92
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 7fbbd9218d02c7c9aac1cae564319dceb19cc9bb (commit)
via b7c97859d7192657ffb777885deefc2856bc2a22 (commit)
via 33607d7997fbdfbccf6c19352e35b2fe068f4e10 (commit)
via 094d2ab68151ca31fb3ca652b118e2df72278232 (commit)
via a22cfdeaf8fee2b417d03bcfbf539011e738ebfd (commit)
via 120d424bb2ec1122b9de49a6e17c8040b86db68c (commit)
via 0873de66e0e5e73fa090626d064d2e7e1d79553e (commit)
via aa1076f4600a94494da355d641aa0a5773a67863 (commit)
from 9c974279539f825f7cf003e51634038c3ef26f9a (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=7fbbd9218d02c7c9aac1cae564319dceb19cc9bb
commit 7fbbd9218d02c7c9aac1cae564319dceb19cc9bb
Merge: 9c97427 b7c9785
Author: Brad King
AuthorDate: Mon Sep 3 10:40:05 2012 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 3 10:40:05 2012 -0400
Merge topic 'ctest-svn-update' into next
b7c9785 cmCTestSVN: Load and process information from externals
33607d7 cmCTestSVN: Add a LoadExternal() function and an ExternalParser
class
094d2ab cmCTestSVN: Use the SVNInfo structure
a22cfde cmCTestSVN: Create the SVNInfo for the root repository
120d424 cmCTestSVN: Add the Repositories list and the RootInfo pointer
0873de6 cmCTestSVN: Extend Revision struct with SVN repo information
aa1076f cmCTestSVN: Add the new SVNInfo structure
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7c97859d7192657ffb777885deefc2856bc2a22
commit b7c97859d7192657ffb777885deefc2856bc2a22
Author: Xavier Besseron
AuthorDate: Mon Sep 3 11:10:53 2012 +0200
Commit: Brad King
CommitDate: Mon Sep 3 10:38:51 2012 -0400
cmCTestSVN: Load and process information from externals
Call LoadExternals() and perform operations on all elements of the
Repositories list.
diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index ec1582c..c439281 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -116,9 +116,15 @@ void cmCTestSVN::NoteOldRevision()
// Info for root repository
this->Repositories.push_back( SVNInfo("") );
this->RootInfo = &(this->Repositories.back());
+ // Info for the external repositories
+ this->LoadExternals();
-// Get info for the root repositiry
-SVNInfo& svninfo = *RootInfo;
+ // Get info for all the repositories
+ std::list::iterator itbeg = this->Repositories.begin();
+ std::list::iterator itend = this->Repositories.end();
+ for( ; itbeg != itend ; itbeg++)
+{
+SVNInfo& svninfo = *itbeg;
svninfo.OldRevision = this->LoadInfo(svninfo);
this->Log << "Revision for repository '" << svninfo.LocalPath
<< "' before update: " << svninfo.OldRevision << "\n";
@@ -126,6 +132,7 @@ void cmCTestSVN::NoteOldRevision()
" Old revision of external repository '"
<< svninfo.LocalPath << "' is: "
<< svninfo.OldRevision << "\n");
+}
// Set the global old revision to the one of the root
this->OldRevision = this->RootInfo->OldRevision;
@@ -135,8 +142,12 @@ void cmCTestSVN::NoteOldRevision()
//
void cmCTestSVN::NoteNewRevision()
{
- // Get info for the root repository
-SVNInfo& svninfo = *RootInfo;
+ // Get info for the external repositories
+ std::list::iterator itbeg = this->Repositories.begin();
+ std::list::iterator itend = this->Repositories.end();
+ for( ; itbeg != itend ; itbeg++)
+{
+SVNInfo& svninfo = *itbeg;
svninfo.NewRevision = this->LoadInfo(svninfo);
this->Log << "Revision for repository '" << svninfo.LocalPath
<< "' after update: " << svninfo.NewRevision << "\n";
@@ -163,6 +174,8 @@ void cmCTestSVN::NoteNewRevision()
this->Log << "Repository '" << svninfo.LocalPath
<< "' Base = " << svninfo.Base << "\n";
+ }
+
// Set the global new revision to the one of the root
this->NewRevision = this->RootInfo->NewRevision;
}
@@ -374,9 +387,14 @@ private:
//
void cmCTestSVN::LoadRevisions()
{
-// Get revision of the root repository
-SVNInfo& svninfo = *RootInfo;
+ // Get revisions for all the external repositories
+ std::list::iterator itbeg = this->Repositories.begin();
+ std::list::iterator itend = this->Repositories.end();
+ for( ; itbeg != itend ; itbeg++)
+{
+SVNInfo& svninfo = *itbeg;
LoadRevisions(svninfo);
+}
}
//
