[Cmake-commits] CMake branch, next, updated. v2.8.9-1189-gc52d7f9
Clinton Stimpson
clinton at elemtech.com
Tue Oct 23 11:35:01 EDT 2012
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 c52d7f9f742174c0fdb53ebe7732814d08daca96 (commit)
via 14561e3d350e006206a7427d8a1c428e553c42b8 (commit)
via 9c42e9831d5e73b68467783c74c251b905b103d6 (commit)
via df5c1db8c0abf0b82f6b7c1289b0325323517333 (commit)
via 62d58bf52c4f2c33bbdd5fb2f5a6c1b513d36200 (commit)
from 0fe44df91e5a64be7c6900d174f49723d2f839e8 (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=c52d7f9f742174c0fdb53ebe7732814d08daca96
commit c52d7f9f742174c0fdb53ebe7732814d08daca96
Merge: 0fe44df 14561e3
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Oct 23 11:34:56 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 23 11:34:56 2012 -0400
Merge topic 'cpack-rez-error' into next
14561e3 Fix for possible Rez errors when creating dmg.
9c42e98 CMake Nightly Date Stamp
df5c1db CMake Nightly Date Stamp
62d58bf CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14561e3d350e006206a7427d8a1c428e553c42b8
commit 14561e3d350e006206a7427d8a1c428e553c42b8
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Oct 22 23:06:16 2012 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Oct 22 23:06:16 2012 -0600
Fix for possible Rez errors when creating dmg.
Rez appears to have a limit on the length of lines it processes.
Break up long lines from a license file to avoid the error.
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 78cb1b6..d973c01 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -442,7 +442,22 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
line.replace(pos, 1, "\\\"");
pos = line.find('\"', pos+2);
}
- osf << " \"" << line << "\\n\"\n";
+ // break up long lines to avoid Rez errors
+ std::vector<std::string> lines;
+ const size_t max_line_length = 512;
+ for(size_t i=0; i<line.size(); i+= max_line_length)
+ {
+ int line_length = max_line_length;
+ if(i+max_line_length > line.size())
+ line_length = line.size()-i;
+ lines.push_back(line.substr(i, line_length));
+ }
+
+ for(size_t i=0; i<lines.size(); i++)
+ {
+ osf << " \"" << lines[i] << "\"\n";
+ }
+ osf << " \"\\n\"\n";
}
osf << "};\n";
osf << "\n";
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CPack/cmCPackDragNDropGenerator.cxx | 17 ++++++++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list