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 bb4b394fac234c453b3f76ff7d1b85a62167617d (commit)
via 98617f1be07ecded94085f0aac41284604d3c684 (commit)
from 4fc10431f06a07cd7ac1fafa7f3a8e633bea204c (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=bb4b394fac234c453b3f76ff7d1b85a62167617d
commit bb4b394fac234c453b3f76ff7d1b85a62167617d
Merge: 4fc1043 98617f1
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Wed Jul 10 16:48:01 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 10 12:48:12 2019 -0400
Merge topic 'fix/move-more-cpack-internals'
98617f1be0 Refactor: Move CPack internal files to `Internal/CPack/`
directory
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3530
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98617f1be07ecded94085f0aac41284604d3c684
commit 98617f1be07ecded94085f0aac41284604d3c684
Author: Alex Turbov <i.za...@gmail.com>
AuthorDate: Tue Jul 9 15:45:03 2019 +0300
Commit: Alex Turbov <i.za...@gmail.com>
CommitDate: Tue Jul 9 15:45:03 2019 +0300
Refactor: Move CPack internal files to `Internal/CPack/` directory
Some commits ago all CPack internal `*.cmake` files have been moved
to `Internal/CPack/`. This commit also move some templates
internally used by generators to the same location to make
`Modules/` directory less noisy w/ files the end users don't
need to use/see.
diff --git a/Modules/CPack.DS_Store.in
b/Modules/Internal/CPack/CPack.DS_Store.in
similarity index 100%
rename from Modules/CPack.DS_Store.in
rename to Modules/Internal/CPack/CPack.DS_Store.in
diff --git a/Modules/CPack.Description.plist.in
b/Modules/Internal/CPack/CPack.Description.plist.in
similarity index 100%
rename from Modules/CPack.Description.plist.in
rename to Modules/Internal/CPack/CPack.Description.plist.in
diff --git a/Modules/CPack.Info.plist.in
b/Modules/Internal/CPack/CPack.Info.plist.in
similarity index 100%
rename from Modules/CPack.Info.plist.in
rename to Modules/Internal/CPack/CPack.Info.plist.in
diff --git a/Modules/CPack.NuGet.nuspec.in
b/Modules/Internal/CPack/CPack.NuGet.nuspec.in
similarity index 100%
rename from Modules/CPack.NuGet.nuspec.in
rename to Modules/Internal/CPack/CPack.NuGet.nuspec.in
diff --git a/Modules/CPack.OSXScriptLauncher.in
b/Modules/Internal/CPack/CPack.OSXScriptLauncher.in
old mode 100755
new mode 100644
similarity index 100%
rename from Modules/CPack.OSXScriptLauncher.in
rename to Modules/Internal/CPack/CPack.OSXScriptLauncher.in
diff --git a/Modules/CPack.OSXScriptLauncher.rsrc.in
b/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in
similarity index 100%
rename from Modules/CPack.OSXScriptLauncher.rsrc.in
rename to Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in
diff --git a/Modules/CPack.OSXX11.Info.plist.in
b/Modules/Internal/CPack/CPack.OSXX11.Info.plist.in
similarity index 100%
rename from Modules/CPack.OSXX11.Info.plist.in
rename to Modules/Internal/CPack/CPack.OSXX11.Info.plist.in
diff --git a/Modules/CPack.OSXX11.main.scpt.in
b/Modules/Internal/CPack/CPack.OSXX11.main.scpt.in
similarity index 100%
rename from Modules/CPack.OSXX11.main.scpt.in
rename to Modules/Internal/CPack/CPack.OSXX11.main.scpt.in
diff --git a/Modules/CPack.RuntimeScript.in
b/Modules/Internal/CPack/CPack.RuntimeScript.in
similarity index 100%
rename from Modules/CPack.RuntimeScript.in
rename to Modules/Internal/CPack/CPack.RuntimeScript.in
diff --git a/Modules/CPack.STGZ_Header.sh.in
b/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
similarity index 99%
rename from Modules/CPack.STGZ_Header.sh.in
rename to Modules/Internal/CPack/CPack.STGZ_Header.sh.in
index 70f63d2..003fcfe 100755
--- a/Modules/CPack.STGZ_Header.sh.in
+++ b/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
@@ -43,10 +43,10 @@ for a in "$@CPACK_AT_SIGN@"; do
cpack_prefix_dir=`cpack_fix_slashes "${cpack_prefix_dir}"`
fi
if echo $a | grep "^--help" > /dev/null 2> /dev/null; then
- cpack_usage
+ cpack_usage
fi
if echo $a | grep "^--version" > /dev/null 2> /dev/null; then
- cpack_version
+ cpack_version
exit 2
fi
if echo $a | grep "^--include-subdir" > /dev/null 2> /dev/null; then
@@ -143,4 +143,3 @@ exit 0
#-----------------------------------------------------------
# Start of TAR.GZ file
#-----------------------------------------------------------;
-
diff --git a/Modules/CPack.VolumeIcon.icns.in
b/Modules/Internal/CPack/CPack.VolumeIcon.icns.in
similarity index 100%
rename from Modules/CPack.VolumeIcon.icns.in
rename to Modules/Internal/CPack/CPack.VolumeIcon.icns.in
diff --git a/Modules/CPack.background.png.in
b/Modules/Internal/CPack/CPack.background.png.in
similarity index 100%
rename from Modules/CPack.background.png.in
rename to Modules/Internal/CPack/CPack.background.png.in
diff --git a/Modules/CPack.distribution.dist.in
b/Modules/Internal/CPack/CPack.distribution.dist.in
similarity index 100%
rename from Modules/CPack.distribution.dist.in
rename to Modules/Internal/CPack/CPack.distribution.dist.in
diff --git a/Modules/Internal/CPack/CPackNuGet.cmake
b/Modules/Internal/CPack/CPackNuGet.cmake
index 4b2ce92..82053b2 100644
--- a/Modules/Internal/CPack/CPackNuGet.cmake
+++ b/Modules/Internal/CPack/CPackNuGet.cmake
@@ -262,7 +262,7 @@ function(_cpack_nuget_render_spec)
# NuGet will name it properly.
_cpack_nuget_debug("Rendering
`${CPACK_TEMPORARY_DIRECTORY}/CPack.NuGet.nuspec` file...")
configure_file(
- "${CMAKE_ROOT}/Modules/CPack.NuGet.nuspec.in"
+ "${CMAKE_ROOT}/Modules/Internal/CPack/CPack.NuGet.nuspec.in"
"${CPACK_TEMPORARY_DIRECTORY}/CPack.NuGet.nuspec"
@ONLY
)
diff --git a/Modules/NSIS.InstallOptions.ini.in
b/Modules/Internal/CPack/NSIS.InstallOptions.ini.in
similarity index 100%
rename from Modules/NSIS.InstallOptions.ini.in
rename to Modules/Internal/CPack/NSIS.InstallOptions.ini.in
diff --git a/Modules/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in
similarity index 100%
rename from Modules/NSIS.template.in
rename to Modules/Internal/CPack/NSIS.template.in
diff --git a/Modules/WIX.template.in b/Modules/Internal/CPack/WIX.template.in
similarity index 100%
rename from Modules/WIX.template.in
rename to Modules/Internal/CPack/WIX.template.in
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 045d93d..fa64d79 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -604,7 +604,7 @@ std::string cmCPackWIXGenerator::GetRootFolderId() const
bool cmCPackWIXGenerator::GenerateMainSourceFileFromTemplate()
{
- std::string wixTemplate = FindTemplate("WIX.template.in");
+ std::string wixTemplate = FindTemplate("Internal/CPack/WIX.template.in");
if (GetOption("CPACK_WIX_TEMPLATE") != 0) {
wixTemplate = GetOption("CPACK_WIX_TEMPLATE");
}
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx
b/Source/CPack/cmCPackNSISGenerator.cxx
index e2020c5..87c36fa 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -36,7 +36,8 @@ int cmCPackNSISGenerator::PackageFiles()
{
// TODO: Fix nsis to force out file name
- std::string nsisInFileName = this->FindTemplate("NSIS.template.in");
+ std::string nsisInFileName =
+ this->FindTemplate("Internal/CPack/NSIS.template.in");
if (nsisInFileName.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"CPack error: Could not find NSIS installer template file."
@@ -44,7 +45,7 @@ int cmCPackNSISGenerator::PackageFiles()
return false;
}
std::string nsisInInstallOptions =
- this->FindTemplate("NSIS.InstallOptions.ini.in");
+ this->FindTemplate("Internal/CPack/NSIS.InstallOptions.ini.in");
if (nsisInInstallOptions.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"CPack error: Could not find NSIS installer options file."
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx
b/Source/CPack/cmCPackOSXX11Generator.cxx
index 90e0afe..41470c9 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -245,7 +245,7 @@ bool cmCPackOSXX11Generator::CopyResourcePlistFile(
const std::string& name, const std::string& dir,
const char* outputFileName /* = 0 */, bool copyOnly /* = false */)
{
- std::string inFName = "CPack.";
+ std::string inFName = "Internal/CPack/CPack.";
inFName += name;
inFName += ".in";
std::string inFileName = this->FindTemplate(inFName.c_str());
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx
b/Source/CPack/cmCPackPKGGenerator.cxx
index 8c22c65..d361921 100644
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@ -48,7 +48,7 @@ std::string cmCPackPKGGenerator::GetPackageName(
void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile)
{
std::string distributionTemplate =
- this->FindTemplate("CPack.distribution.dist.in");
+ this->FindTemplate("Internal/CPack/CPack.distribution.dist.in");
if (distributionTemplate.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Cannot find input file: " << distributionTemplate
@@ -305,7 +305,7 @@ bool cmCPackPKGGenerator::CopyResourcePlistFile(const
std::string& name,
outName = name.c_str();
}
- std::string inFName = "CPack.";
+ std::string inFName = "Internal/CPack/CPack.";
inFName += name;
inFName += ".in";
std::string inFileName = this->FindTemplate(inFName.c_str());
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx
b/Source/CPack/cmCPackSTGZGenerator.cxx
index aba15d2..4666dc2 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -21,7 +21,8 @@ int cmCPackSTGZGenerator::InitializeInternal()
{
this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "0");
- std::string inFile = this->FindTemplate("CPack.STGZ_Header.sh.in");
+ std::string inFile =
+ this->FindTemplate("Internal/CPack/CPack.STGZ_Header.sh.in");
if (inFile.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Cannot find template file: " << inFile << std::endl);
-----------------------------------------------------------------------
Summary of changes:
Modules/{ => Internal/CPack}/CPack.DS_Store.in | Bin
Modules/{ => Internal/CPack}/CPack.Description.plist.in | 0
Modules/{ => Internal/CPack}/CPack.Info.plist.in | 0
Modules/{ => Internal/CPack}/CPack.NuGet.nuspec.in | 0
Modules/{ => Internal/CPack}/CPack.OSXScriptLauncher.in | Bin
.../{ => Internal/CPack}/CPack.OSXScriptLauncher.rsrc.in | Bin
Modules/{ => Internal/CPack}/CPack.OSXX11.Info.plist.in | 0
Modules/{ => Internal/CPack}/CPack.OSXX11.main.scpt.in | Bin
Modules/{ => Internal/CPack}/CPack.RuntimeScript.in | 0
Modules/{ => Internal/CPack}/CPack.STGZ_Header.sh.in | 5 ++---
Modules/{ => Internal/CPack}/CPack.VolumeIcon.icns.in | Bin
Modules/{ => Internal/CPack}/CPack.background.png.in | Bin
Modules/{ => Internal/CPack}/CPack.distribution.dist.in | 0
Modules/Internal/CPack/CPackNuGet.cmake | 2 +-
Modules/{ => Internal/CPack}/NSIS.InstallOptions.ini.in | 0
Modules/{ => Internal/CPack}/NSIS.template.in | 0
Modules/{ => Internal/CPack}/WIX.template.in | 0
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 2 +-
Source/CPack/cmCPackNSISGenerator.cxx | 5 +++--
Source/CPack/cmCPackOSXX11Generator.cxx | 2 +-
Source/CPack/cmCPackPKGGenerator.cxx | 4 ++--
Source/CPack/cmCPackSTGZGenerator.cxx | 3 ++-
22 files changed, 12 insertions(+), 11 deletions(-)
rename Modules/{ => Internal/CPack}/CPack.DS_Store.in (100%)
rename Modules/{ => Internal/CPack}/CPack.Description.plist.in (100%)
rename Modules/{ => Internal/CPack}/CPack.Info.plist.in (100%)
rename Modules/{ => Internal/CPack}/CPack.NuGet.nuspec.in (100%)
rename Modules/{ => Internal/CPack}/CPack.OSXScriptLauncher.in (100%)
mode change 100755 => 100644
rename Modules/{ => Internal/CPack}/CPack.OSXScriptLauncher.rsrc.in (100%)
rename Modules/{ => Internal/CPack}/CPack.OSXX11.Info.plist.in (100%)
rename Modules/{ => Internal/CPack}/CPack.OSXX11.main.scpt.in (100%)
rename Modules/{ => Internal/CPack}/CPack.RuntimeScript.in (100%)
rename Modules/{ => Internal/CPack}/CPack.STGZ_Header.sh.in (99%)
rename Modules/{ => Internal/CPack}/CPack.VolumeIcon.icns.in (100%)
rename Modules/{ => Internal/CPack}/CPack.background.png.in (100%)
rename Modules/{ => Internal/CPack}/CPack.distribution.dist.in (100%)
rename Modules/{ => Internal/CPack}/NSIS.InstallOptions.ini.in (100%)
rename Modules/{ => Internal/CPack}/NSIS.template.in (100%)
rename Modules/{ => Internal/CPack}/WIX.template.in (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
