summaryrefslogtreecommitdiffstats
path: root/Source/CPack
diff options
context:
space:
mode:
authorWesley Turner <wes.turner@kitware.com>2011-05-16 22:15:32 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-05-16 22:15:32 (GMT)
commit0fb388c733e163e9e271f3f8f8abd386e0d63db1 (patch)
tree9b686c92e6bef72f001afeff99c03675c4f828bf /Source/CPack
parenta77dfb6d64b24737167e4a0312fb842544f27961 (diff)
downloadCMake-0fb388c733e163e9e271f3f8f8abd386e0d63db1.zip
CMake-0fb388c733e163e9e271f3f8f8abd386e0d63db1.tar.gz
CMake-0fb388c733e163e9e271f3f8f8abd386e0d63db1.tar.bz2
Ensure executable files have executable permissions.
Fix the OSX X11 CPack generator to make sure the installer that it generates contains executable files.
Diffstat (limited to 'Source/CPack')
-rw-r--r--Source/CPack/cmCPackOSXX11Generator.cxx27
1 files changed, 27 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index 0e8cbc0..75ad640 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -21,6 +21,7 @@
#include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx>
+#include <sys/stat.h>
//----------------------------------------------------------------------
cmCPackOSXX11Generator::cmCPackOSXX11Generator()
@@ -135,6 +136,32 @@ int cmCPackOSXX11Generator::PackageFiles()
return 0;
}
+ // Two of the files need to have execute permission, so ensure they do:
+ std::string runTimeScript = dir;
+ runTimeScript += "/";
+ runTimeScript += "RuntimeScript";
+
+ std::string appScriptName = appdir;
+ appScriptName += "/";
+ appScriptName += this->GetOption("CPACK_PACKAGE_FILE_NAME");
+
+ mode_t mode;
+ if (cmsys::SystemTools::GetPermissions(runTimeScript.c_str(), mode))
+ {
+ mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
+ cmsys::SystemTools::SetPermissions(runTimeScript.c_str(), mode);
+ cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Setting: " << runTimeScript
+ << " to permission: " << mode << std::endl);
+ }
+
+ if (cmsys::SystemTools::GetPermissions(appScriptName.c_str(), mode))
+ {
+ mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
+ cmsys::SystemTools::SetPermissions(appScriptName.c_str(), mode);
+ cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Setting: " << appScriptName
+ << " to permission: " << mode << std::endl);
+ }
+
std::string output;
std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
tmpFile += "/hdiutilOutput.log";