mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-23 15:38:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmake: tar: Display warning when no files provided during archive creation

Browse Source
This commit is contained in:
Bartosz Kosiorek
2019-03-08 17:04:17 +01:00
parent b06f8c93e5
commit 7c47fd8cd1
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmcmd.cxx
View File

@@ -1114,6 +1114,10 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
return 1;
}
} else if (flags.find_first_of('c') != std::string::npos) {
if (files.empty()) {
cmSystemTools::Message("tar: No files or directories specified",
"Warning");
}
if (!cmSystemTools::CreateTar(outFile.c_str(), files, compress,
verbose, mtime, format)) {
cmSystemTools::Error("Problem creating tar: " + outFile);

9
Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake
View File

@@ -4,6 +4,7 @@ function(external_command_test NAME)
run_cmake_command(${NAME} ${CMAKE_COMMAND} -E ${ARGN})
endfunction()
external_command_test(without-files tar cvf bad.tar)
external_command_test(bad-opt1 tar cvf bad.tar --bad)
external_command_test(bad-mtime1 tar cvf bad.tar --mtime=bad .)
external_command_test(bad-from1 tar cvf bad.tar --files-from=bad)
@@ -13,10 +14,10 @@ external_command_test(bad-from4 tar cvf bad.tar --files-from=${CMAKE_CURRENT_LI
external_command_test(bad-from5 tar cvf bad.tar --files-from=${CMAKE_CURRENT_LIST_DIR}/bad-from5.txt)
external_command_test(end-opt1 tar cvf bad.tar -- --bad)
external_command_test(end-opt2 tar cvf bad.tar --)
external_command_test(mtime tar cvf bad.tar "--mtime=1970-01-01 00:00:00 UTC")
external_command_test(bad-format tar cvf bad.tar "--format=bad-format")
external_command_test(zip-bz2 tar cvjf bad.tar "--format=zip")
external_command_test(7zip-gz tar cvzf bad.tar "--format=7zip")
external_command_test(mtime tar cvf bad.tar "--mtime=1970-01-01 00:00:00 UTC" .)
external_command_test(bad-format tar cvf bad.tar "--format=bad-format" .)
external_command_test(zip-bz2 tar cvjf bad.tar "--format=zip" .)
external_command_test(7zip-gz tar cvzf bad.tar "--format=7zip" .)
run_cmake(7zip)
run_cmake(gnutar)

1
Tests/RunCMake/CommandLineTar/end-opt2-stderr.txt Normal file
View File

@@ -0,0 +1 @@
^tar: No files or directories specified

1
Tests/RunCMake/CommandLineTar/without-files-stderr.txt Normal file
View File

@@ -0,0 +1 @@
^tar: No files or directories specified