[Cmake-commits] CMake branch, next, updated. v2.8.3-1620-g8b34a23
Alexander Neundorf
neundorf at kde.org
Sat Feb 12 16:04:29 EST 2011
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 8b34a234ad91347c411fe0ace319738b28a9fe72 (commit)
via 79e13af195e8664a18449b09d3bc2f0e04c80992 (commit)
via 8074bca93ca3774d3ce8ca9195f1f08d36d6e7bb (commit)
via cb94587a88866f3278676ea011c78e1c9d3663ec (commit)
via 84dafee565cd49fd26b2018f82059ad5eed99cb1 (commit)
from 4800f23ee3a95ec325511c1f527a524833cefb04 (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=8b34a234ad91347c411fe0ace319738b28a9fe72
commit 8b34a234ad91347c411fe0ace319738b28a9fe72
Merge: 4800f23 79e13af
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sat Feb 12 16:04:28 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 12 16:04:28 2011 -0500
Merge topic 'FixBadXMLInEclipseProjects' into next
79e13af Add XML escaping for directory name in Eclipse projects (#11658)
8074bca Fix XML escaping for target names in Eclipse project files (#11658)
cb94587 Fix XML escaping for the project() name in Eclipse projects (#11658)
84dafee KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79e13af195e8664a18449b09d3bc2f0e04c80992
commit 79e13af195e8664a18449b09d3bc2f0e04c80992
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Feb 12 22:01:27 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Feb 12 22:01:27 2011 +0100
Add XML escaping for directory name in Eclipse projects (#11658)
Alex
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index cd22291..eb78647 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -431,7 +431,8 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories(
{
emittedDirs.insert(dir);
fout << "<pathentry include=\""
- << cmExtraEclipseCDT4Generator::GetEclipsePath(dir)
+ << cmExtraEclipseCDT4Generator::EscapeForXML(
+ cmExtraEclipseCDT4Generator::GetEclipsePath(dir))
<< "\" kind=\"inc\" path=\"\" system=\"true\"/>\n";
}
}
@@ -1002,9 +1003,10 @@ void cmExtraEclipseCDT4Generator::AppendTarget(cmGeneratedFileStream& fout,
const char* prefix)
{
std::string targetXml = cmExtraEclipseCDT4Generator::EscapeForXML(target);
+ std::string pathXml = cmExtraEclipseCDT4Generator::EscapeForXML(path);
fout <<
"<target name=\"" << prefix << targetXml << "\""
- " path=\"" << path.c_str() << "\""
+ " path=\"" << pathXml.c_str() << "\""
" targetID=\"org.eclipse.cdt.make.MakeTargetBuilder\">\n"
"<buildCommand>"
<< cmExtraEclipseCDT4Generator::GetEclipsePath(make)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8074bca93ca3774d3ce8ca9195f1f08d36d6e7bb
commit 8074bca93ca3774d3ce8ca9195f1f08d36d6e7bb
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Feb 12 21:54:02 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Feb 12 21:54:02 2011 +0100
Fix XML escaping for target names in Eclipse project files (#11658)
Alex
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 4cd052a..cd22291 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -1001,15 +1001,16 @@ void cmExtraEclipseCDT4Generator::AppendTarget(cmGeneratedFileStream& fout,
const std::string& path,
const char* prefix)
{
+ std::string targetXml = cmExtraEclipseCDT4Generator::EscapeForXML(target);
fout <<
- "<target name=\"" << prefix << target << "\""
+ "<target name=\"" << prefix << targetXml << "\""
" path=\"" << path.c_str() << "\""
" targetID=\"org.eclipse.cdt.make.MakeTargetBuilder\">\n"
"<buildCommand>"
<< cmExtraEclipseCDT4Generator::GetEclipsePath(make)
<< "</buildCommand>\n"
"<buildArguments>" << makeArgs << "</buildArguments>\n"
- "<buildTarget>" << target << "</buildTarget>\n"
+ "<buildTarget>" << targetXml << "</buildTarget>\n"
"<stopOnError>true</stopOnError>\n"
"<useDefaultCommand>false</useDefaultCommand>\n"
"</target>\n"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb94587a88866f3278676ea011c78e1c9d3663ec
commit cb94587a88866f3278676ea011c78e1c9d3663ec
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Feb 12 21:49:08 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Feb 12 21:49:08 2011 +0100
Fix XML escaping for the project() name in Eclipse projects (#11658)
Alex
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 0ef771f..4cd052a 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -875,8 +875,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
fout << "</cconfiguration>\n"
"</storageModule>\n"
"<storageModule moduleId=\"cdtBuildSystem\" version=\"4.0.0\">\n"
- "<project id=\"" << mf->GetProjectName() << ".null.1\""
- " name=\"" << mf->GetProjectName() << "\"/>\n"
+ "<project id=\"" << this->EscapeForXML(mf->GetProjectName())
+ << ".null.1\" name=\"" << this->EscapeForXML(mf->GetProjectName())
+ << "\"/>\n"
"</storageModule>\n"
"</cproject>\n"
;
@@ -927,7 +928,8 @@ cmExtraEclipseCDT4Generator::GenerateProjectName(const std::string& name,
const std::string& type,
const std::string& path)
{
- return name + (type.empty() ? "" : "-") + type + "@" + path;
+ return cmExtraEclipseCDT4Generator::EscapeForXML(name)
+ +(type.empty() ? "" : "-") + type + "@" + path;
}
std::string cmExtraEclipseCDT4Generator::EscapeForXML(const std::string& value)
-----------------------------------------------------------------------
Summary of changes:
Source/cmExtraEclipseCDT4Generator.cxx | 19 ++++++++++++-------
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 13 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list