[Cmake-commits] CMake branch, next, updated. v3.7.2-2235-gd374256

[Brad King]

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  d3742568c8597a7e5050e1607ed4e6f91f29bd09 (commit)
       via  4dcd4a5da431df5f9fa225b5d264b3c61572ace3 (commit)
      from  e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983 (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=d3742568c8597a7e5050e1607ed4e6f91f29bd09
commit d3742568c8597a7e5050e1607ed4e6f91f29bd09
Merge: e9ae0ad 4dcd4a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 10:31:51 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 10:31:51 2017 -0500

    Merge topic 'productbuild_signing' into next
    
    4dcd4a5d Revert "CPackProductBuild: Add options to sign packages"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dcd4a5da431df5f9fa225b5d264b3c61572ace3
commit 4dcd4a5da431df5f9fa225b5d264b3c61572ace3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 10:31:37 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 10:31:37 2017 -0500

    Revert "CPackProductBuild: Add options to sign packages"
    
    This reverts commit 28b332f1f1aceec9b5c2b598f432454d72711246.

diff --git a/Help/release/dev/cpack-productbuild-signing.rst b/Help/release/dev/cpack-productbuild-signing.rst
deleted file mode 100644
index 0b91b38..0000000
--- a/Help/release/dev/cpack-productbuild-signing.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-cpack-productbuild-signing
---------------------------
-
-* The :module:`CPackProductBuild` module gained options to sign packages.
-  See the variables :variable:`CPACK_PRODUCTBUILD_IDENTITY_NAME`,
-  :variable:`CPACK_PRODUCTBUILD_KEYCHAIN_PATH`,
-  :variable:`CPACK_PKGBUILD_IDENTITY_NAME`, and
-  :variable:`CPACK_PKGBUILD_KEYCHAIN_PATH`.
diff --git a/Modules/CPackProductBuild.cmake b/Modules/CPackProductBuild.cmake
index d545d3e..ea2fa7c 100644
--- a/Modules/CPackProductBuild.cmake
+++ b/Modules/CPackProductBuild.cmake
@@ -20,29 +20,9 @@
 #  the automatically detected command (or specify its location if the
 #  auto-detection fails to find it.)
 #
-# .. variable:: CPACK_PRODUCTBUILD_IDENTITY_NAME
-#
-#  Adds a digital signature to the resulting package.
-#
-#
-# .. variable:: CPACK_PRODUCTBUILD_KEYCHAIN_PATH
-#
-#  Specify a specific keychain to search for the signing identity.
-#
-#
 # .. variable:: CPACK_COMMAND_PKGBUILD
 #
 #  Path to the pkgbuild(1) command used to generate an OS X component package
 #  on OS X.  This variable can be used to override the automatically detected
 #  command (or specify its location if the auto-detection fails to find it.)
 #
-#
-# .. variable:: CPACK_PKGBUILD_IDENTITY_NAME
-#
-#  Adds a digital signature to the resulting package.
-#
-#
-# .. variable:: CPACK_PKGBUILD_KEYCHAIN_PATH
-#
-#  Specify a specific keychain to search for the signing identity.
-#
diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx
index 35b2ccc..a46e3a6 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.cxx
+++ b/Source/CPack/cmCPackProductBuildGenerator.cxx
@@ -75,27 +75,14 @@ int cmCPackProductBuildGenerator::PackageFiles()
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD");
-  std::string identityName =
-    this->GetOption("CPACK_PRODUCTBUILD_IDENTITY_NAME");
-  std::string keychainPath =
-    this->GetOption("CPACK_PRODUCTBUILD_KEYCHAIN_PATH");
 
   pkgCmd << productbuild << " --distribution \"" << packageDirFileName
          << "/Contents/distribution.dist\""
          << " --package-path \"" << packageDirFileName << "/Contents/Packages"
          << "\""
          << " --resources \"" << resDir << "\""
-         << " --version \"" << version << "\"";
-
-  if (!identityName.empty()) {
-    pkgCmd << " --sign \"" << identityName << "\"";
-  }
-
-  if (!keychainPath.empty()) {
-    pkgCmd << " --keychain \"" << keychainPath << "\"";
-  }
-
-  pkgCmd << " \"" << packageFileNames[0] << "\"";
+         << " --version \"" << version << "\""
+         << " \"" << packageFileNames[0] << "\"";
 
   // Run ProductBuild
   return RunProductBuild(pkgCmd.str());
@@ -206,24 +193,13 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string pkgbuild = this->GetOption("CPACK_COMMAND_PKGBUILD");
-  std::string identityName = this->GetOption("CPACK_PKGBUILD_IDENTITY_NAME");
-  std::string keychainPath = this->GetOption("CPACK_PKGBUILD_KEYCHAIN_PATH");
 
   pkgCmd << pkgbuild << " --root \"" << packageDir << "\""
          << " --identifier \"" << pkgId << "\""
          << " --scripts \"" << scriptDir << "\""
          << " --version \"" << version << "\""
-         << " --install-location \"/\"";
-
-  if (!identityName.empty()) {
-    pkgCmd << " --sign \"" << identityName << "\"";
-  }
-
-  if (!keychainPath.empty()) {
-    pkgCmd << " --keychain \"" << keychainPath << "\"";
-  }
-
-  pkgCmd << " \"" << packageFile << "\"";
+         << " --install-location \"/\""
+         << " \"" << packageFile << "\"";
 
   // Run ProductBuild
   return RunProductBuild(pkgCmd.str());

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

Summary of changes:
 Help/release/dev/cpack-productbuild-signing.rst |    8 ------
 Modules/CPackProductBuild.cmake                 |   20 --------------
 Source/CPack/cmCPackProductBuildGenerator.cxx   |   32 +++--------------------
 3 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 Help/release/dev/cpack-productbuild-signing.rst


hooks/post-receive
-- 
CMake