[Cmake-commits] CMake branch, master, updated. v3.6.1-857-gf642872

2016-09-04 Thread Kitware Robot 
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  f6428725bb0ae7e64866e3eca16a5ad8f007f916 (commit)
  from  fb357e5fef2e7803f2f745b6aa4cf63935628ed6 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6428725bb0ae7e64866e3eca16a5ad8f007f916
commit f6428725bb0ae7e64866e3eca16a5ad8f007f916
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Mon Sep 5 00:01:06 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Sep 5 00:01:06 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index d611daa..c886a6a 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160904)
+set(CMake_VERSION_PATCH 20160905)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.1-1764-g083f180

2016-09-04 Thread Domen Vrankar 
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  083f1806004094f87741ba58655d7536dc05aa1d (commit)
   via  0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23 (commit)
  from  ed02aa4047c6e5aff30d1cb20ab29678399379c4 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=083f1806004094f87741ba58655d7536dc05aa1d
commit 083f1806004094f87741ba58655d7536dc05aa1d
Merge: ed02aa4 0d7c971
Author: Domen Vrankar 
AuthorDate: Sun Sep 4 17:10:07 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 4 17:10:07 2016 -0400

Merge topic 'cpack-deb-long-filenames' into next

0d7c9712 fixup! cpack-deb-long-filenames


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23
commit 0d7c9712e7f60e3c7b7652d3fad45f7b4ffa7e23
Author: Domen Vrankar 
AuthorDate: Sun Sep 4 23:09:53 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sun Sep 4 23:09:53 2016 +0200

fixup! cpack-deb-long-filenames

diff --git a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake 
b/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
index 169be1c..0452343 100644
--- a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake
@@ -6,6 +6,9 @@ file(MAKE_DIRECTORY 
"${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/info")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/available" "")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/root_dir/admindir/status" "")
 
+# some programs used by fakeroot require sbin in path so we should not
+# leave this to chance (programs: ldconfig and start-stop-daemon)
+set(ENV{PATH} "$ENV{PATH}:/usr/local/sbin:/usr/sbin:/sbin")
 
 execute_process(COMMAND ${FAKEROOT_EXECUTABLE} ${DPKG_EXECUTABLE}
   -i --force-not-root --root=${CMAKE_CURRENT_BINARY_DIR}/root_dir

---

Summary of changes:
 Tests/RunCMake/CPack/DEB/LONG_FILENAMES-VerifyResult.cmake |3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.1-1762-ged02aa4

2016-09-04 Thread Domen Vrankar 
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  ed02aa4047c6e5aff30d1cb20ab29678399379c4 (commit)
   via  e42a39918f784d671ce7f51d9269cc754e263e44 (commit)
  from  b8ececb4b62f0fe2bb3fa7000bf00df327d76de5 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed02aa4047c6e5aff30d1cb20ab29678399379c4
commit ed02aa4047c6e5aff30d1cb20ab29678399379c4
Merge: b8ececb e42a399
Author: Domen Vrankar 
AuthorDate: Sun Sep 4 15:15:09 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 4 15:15:09 2016 -0400

Merge topic 'cpack-deb-long-filenames' into next

e42a3991 cpack-deb-long-filenames


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e42a39918f784d671ce7f51d9269cc754e263e44
commit e42a39918f784d671ce7f51d9269cc754e263e44
Author: Domen Vrankar 
AuthorDate: Sun Sep 4 21:13:24 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sun Sep 4 21:13:24 2016 +0200

cpack-deb-long-filenames

Support for long filenames in deb
packages. See Issue #14332

diff --git a/Help/release/dev/cpack-deb-long-filenames.rst 
b/Help/release/dev/cpack-deb-long-filenames.rst
new file mode 100644
index 000..6113eaf
--- /dev/null
+++ b/Help/release/dev/cpack-deb-long-filenames.rst
@@ -0,0 +1,6 @@
+cpack-deb-long-filenames
+
+
+* The :module:`CPackDeb` module learned to support long file names
+  when archive format is set to GNU tar.
+  See :variable:`CPACK_DEBIAN_ARCHIVE_TYPE`
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index c9678d6..1a7b923 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -177,6 +177,24 @@
 #
 #  See https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
 #
+# .. variable:: CPACK_DEBIAN_ARCHIVE_TYPE
+#
+#  The archive format used for creating the Debian package.
+#
+#  * Mandatory : YES
+#  * Default   : "paxr"
+#
+#  Possible values are:
+#
+#  - paxr
+#  - gnutar
+#
+#  .. note::
+#
+#Default pax archive format is the most portable format and generates
+#packages that do not treat sparse files specially.
+#GNU tar format on the other hand supports longer filenames.
+#
 # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE
 #
 #  The compression used for creating the Debian package.
@@ -842,12 +860,24 @@ function(cpack_deb_prepare_package_vars)
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
   endif()
 
+  if(CPACK_DEBIAN_ARCHIVE_TYPE)
+set(archive_types_ "paxr;gnutar")
+cmake_policy(PUSH)
+  cmake_policy(SET CMP0057 NEW)
+  if(NOT CPACK_DEBIAN_ARCHIVE_TYPE IN_LIST archive_types_)
+message(FATAL_ERROR "CPACK_DEBIAN_ARCHIVE_TYPE set to unsupported"
+  "type ${CPACK_DEBIAN_ARCHIVE_TYPE}")
+  endif()
+cmake_policy(POP)
+  else()
+set(CPACK_DEBIAN_ARCHIVE_TYPE "paxr")
+  endif()
+
   # Compression: (recommended)
   if(NOT CPACK_DEBIAN_COMPRESSION_TYPE)
 set(CPACK_DEBIAN_COMPRESSION_TYPE "gzip")
   endif()
 
-
   # Recommends:
   # You should set: CPACK_DEBIAN_PACKAGE_RECOMMENDS
 
@@ -1000,6 +1030,7 @@ function(cpack_deb_prepare_package_vars)
   set(GEN_CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_DESCRIPTION 
"${CPACK_DEBIAN_PACKAGE_DESCRIPTION}" PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}" 
PARENT_SCOPE)
+  set(GEN_CPACK_DEBIAN_ARCHIVE_TYPE "${CPACK_DEBIAN_ARCHIVE_TYPE}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_COMPRESSION_TYPE "${CPACK_DEBIAN_COMPRESSION_TYPE}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_RECOMMENDS "${CPACK_DEBIAN_PACKAGE_RECOMMENDS}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_SUGGESTS "${CPACK_DEBIAN_PACKAGE_SUGGESTS}" 
PARENT_SCOPE)
diff --git a/Source/CPack/cmCPackDebGenerator.cxx 
b/Source/CPack/cmCPackDebGenerator.cxx
index 1f3ac51..b960c0a 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -419,6 +419,12 @@ int cmCPackDebGenerator::createDeb()
 << debian_compression_type << std::endl);
   }
 
+  const char* debian_archive_type =
+this->GetOption("GEN_CPACK_DEBIAN_ARCHIVE_TYPE");
+  if (!debian_archive_type) {
+debian_archive_type = "paxr";
+  }
+
   std::string filename_data_tar =
 strGenWDIR + "/data.tar" + compression_suffix;
 
@@ -431,7 +437,9 @@ int cmCPackDebGenerator::createDeb()
   << filename_data_tar << "\" for writing" << std::endl);
   return 0;
 }
-cmArchiveWrite

[Cmake-commits] CMake branch, next, updated. v3.6.1-1760-gb8ececb

2016-09-04 Thread Gregor Jasny via Cmake-commits 
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  b8ececb4b62f0fe2bb3fa7000bf00df327d76de5 (commit)
   via  60dcaaea133931a323180c30eafabe4576e72cb8 (commit)
   via  fb357e5fef2e7803f2f745b6aa4cf63935628ed6 (commit)
  from  dfa796fc2815c89ed7a1fcc119b12bcf6afc8294 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8ececb4b62f0fe2bb3fa7000bf00df327d76de5
commit b8ececb4b62f0fe2bb3fa7000bf00df327d76de5
Merge: dfa796f 60dcaae
Author: Gregor Jasny 
AuthorDate: Sun Sep 4 10:56:09 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 4 10:56:09 2016 -0400

Merge topic 'tidy-readability-redundant-string-cstr' into next

60dcaaea tidy: Fix readability-redundant-string-cstr issues
fb357e5f CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60dcaaea133931a323180c30eafabe4576e72cb8
commit 60dcaaea133931a323180c30eafabe4576e72cb8
Author: Gregor Jasny 
AuthorDate: Sun Sep 4 16:55:05 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 4 16:55:05 2016 +0200

tidy: Fix readability-redundant-string-cstr issues

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx 
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 640e437..14436da 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -330,8 +330,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& 
src_dir,
   if (!cpack_dmg_disable_applications_symlink) {
 std::ostringstream application_link;
 application_link << staging.str() << "/Applications";
-cmSystemTools::CreateSymlink("/Applications",
- application_link.str().c_str());
+cmSystemTools::CreateSymlink("/Applications", application_link.str());
   }
 
   // Optionally add a custom volume icon ...
@@ -755,7 +754,7 @@ std::string 
cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix(
 // the current COMPONENT belongs to.
 std::string groupVar =
   "CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP";
-const char* _groupName = GetOption(groupVar.c_str());
+const char* _groupName = GetOption(groupVar);
 if (_groupName) {
   std::string groupName = _groupName;
 
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx 
b/Source/CPack/cmCPackOSXX11Generator.cxx
index c0d2553..c36439f 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -102,15 +102,14 @@ int cmCPackOSXX11Generator::PackageFiles()
   }
 
   std::string applicationsLinkName = diskImageDirectory + "/Applications";
-  cmSystemTools::CreateSymlink("/Applications", applicationsLinkName.c_str());
+  cmSystemTools::CreateSymlink("/Applications", applicationsLinkName);
 
-  if (!this->CopyResourcePlistFile("VolumeIcon.icns",
-   diskImageDirectory.c_str(),
+  if (!this->CopyResourcePlistFile("VolumeIcon.icns", diskImageDirectory,
".VolumeIcon.icns", true) ||
-  !this->CopyResourcePlistFile("DS_Store", diskImageDirectory.c_str(),
-   ".DS_Store", true) ||
+  !this->CopyResourcePlistFile("DS_Store", diskImageDirectory, ".DS_Store",
+   true) ||
   !this->CopyResourcePlistFile("background.png",
-   diskImageBackgroundImageDir.c_str(),
+   diskImageBackgroundImageDir,
"background.png", true) ||
   !this->CopyResourcePlistFile("RuntimeScript", dir) ||
   !this->CopyResourcePlistFile("OSXX11.Info.plist", contDir,
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx 
b/Source/CPack/cmCPackPKGGenerator.cxx
index 19b587a..e5b96e3 100644
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@ -225,8 +225,7 @@ void cmCPackPKGGenerator::CreateChoice(const 
cmCPackComponent& component,
   dirName += '/';
   dirName += component.Name;
   dirName += this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX");
-  unsigned long installedSize =
-component.GetInstalledSizeInKbytes(dirName.c_str());
+  unsigned long installedSize = component.GetInstalledSizeInKbytes(dirName);
 
   xout.StartElement("pkg-ref");
   xout.Attribute("id", packageId);
@@ -283,7 +282,7 @@ bool cmCPackPKGGenerator::CopyCreateResourceFile(const 
std::string& name,
 {
   std::string uname = cmSystemTools::UpperCase(name);
   std::string cpackVar =