dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 14:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPackProductBuild: Add options to sign packages

Browse Source
This commit is contained in:
Roman Wüger
2017-01-15 01:29:34 +01:00
committed by Brad King
parent 6286d26ca6
commit 48aad9cda0
3 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Help/release/dev/cpack-productbuild-signing.rst Normal file
View File

@@ -0,0 +1,8 @@
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`.

20
Modules/CPackProductBuild.cmake
View File

@@ -20,9 +20,29 @@
# the automatically detected command (or specify its location if the # the automatically detected command (or specify its location if the
# auto-detection fails to find it.) # 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 # .. variable:: CPACK_COMMAND_PKGBUILD
# #
# Path to the pkgbuild(1) command used to generate an OS X component package # 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 # 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.) # 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.
#

22
Source/CPack/cmCPackProductBuildGenerator.cxx
View File

@@ -75,6 +75,14 @@ int cmCPackProductBuildGenerator::PackageFiles()
std::string version = this->GetOption("CPACK_PACKAGE_VERSION"); std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD"); std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD");
std::string identityName;
if (const char* n = this->GetOption("CPACK_PRODUCTBUILD_IDENTITY_NAME")) {
identityName = n;
}
std::string keychainPath;
if (const char* p = this->GetOption("CPACK_PRODUCTBUILD_KEYCHAIN_PATH")) {
keychainPath = p;
}
pkgCmd << productbuild << " --distribution \"" << packageDirFileName pkgCmd << productbuild << " --distribution \"" << packageDirFileName
<< "/Contents/distribution.dist\"" << "/Contents/distribution.dist\""
@@ -82,6 +90,9 @@ int cmCPackProductBuildGenerator::PackageFiles()
<< "\"" << "\""
<< " --resources \"" << resDir << "\"" << " --resources \"" << resDir << "\""
<< " --version \"" << version << "\"" << " --version \"" << version << "\""
<< (identityName.empty() ? "" : " --sign \"" + identityName + "\"")
<< (keychainPath.empty() ? ""
: " --keychain \"" + keychainPath + "\"")
<< " \"" << packageFileNames[0] << "\""; << " \"" << packageFileNames[0] << "\"";
// Run ProductBuild // Run ProductBuild
@@ -193,12 +204,23 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
std::string version = this->GetOption("CPACK_PACKAGE_VERSION"); std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
std::string pkgbuild = this->GetOption("CPACK_COMMAND_PKGBUILD"); std::string pkgbuild = this->GetOption("CPACK_COMMAND_PKGBUILD");
std::string identityName;
if (const char* n = this->GetOption("CPACK_PKGBUILD_IDENTITY_NAME")) {
identityName = n;
}
std::string keychainPath;
if (const char* p = this->GetOption("CPACK_PKGBUILD_KEYCHAIN_PATH")) {
keychainPath = p;
}
pkgCmd << pkgbuild << " --root \"" << packageDir << "\"" pkgCmd << pkgbuild << " --root \"" << packageDir << "\""
<< " --identifier \"" << pkgId << "\"" << " --identifier \"" << pkgId << "\""
<< " --scripts \"" << scriptDir << "\"" << " --scripts \"" << scriptDir << "\""
<< " --version \"" << version << "\"" << " --version \"" << version << "\""
<< " --install-location \"/\"" << " --install-location \"/\""
<< (identityName.empty() ? "" : " --sign \"" + identityName + "\"")
<< (keychainPath.empty() ? ""
: " --keychain \"" + keychainPath + "\"")
<< " \"" << packageFile << "\""; << " \"" << packageFile << "\"";
// Run ProductBuild // Run ProductBuild