Good Morning
Finally I manage to add wildcard support.
I have taken SimpleGlob.h library from:
https://github.com/brofield/simpleopt
It is multiplatform, which supports all UNIX glob functions/flags and
implementead as single header library.
I tested it on Linux and it is working perfectly for me.
SimpleGlob.h library you need to copy into Source/SimpleGlob.h path.
Please let me know what do you think about that solution.
If it is ok for you, I will continue testing on WIndows and OS X platforms.
Best Regards
Bartosz
2015-12-03 21:56 GMT+01:00 Bartosz Kosiorek <bartosz.kosio...@tomtom.com>:
> Hello.
>
> Here is the patch with tests.
> ________________________________________
> From: Brad King <brad.k...@kitware.com>
> Sent: Thursday, December 3, 2015 7:07 PM
> To: Bartosz Kosiorek
> Cc: cmake-developers@cmake.org
> Subject: Re: [cmake-developers] [PATCH] Extend copy and copy_if_different
> commands with support multiple files
>
> On 12/03/2015 12:31 PM, Bartosz Kosiorek wrote:
> > When I'm trying to run test with wildcard:
> > run_cmake_command(E_copy-wildcard-source-files-target-is-directory
> ${CMAKE_COMMAND} -E copy
> > ${RunCMake_copy_TEST_SOURCE_DIR}/directory1/*
> > ${RunCMake_copy_TEST_BINARY_DIR})
> >
> > I've got an error:
>
> The command is not running through a shell in that case so there is
> no step that expands the wildcard. This feature is not about wildcard
> expansion, but about multiple inputs to the copy. They can be
> spelled out explicitly in the command invocation, or passed through
> a variable containing a list populated by file(GLOB).
>
> -Brad
>
>
> --
>
> Powered by www.kitware.com
>
> Please keep messages on-topic and check the CMake FAQ at:
> http://www.cmake.org/Wiki/CMake_FAQ
>
> Kitware offers various services to support the CMake community. For more
> information on each offering, please visit:
>
> CMake Support: http://cmake.org/cmake/help/support.html
> CMake Consulting: http://cmake.org/cmake/help/consulting.html
> CMake Training Courses: http://cmake.org/cmake/help/training.html
>
> Visit other Kitware open-source projects at
> http://www.kitware.com/opensource/opensource.html
>
> Follow this link to subscribe/unsubscribe:
> http://public.kitware.com/mailman/listinfo/cmake-developers
>
From 8225688074386ac8633bad5e6f9fdb4a7caf9775 Mon Sep 17 00:00:00 2001
From: "Bartosz Kosiorek bartosz.kosio...@tomtom.com"
<bartosz.kosio...@tomtom.com>
Date: Thu, 3 Dec 2015 00:43:37 +0100
Subject: [PATCH 1/3] Extend copy and copy_if_different command with support
multiple files
This patch allows to use multiple files in command copy and copy_if_different.
Input files could be merged with wildcards.
If multipile input files were provided, then destination must be directory.
If only one input file was provided, then destination could be either
file or directory. This path is starting point for fixing bug 15703
---
Help/manual/cmake.1.rst | 12 ++++----
Source/cmcmd.cxx | 73 +++++++++++++++++++++++++++++++++++--------------
2 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index dac16bf..086f259 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -169,14 +169,14 @@ Available commands are:
``compare_files <file1> <file2>``
Check if file1 is same as file2.
-``copy <file> <destination>``
- Copy file to destination (either file or directory).
+``copy <file>... <destination>``
+ Copy files to 'destination' (either file or directory).
``copy_directory <source> <destination>``
Copy directory 'source' content to directory 'destination'.
-``copy_if_different <in-file> <out-file>``
- Copy file if input has changed.
+``copy_if_different <file>... <destination>``
+ Copy files if input has changed. Destination could be file or directory.
``echo [<string>...]``
Displays arguments as text.
@@ -193,10 +193,10 @@ Available commands are:
``make_directory <dir>``
Create a directory.
-``md5sum [<file>...]``
+``md5sum <file>...``
Compute md5sum of files.
-``remove [-f] [<file>...]``
+``remove [-f] <file>...``
Remove the file(s), use ``-f`` to force it.
``remove_directory <dir>``
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 21b126b..0dc5a9a 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -52,25 +52,25 @@ void CMakeCommandUsage(const char* program)
// If you add new commands, change here,
// and in cmakemain.cxx in the options table
errorStream
- << "Usage: " << program << " -E [command] [arguments ...]\n"
+ << "Usage: " << program << " -E <command> [arguments...]\n"
<< "Available commands: \n"
<< " chdir dir cmd [args]... - run command in a given directory\n"
<< " compare_files file1 file2 - check if file1 is same as file2\n"
- << " copy file destination - copy file to destination (either file "
- "or directory)\n"
+ << " copy <file>... destination - copy files to destination "
+ "(either file or directory)\n"
<< " copy_directory source destination - copy directory 'source' "
"content to directory 'destination'\n"
- << " copy_if_different in-file out-file - copy file if input has "
+ << " copy_if_different <file>... destination - copy files if it has "
"changed\n"
- << " echo [string]... - displays arguments as text\n"
- << " echo_append [string]... - displays arguments as text but no new "
+ << " echo [<string>...] - displays arguments as text\n"
+ << " echo_append [<string>...] - displays arguments as text but no new "
"line\n"
<< " env [--unset=NAME]... [NAME=VALUE]... COMMAND [ARG]...\n"
<< " - run command in a modified environment\n"
<< " environment - display the current environment\n"
<< " make_directory dir - create a directory\n"
- << " md5sum file1 [...] - compute md5sum of files\n"
- << " remove [-f] file1 file2 ... - remove the file(s), use -f to force "
+ << " md5sum <file>... - compute md5sum of files\n"
+ << " remove [-f] <file>... - remove the file(s), use -f to force "
"it\n"
<< " remove_directory dir - remove a directory and its contents\n"
<< " rename oldname newname - rename a file or directory "
@@ -78,7 +78,7 @@ void CMakeCommandUsage(const char* program)
<< " tar [cxt][vf][zjJ] file.tar [file/dir1 file/dir2 ...]\n"
<< " - create or extract a tar or zip archive\n"
<< " sleep <number>... - sleep for given number of seconds\n"
- << " time command [args] ... - run command and return elapsed time\n"
+ << " time command [args...] - run command and return elapsed time\n"
<< " touch file - touch a file.\n"
<< " touch_nocreate file - touch a file but do not create it.\n"
#if defined(_WIN32) && !defined(__CYGWIN__)
@@ -149,29 +149,60 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
if (args.size() > 1)
{
// Copy file
- if (args[1] == "copy" && args.size() == 4)
+ if (args[1] == "copy" && args.size() > 3)
{
- if(!cmSystemTools::cmCopyFile(args[2].c_str(), args[3].c_str()))
+ // If multiple source files specified,
+ // then destination must be directory
+ if ((args.size() > 4) &&
+ (!cmSystemTools::FileIsDirectory(args[args.size() - 1])))
{
- std::cerr << "Error copying file \"" << args[2]
- << "\" to \"" << args[3] << "\".\n";
+ std::cerr << "Error: Target (for copy command) \""
+ << args[args.size() - 1]
+ << "\" is not a directory.\n";
return 1;
}
- return 0;
+ // If error occurs we want to continue copying next files.
+ bool return_value = 0;
+ for (std::string::size_type cc = 2; cc < args.size() - 1; cc ++)
+ {
+ if(!cmSystemTools::cmCopyFile(args[cc].c_str(),
+ args[args.size() - 1].c_str()))
+ {
+ std::cerr << "Error copying file \"" << args[cc]
+ << "\" to \"" << args[args.size() - 1] << "\".\n";
+ return_value = 1;
+ }
+ }
+ return return_value;
}
// Copy file if different.
- if (args[1] == "copy_if_different" && args.size() == 4)
+ if (args[1] == "copy_if_different" && args.size() > 3)
{
- if(!cmSystemTools::CopyFileIfDifferent(args[2].c_str(),
- args[3].c_str()))
+ // If multiple source files specified,
+ // then destination must be directory
+ if ((args.size() > 4) &&
+ (!cmSystemTools::FileIsDirectory(args[args.size() - 1])))
{
- std::cerr << "Error copying file (if different) from \""
- << args[2] << "\" to \"" << args[3]
- << "\".\n";
+ std::cerr << "Error: Target (for copy_if_different command) \""
+ << args[args.size() - 1]
+ << "\" is not a directory.\n";
return 1;
}
- return 0;
+ // If error occurs we want to continue copying next files.
+ bool return_value = 0;
+ for (std::string::size_type cc = 2; cc < args.size() - 1; cc ++)
+ {
+ if(!cmSystemTools::CopyFileIfDifferent(args[cc].c_str(),
+ args[args.size() - 1].c_str()))
+ {
+ std::cerr << "Error copying file (if different) from \""
+ << args[cc] << "\" to \"" << args[args.size() - 1]
+ << "\".\n";
+ return_value = 1;
+ }
+ }
+ return return_value;
}
// Copy directory content
--
2.5.0
From 3774ba18d8e193b68685c84f4ccb0b0e4ea2b5a9 Mon Sep 17 00:00:00 2001
From: "Bartosz Kosiorek bartosz.kosio...@tomtom.com"
<bartosz.kosio...@tomtom.com>
Date: Thu, 3 Dec 2015 21:29:30 +0100
Subject: [PATCH 2/3] Add unit tests for "copy" and "copy_if_different"
commands
---
...source-directory-target-is-directory-result.txt | 1 +
...source-directory-target-is-directory-stderr.txt | 0
.../CommandLine/E_copy-one-source-file-result.txt | 1 +
.../CommandLine/E_copy-one-source-file-stderr.txt | 1 +
...ree-source-files-target-is-directory-result.txt | 1 +
...ree-source-files-target-is-directory-stderr.txt | 0
...py-three-source-files-target-is-file-result.txt | 1 +
...py-three-source-files-target-is-file-stderr.txt | 1 +
...bad-source-files-target-is-directory-result.txt | 1 +
...bad-source-files-target-is-directory-stderr.txt | 1 +
...source-directory-target-is-directory-result.txt | 1 +
...source-directory-target-is-directory-stderr.txt | 0
...ree-source-files-target-is-directory-result.txt | 1 +
...ree-source-files-target-is-directory-stderr.txt | 0
...nt-three-source-files-target-is-file-result.txt | 1 +
...nt-three-source-files-target-is-file-stderr.txt | 1 +
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 44 ++++++++++++++++++++++
.../CommandLine/test_copy_command_dir/file1.txt | 0
.../CommandLine/test_copy_command_dir/file2.txt | 0
.../CommandLine/test_copy_command_dir/file3.txt | 0
20 files changed, 56 insertions(+)
create mode 100644 Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-one-source-file-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-one-source-file-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/test_copy_command_dir/file1.txt
create mode 100644 Tests/RunCMake/CommandLine/test_copy_command_dir/file2.txt
create mode 100644 Tests/RunCMake/CommandLine/test_copy_command_dir/file3.txt
diff --git a/Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-result.txt b/Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-stderr.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/E_copy-one-source-file-result.txt b/Tests/RunCMake/CommandLine/E_copy-one-source-file-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-one-source-file-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/E_copy-one-source-file-stderr.txt b/Tests/RunCMake/CommandLine/E_copy-one-source-file-stderr.txt
new file mode 100644
index 0000000..9a9301d
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-one-source-file-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: .*
diff --git a/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-result.txt b/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-stderr.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-result.txt b/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-stderr.txt b/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-stderr.txt
new file mode 100644
index 0000000..2e23d0a
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-stderr.txt
@@ -0,0 +1 @@
+^Error: Target \(copy\).* is not a directory.$
diff --git a/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-result.txt b/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt
new file mode 100644
index 0000000..2d0d986
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt
@@ -0,0 +1 @@
+^Error copying file .*not_existing_file.bad\" to .*
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-result.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-stderr.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-result.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-stderr.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-result.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-stderr.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-stderr.txt
new file mode 100644
index 0000000..fe20f8c
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-stderr.txt
@@ -0,0 +1 @@
+^Error: Target \(copy_if_different\).* is not a directory.$
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 6b4b384..1fffa46 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -101,6 +101,50 @@ if(UNIX)
)
endif()
+set(RunCMake_copy_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/test_copy_command_dir)
+set(RunCMake_copy_TEST_SOURCE_DIR ${RunCMake_SOURCE_DIR}/test_copy_command_dir)
+run_cmake_command(E_copy-one-source-file ${CMAKE_COMMAND} -E copy
+ ${RunCMake_copy_TEST_BINARY_DIR}/file1.txt)
+run_cmake_command(E_copy-one-source-directory-target-is-directory
+ ${CMAKE_COMMAND} -E copy
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file1.txt
+ ${RunCMake_copy_TEST_BINARY_DIR})
+run_cmake_command(E_copy-three-source-files-target-is-directory
+ ${CMAKE_COMMAND} -E copy
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file1.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file2.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file3.txt
+ ${RunCMake_copy_TEST_BINARY_DIR})
+run_cmake_command(E_copy-three-source-files-target-is-file
+ ${CMAKE_COMMAND} -E copy
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file1.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file2.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file3.txt
+ ${RunCMake_copy_TEST_BINARY_DIR}/file1.txt)
+run_cmake_command(E_copy-two-good-and-one-bad-source-files-target-is-directory
+ ${CMAKE_COMMAND} -E copy
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file1.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/not_existing_file.bad
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file3.txt
+ ${RunCMake_copy_TEST_BINARY_DIR})
+
+run_cmake_command(E_copy_if_different-one-source-directory-target-is-directory
+ ${CMAKE_COMMAND} -E copy_if_different
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file1.txt
+ ${RunCMake_copy_TEST_BINARY_DIR})
+run_cmake_command(E_copy_if_different-three-source-files-target-is-directory
+ ${CMAKE_COMMAND} -E copy_if_different
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file1.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file2.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file3.txt
+ ${RunCMake_copy_TEST_BINARY_DIR})
+run_cmake_command(E_copy_if_different-three-source-files-target-is-file
+ ${CMAKE_COMMAND} -E copy_if_different
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file1.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file2.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file3.txt
+ ${RunCMake_copy_TEST_BINARY_DIR}/file1.txt)
+
run_cmake_command(E_env-no-command0 ${CMAKE_COMMAND} -E env)
run_cmake_command(E_env-no-command1 ${CMAKE_COMMAND} -E env TEST_ENV=1)
run_cmake_command(E_env-bad-arg1 ${CMAKE_COMMAND} -E env -bad-arg1)
diff --git a/Tests/RunCMake/CommandLine/test_copy_command_dir/file1.txt b/Tests/RunCMake/CommandLine/test_copy_command_dir/file1.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/test_copy_command_dir/file2.txt b/Tests/RunCMake/CommandLine/test_copy_command_dir/file2.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/test_copy_command_dir/file3.txt b/Tests/RunCMake/CommandLine/test_copy_command_dir/file3.txt
new file mode 100644
index 0000000..e69de29
--
2.5.0
From 8559959bcc58e72b9f1f629cacbb4ec9a2609496 Mon Sep 17 00:00:00 2001
From: "Bartosz Kosiorek bartosz.kosio...@tomtom.com"
<bartosz.kosio...@tomtom.com>
Date: Fri, 4 Dec 2015 14:44:41 +0100
Subject: [PATCH 3/3] Add support for glob by using SimpleGlob.h library
The library could download from site:
https://github.com/brofield/simpleopt
---
Source/cmcmd.cxx | 56 +++++++++++++++++-----
Source/cmcmd.h | 9 +++-
...ard-source-files-target-is-directory-result.txt | 1 +
...ard-source-files-target-is-directory-stderr.txt | 2 +
...bad-source-files-target-is-directory-stderr.txt | 2 +-
...ard-source-files-target-is-directory-result.txt | 1 +
...ard-source-files-target-is-directory-stderr.txt | 2 +
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 12 +++++
8 files changed, 71 insertions(+), 14 deletions(-)
create mode 100644 Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt
create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 0dc5a9a..2c125e5 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -52,7 +52,7 @@ void CMakeCommandUsage(const char* program)
// If you add new commands, change here,
// and in cmakemain.cxx in the options table
errorStream
- << "Usage: " << program << " -E <command> [arguments...]\n"
+ << "Usage: " << program << " -E [command] [arguments ...]\n"
<< "Available commands: \n"
<< " chdir dir cmd [args]... - run command in a given directory\n"
<< " compare_files file1 file2 - check if file1 is same as file2\n"
@@ -143,6 +143,29 @@ static bool cmTarFilesFrom(std::string const& file,
return true;
}
+int cmcmd::CreateGlobListFilesToCopy(CSimpleGlob &globToUse,
+ std::vector<std::string>& args)
+{
+ bool return_value = 0;
+ for (std::string::size_type cc = 2; cc < args.size() - 1; cc++)
+ {
+ int globResult = globToUse.Add(args[cc].c_str());
+ if (globResult == SG_ERR_NOMATCH)
+ {
+ std::cerr << "Error: Cannot stat \"" << args[cc].c_str()
+ << ": No such file.\n";
+ return_value = 1;
+ }
+ else if (globResult != SG_SUCCESS)
+ {
+ std::cerr << "Error: Cannot stat \"" << args[cc].c_str()
+ << ": General failure or out of memory.\n";
+ return 1;
+ }
+ }
+ return return_value;
+}
+
int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
{
// IF YOU ADD A NEW COMMAND, DOCUMENT IT ABOVE and in cmakemain.cxx
@@ -156,20 +179,25 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
if ((args.size() > 4) &&
(!cmSystemTools::FileIsDirectory(args[args.size() - 1])))
{
- std::cerr << "Error: Target (for copy command) \""
+ std::cerr << "Error: Target (copy) \""
<< args[args.size() - 1]
<< "\" is not a directory.\n";
return 1;
}
+
// If error occurs we want to continue copying next files.
bool return_value = 0;
- for (std::string::size_type cc = 2; cc < args.size() - 1; cc ++)
+ CSimpleGlob glob(SG_GLOB_ONLYFILE);
+ return_value = cmcmd::CreateGlobListFilesToCopy(glob, args);
+
+ for(int i = 0; i < glob.FileCount(); ++i)
{
- if(!cmSystemTools::cmCopyFile(args[cc].c_str(),
+ if (!cmSystemTools::cmCopyFile(glob.File(i),
args[args.size() - 1].c_str()))
{
- std::cerr << "Error copying file \"" << args[cc]
- << "\" to \"" << args[args.size() - 1] << "\".\n";
+ std::cerr << "Error: Unable to copy file \"" << glob.File(i)
+ << "\" to \"" << args[args.size() - 1].c_str()
+ << "\".\n";
return_value = 1;
}
}
@@ -184,21 +212,25 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
if ((args.size() > 4) &&
(!cmSystemTools::FileIsDirectory(args[args.size() - 1])))
{
- std::cerr << "Error: Target (for copy_if_different command) \""
+ std::cerr << "Error: Target (copy_if_different) \""
<< args[args.size() - 1]
<< "\" is not a directory.\n";
return 1;
}
+
// If error occurs we want to continue copying next files.
bool return_value = 0;
- for (std::string::size_type cc = 2; cc < args.size() - 1; cc ++)
+ CSimpleGlob glob(SG_GLOB_ONLYFILE);
+ return_value = cmcmd::CreateGlobListFilesToCopy(glob, args);
+
+ for(int i = 0; i < glob.FileCount(); ++i)
{
- if(!cmSystemTools::CopyFileIfDifferent(args[cc].c_str(),
+ if (!cmSystemTools::CopyFileIfDifferent(glob.File(i),
args[args.size() - 1].c_str()))
{
- std::cerr << "Error copying file (if different) from \""
- << args[cc] << "\" to \"" << args[args.size() - 1]
- << "\".\n";
+ std::cerr << "Error: Unable to copy file \"" << glob.File(i)
+ << "\" to \"" << args[args.size() - 1].c_str()
+ << "\".\n";
return_value = 1;
}
}
diff --git a/Source/cmcmd.h b/Source/cmcmd.h
index 64b2406..50ffa21 100644
--- a/Source/cmcmd.h
+++ b/Source/cmcmd.h
@@ -13,7 +13,11 @@
#ifndef cmcmd_h
#define cmcmd_h
-#include "cmStandardIncludes.h"
+#include "cmStandardIncludes.h"\
+
+// Taken from https://github.com/brofield/simpleopt
+// The trailing spaces in that file was already removed
+#include <SimpleGlob.h>
class cmcmd
{
@@ -35,6 +39,9 @@ protected:
static int WindowsCEEnvironment(const char* version,
const std::string& name);
static int VisualStudioLink(std::vector<std::string>& args, int type);
+private:
+ static int CreateGlobListFilesToCopy(CSimpleGlob &globToUse,
+ std::vector<std::string>& args);
};
#endif
diff --git a/Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt b/Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt
new file mode 100644
index 0000000..df91676
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt
@@ -0,0 +1,2 @@
+^Error: Cannot stat .*not_existing_file1.bad.* No such file..*
+Error: Cannot stat .*not_existing_file\*.bad.* No such file.
diff --git a/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt
index 2d0d986..51edf67 100644
--- a/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt
+++ b/Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt
@@ -1 +1 @@
-^Error copying file .*not_existing_file.bad\" to .*
+^Error: Cannot stat .*not_existing_file.bad.* No such file.
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt b/Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt
new file mode 100644
index 0000000..df91676
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory-stderr.txt
@@ -0,0 +1,2 @@
+^Error: Cannot stat .*not_existing_file1.bad.* No such file..*
+Error: Cannot stat .*not_existing_file\*.bad.* No such file.
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 1fffa46..6015f57 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -127,6 +127,12 @@ run_cmake_command(E_copy-two-good-and-one-bad-source-files-target-is-directory
${RunCMake_copy_TEST_SOURCE_DIR}/not_existing_file.bad
${RunCMake_copy_TEST_SOURCE_DIR}/file3.txt
${RunCMake_copy_TEST_BINARY_DIR})
+run_cmake_command(E_copy-two-bad-and-one-wildcard-source-files-target-is-directory
+ ${CMAKE_COMMAND} -E copy
+ ${RunCMake_copy_TEST_SOURCE_DIR}/not_existing_file1.bad
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file?.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/not_existing_file*.bad
+ ${RunCMake_copy_TEST_BINARY_DIR})
run_cmake_command(E_copy_if_different-one-source-directory-target-is-directory
${CMAKE_COMMAND} -E copy_if_different
@@ -144,6 +150,12 @@ run_cmake_command(E_copy_if_different-three-source-files-target-is-file
${RunCMake_copy_TEST_SOURCE_DIR}/file2.txt
${RunCMake_copy_TEST_SOURCE_DIR}/file3.txt
${RunCMake_copy_TEST_BINARY_DIR}/file1.txt)
+run_cmake_command(E_copy_if_different-two-bad-and-one-wildcard-source-files-target-is-directory
+ ${CMAKE_COMMAND} -E copy_if_different
+ ${RunCMake_copy_TEST_SOURCE_DIR}/not_existing_file1.bad
+ ${RunCMake_copy_TEST_SOURCE_DIR}/file?.txt
+ ${RunCMake_copy_TEST_SOURCE_DIR}/not_existing_file*.bad
+ ${RunCMake_copy_TEST_BINARY_DIR})
run_cmake_command(E_env-no-command0 ${CMAKE_COMMAND} -E env)
run_cmake_command(E_env-no-command1 ${CMAKE_COMMAND} -E env TEST_ENV=1)
--
2.5.0
/*! @file SimpleGlob.h
@version 3.6
@brief A cross-platform file globbing library providing the ability to
expand wildcards in command-line arguments to a list of all matching
files. It is designed explicitly to be portable to any platform and has
been tested on Windows and Linux. See CSimpleGlobTempl for the class
definition.
@section features FEATURES
- MIT Licence allows free use in all software (including GPL and
commercial)
- multi-platform (Windows 95/98/ME/NT/2K/XP, Linux, Unix)
- supports most of the standard linux glob() options
- recognition of a forward paths as equivalent to a backward slash
on Windows. e.g. "c:/path/foo*" is equivalent to "c:\path\foo*".
- implemented with only a single C++ header file
- char, wchar_t and Windows TCHAR in the same program
- complete working examples included
- compiles cleanly at warning level 4 (Windows/VC.NET 2003),
warning level 3 (Windows/VC6) and -Wall (Linux/gcc)
@section usage USAGE
The SimpleGlob class is used by following these steps:
<ol>
<li> Include the SimpleGlob.h header file
<pre>
\#include "SimpleGlob.h"
</pre>
<li> Instantiate a CSimpleGlob object supplying the appropriate flags.
<pre>
@link CSimpleGlobTempl CSimpleGlob @endlink glob(FLAGS);
</pre>
<li> Add all file specifications to the glob class.
<pre>
glob.Add("file*");
glob.Add(argc, argv);
</pre>
<li> Process all files with File(), Files() and FileCount()
<pre>
for (int n = 0; n < glob.FileCount(); ++n) {
ProcessFile(glob.File(n));
}
</pre>
</ol>
@section licence MIT LICENCE
<pre>
The licence text below is the boilerplate "MIT Licence" used from:
http://www.opensource.org/licenses/mit-license.php
Copyright (c) 2006-2013, Brodie Thiesfield
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</pre>
*/
#ifndef INCLUDED_SimpleGlob
#define INCLUDED_SimpleGlob
/*! @brief The operation of SimpleGlob is fine-tuned via the use of a
combination of the following flags.
The flags may be passed at initialization of the class and used for every
filespec added, or alternatively they may optionally be specified in the
call to Add() and be different for each filespec.
@param SG_GLOB_ERR
Return upon read error (e.g. directory does not have read permission)
@param SG_GLOB_MARK
Append a slash (backslash in Windows) to every path which corresponds
to a directory
@param SG_GLOB_NOSORT
By default, files are returned in sorted into string order. With this
flag, no sorting is done. This is not compatible with
SG_GLOB_FULLSORT.
@param SG_GLOB_FULLSORT
By default, files are sorted in groups belonging to each filespec that
was added. For example if the filespec "b*" was added before the
filespec "a*" then the argv array will contain all b* files sorted in
order, followed by all a* files sorted in order. If this flag is
specified, the entire array will be sorted ignoring the filespec
groups.
@param SG_GLOB_NOCHECK
If the pattern doesn't match anything, return the original pattern.
@param SG_GLOB_TILDE
Tilde expansion is carried out (on Unix platforms)
@param SG_GLOB_ONLYDIR
Return only directories which match (not compatible with
SG_GLOB_ONLYFILE)
@param SG_GLOB_ONLYFILE
Return only files which match (not compatible with SG_GLOB_ONLYDIR)
@param SG_GLOB_NODOT
Do not return the "." or ".." special directories.
*/
enum SG_Flags {
SG_GLOB_ERR = 1 << 0,
SG_GLOB_MARK = 1 << 1,
SG_GLOB_NOSORT = 1 << 2,
SG_GLOB_NOCHECK = 1 << 3,
SG_GLOB_TILDE = 1 << 4,
SG_GLOB_ONLYDIR = 1 << 5,
SG_GLOB_ONLYFILE = 1 << 6,
SG_GLOB_NODOT = 1 << 7,
SG_GLOB_FULLSORT = 1 << 8
};
/*! @brief Error return codes */
enum SG_Error {
SG_SUCCESS = 0,
SG_ERR_NOMATCH = 1,
SG_ERR_MEMORY = -1,
SG_ERR_FAILURE = -2
};
// ---------------------------------------------------------------------------
// Platform dependent implementations
// if we aren't on Windows and we have ICU available, then enable ICU
// by default. Define this to 0 to intentially disable it.
#ifndef SG_HAVE_ICU
# if !defined(_WIN32) && defined(USTRING_H)
# define SG_HAVE_ICU 1
# else
# define SG_HAVE_ICU 0
# endif
#endif
// don't include this in documentation as it isn't relevant
#ifndef DOXYGEN
// on Windows we want to use MBCS aware string functions and mimic the
// Unix glob functionality. On Unix we just use glob.
#ifdef _WIN32
# include <mbstring.h>
# define sg_strchr ::_mbschr
# define sg_strrchr ::_mbsrchr
# define sg_strlen ::_mbslen
# if __STDC_WANT_SECURE_LIB__
# define sg_strcpy_s(a,n,b) ::_mbscpy_s(a,n,b)
# else
# define sg_strcpy_s(a,n,b) ::_mbscpy(a,b)
# endif
# define sg_strcmp ::_mbscmp
# define sg_strcasecmp ::_mbsicmp
# define SOCHAR_T unsigned char
#else
# include <sys/types.h>
# include <sys/stat.h>
# include <glob.h>
# include <limits.h>
# define MAX_PATH PATH_MAX
# define sg_strchr ::strchr
# define sg_strrchr ::strrchr
# define sg_strlen ::strlen
# define sg_strcpy_s(a,n,b) ::strcpy(a,b)
# define sg_strcmp ::strcmp
# define sg_strcasecmp ::strcasecmp
# define SOCHAR_T char
#endif
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
// use assertions to test the input data
#ifdef _DEBUG
# ifdef _MSC_VER
# include <crtdbg.h>
# define SG_ASSERT(b) _ASSERTE(b)
# else
# include <assert.h>
# define SG_ASSERT(b) assert(b)
# endif
#else
# define SG_ASSERT(b)
#endif
/*! @brief String manipulation functions. */
class SimpleGlobUtil
{
public:
static const char * strchr(const char *s, char c) {
return (char *) sg_strchr((const SOCHAR_T *)s, c);
}
static const wchar_t * strchr(const wchar_t *s, wchar_t c) {
return ::wcschr(s, c);
}
#if SG_HAVE_ICU
static const UChar * strchr(const UChar *s, UChar c) {
return ::u_strchr(s, c);
}
#endif
static const char * strrchr(const char *s, char c) {
return (char *) sg_strrchr((const SOCHAR_T *)s, c);
}
static const wchar_t * strrchr(const wchar_t *s, wchar_t c) {
return ::wcsrchr(s, c);
}
#if SG_HAVE_ICU
static const UChar * strrchr(const UChar *s, UChar c) {
return ::u_strrchr(s, c);
}
#endif
// Note: char strlen returns number of bytes, not characters
static size_t strlen(const char *s) { return ::strlen(s); }
static size_t strlen(const wchar_t *s) { return ::wcslen(s); }
#if SG_HAVE_ICU
static size_t strlen(const UChar *s) { return ::u_strlen(s); }
#endif
static void strcpy_s(char *dst, size_t n, const char *src) {
(void) n;
sg_strcpy_s((SOCHAR_T *)dst, n, (const SOCHAR_T *)src);
}
static void strcpy_s(wchar_t *dst, size_t n, const wchar_t *src) {
# if __STDC_WANT_SECURE_LIB__
::wcscpy_s(dst, n, src);
#else
(void) n;
::wcscpy(dst, src);
#endif
}
#if SG_HAVE_ICU
static void strcpy_s(UChar *dst, size_t n, const UChar *src) {
::u_strncpy(dst, src, n);
}
#endif
static int strcmp(const char *s1, const char *s2) {
return sg_strcmp((const SOCHAR_T *)s1, (const SOCHAR_T *)s2);
}
static int strcmp(const wchar_t *s1, const wchar_t *s2) {
return ::wcscmp(s1, s2);
}
#if SG_HAVE_ICU
static int strcmp(const UChar *s1, const UChar *s2) {
return ::u_strcmp(s1, s2);
}
#endif
static int strcasecmp(const char *s1, const char *s2) {
return sg_strcasecmp((const SOCHAR_T *)s1, (const SOCHAR_T *)s2);
}
#if _WIN32
static int strcasecmp(const wchar_t *s1, const wchar_t *s2) {
return ::_wcsicmp(s1, s2);
}
#endif // _WIN32
#if SG_HAVE_ICU
static int strcasecmp(const UChar *s1, const UChar *s2) {
return u_strcasecmp(s1, s2, 0);
}
#endif
};
enum SG_FileType {
SG_FILETYPE_INVALID,
SG_FILETYPE_FILE,
SG_FILETYPE_DIR
};
#ifdef _WIN32
#ifndef INVALID_FILE_ATTRIBUTES
# define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
#define SG_PATH_CHAR '\\'
/*! @brief Windows glob implementation. */
template<class SOCHAR>
struct SimpleGlobBase
{
SimpleGlobBase() : m_hFind(INVALID_HANDLE_VALUE) { }
int FindFirstFileS(const char * a_pszFileSpec, unsigned int) {
m_hFind = FindFirstFileA(a_pszFileSpec, &m_oFindDataA);
if (m_hFind != INVALID_HANDLE_VALUE) {
return SG_SUCCESS;
}
DWORD dwErr = GetLastError();
if (dwErr == ERROR_FILE_NOT_FOUND) {
return SG_ERR_NOMATCH;
}
return SG_ERR_FAILURE;
}
int FindFirstFileS(const wchar_t * a_pszFileSpec, unsigned int) {
m_hFind = FindFirstFileW(a_pszFileSpec, &m_oFindDataW);
if (m_hFind != INVALID_HANDLE_VALUE) {
return SG_SUCCESS;
}
DWORD dwErr = GetLastError();
if (dwErr == ERROR_FILE_NOT_FOUND) {
return SG_ERR_NOMATCH;
}
return SG_ERR_FAILURE;
}
bool FindNextFileS(char) {
return FindNextFileA(m_hFind, &m_oFindDataA) != FALSE;
}
bool FindNextFileS(wchar_t) {
return FindNextFileW(m_hFind, &m_oFindDataW) != FALSE;
}
void FindDone() {
FindClose(m_hFind);
}
const char * GetFileNameS(char) const {
return m_oFindDataA.cFileName;
}
const wchar_t * GetFileNameS(wchar_t) const {
return m_oFindDataW.cFileName;
}
bool IsDirS(char) const {
return this->GetFileTypeS(m_oFindDataA.dwFileAttributes) == SG_FILETYPE_DIR;
}
bool IsDirS(wchar_t) const {
return this->GetFileTypeS(m_oFindDataW.dwFileAttributes) == SG_FILETYPE_DIR;
}
SG_FileType GetFileTypeS(const char * a_pszPath) {
return this->GetFileTypeS(GetFileAttributesA(a_pszPath));
}
SG_FileType GetFileTypeS(const wchar_t * a_pszPath) {
return this->GetFileTypeS(GetFileAttributesW(a_pszPath));
}
SG_FileType GetFileTypeS(DWORD a_dwAttribs) const {
if (a_dwAttribs == INVALID_FILE_ATTRIBUTES) {
return SG_FILETYPE_INVALID;
}
if (a_dwAttribs & FILE_ATTRIBUTE_DIRECTORY) {
return SG_FILETYPE_DIR;
}
return SG_FILETYPE_FILE;
}
private:
HANDLE m_hFind;
WIN32_FIND_DATAA m_oFindDataA;
WIN32_FIND_DATAW m_oFindDataW;
};
#else // !_WIN32
#define SG_PATH_CHAR '/'
/*! @brief Unix glob implementation. */
template<class SOCHAR>
struct SimpleGlobBase
{
SimpleGlobBase() {
memset(&m_glob, 0, sizeof(m_glob));
m_uiCurr = (size_t)-1;
}
~SimpleGlobBase() {
globfree(&m_glob);
}
void FilePrep() {
m_bIsDir = false;
size_t len = strlen(m_glob.gl_pathv[m_uiCurr]);
if (m_glob.gl_pathv[m_uiCurr][len-1] == '/') {
m_bIsDir = true;
m_glob.gl_pathv[m_uiCurr][len-1] = 0;
}
}
int FindFirstFileS(const char * a_pszFileSpec, unsigned int a_uiFlags) {
int nFlags = GLOB_MARK | GLOB_NOSORT;
if (a_uiFlags & SG_GLOB_ERR) nFlags |= GLOB_ERR;
if (a_uiFlags & SG_GLOB_TILDE) nFlags |= GLOB_TILDE;
int rc = glob(a_pszFileSpec, nFlags, NULL, &m_glob);
if (rc == GLOB_NOSPACE) return SG_ERR_MEMORY;
if (rc == GLOB_ABORTED) return SG_ERR_FAILURE;
if (rc == GLOB_NOMATCH) return SG_ERR_NOMATCH;
m_uiCurr = 0;
FilePrep();
return SG_SUCCESS;
}
#if SG_HAVE_ICU
int FindFirstFileS(const UChar * a_pszFileSpec, unsigned int a_uiFlags) {
char buf[PATH_MAX] = { 0 };
UErrorCode status = U_ZERO_ERROR;
u_strToUTF8(buf, sizeof(buf), NULL, a_pszFileSpec, -1, &status);
if (U_FAILURE(status)) return SG_ERR_FAILURE;
return this->FindFirstFileS(buf, a_uiFlags);
}
#endif
bool FindNextFileS(char) {
SG_ASSERT(m_uiCurr != (size_t)-1);
if (++m_uiCurr >= m_glob.gl_pathc) {
return false;
}
FilePrep();
return true;
}
#if SG_HAVE_ICU
bool FindNextFileS(UChar) {
return this->FindNextFileS((char)0);
}
#endif
void FindDone() {
globfree(&m_glob);
memset(&m_glob, 0, sizeof(m_glob));
m_uiCurr = (size_t)-1;
}
const char * GetFileNameS(char) const {
SG_ASSERT(m_uiCurr != (size_t)-1);
return m_glob.gl_pathv[m_uiCurr];
}
#if SG_HAVE_ICU
const UChar * GetFileNameS(UChar) const {
const char * pszFile = this->GetFileNameS((char)0);
if (!pszFile) return NULL;
UErrorCode status = U_ZERO_ERROR;
memset(m_szBuf, 0, sizeof(m_szBuf));
u_strFromUTF8(m_szBuf, PATH_MAX, NULL, pszFile, -1, &status);
if (U_FAILURE(status)) return NULL;
return m_szBuf;
}
#endif
bool IsDirS(char) const {
SG_ASSERT(m_uiCurr != (size_t)-1);
return m_bIsDir;
}
#if SG_HAVE_ICU
bool IsDirS(UChar) const {
return this->IsDirS((char)0);
}
#endif
SG_FileType GetFileTypeS(const char * a_pszPath) const {
struct stat sb;
if (0 != stat(a_pszPath, &sb)) {
return SG_FILETYPE_INVALID;
}
if (S_ISDIR(sb.st_mode)) {
return SG_FILETYPE_DIR;
}
if (S_ISREG(sb.st_mode)) {
return SG_FILETYPE_FILE;
}
return SG_FILETYPE_INVALID;
}
#if SG_HAVE_ICU
SG_FileType GetFileTypeS(const UChar * a_pszPath) const {
char buf[PATH_MAX] = { 0 };
UErrorCode status = U_ZERO_ERROR;
u_strToUTF8(buf, sizeof(buf), NULL, a_pszPath, -1, &status);
if (U_FAILURE(status)) return SG_FILETYPE_INVALID;
return this->GetFileTypeS(buf);
}
#endif
private:
glob_t m_glob;
size_t m_uiCurr;
bool m_bIsDir;
#if SG_HAVE_ICU
mutable UChar m_szBuf[PATH_MAX];
#endif
};
#endif // _WIN32
#endif // DOXYGEN
// ---------------------------------------------------------------------------
// MAIN TEMPLATE CLASS
// ---------------------------------------------------------------------------
/*! @brief Implementation of the SimpleGlob class */
template<class SOCHAR>
class CSimpleGlobTempl : private SimpleGlobBase<SOCHAR>
{
public:
/*! @brief Initialize the class.
@param a_uiFlags Combination of SG_GLOB flags.
@param a_nReservedSlots Number of slots in the argv array that
should be reserved. In the returned array these slots
argv[0] ... argv[a_nReservedSlots-1] will be left empty for
the caller to fill in.
*/
CSimpleGlobTempl(unsigned int a_uiFlags = 0, int a_nReservedSlots = 0);
/*! @brief Deallocate all memory buffers. */
~CSimpleGlobTempl();
/*! @brief Initialize (or re-initialize) the class in preparation for
adding new filespecs.
All existing files are cleared. Note that allocated memory is only
deallocated at object destruction.
@param a_uiFlags Combination of SG_GLOB flags.
@param a_nReservedSlots Number of slots in the argv array that
should be reserved. In the returned array these slots
argv[0] ... argv[a_nReservedSlots-1] will be left empty for
the caller to fill in.
*/
int Init(unsigned int a_uiFlags = 0, int a_nReservedSlots = 0);
/*! @brief Add a new filespec to the glob.
The filesystem will be immediately scanned for all matching files and
directories and they will be added to the glob.
@param a_pszFileSpec Filespec to add to the glob.
@return SG_SUCCESS Matching files were added to the glob.
@return SG_ERR_NOMATCH Nothing matched the pattern. To ignore this
error compare return value to >= SG_SUCCESS.
@return SG_ERR_MEMORY Out of memory failure.
@return SG_ERR_FAILURE General failure.
*/
int Add(const SOCHAR *a_pszFileSpec);
/*! @brief Add an array of filespec to the glob.
The filesystem will be immediately scanned for all matching files and
directories in each filespec and they will be added to the glob.
@param a_nCount Number of filespec in the array.
@param a_rgpszFileSpec Array of filespec to add to the glob.
@return SG_SUCCESS Matching files were added to the glob.
@return SG_ERR_NOMATCH Nothing matched the pattern. To ignore this
error compare return value to >= SG_SUCCESS.
@return SG_ERR_MEMORY Out of memory failure.
@return SG_ERR_FAILURE General failure.
*/
int Add(int a_nCount, const SOCHAR * const * a_rgpszFileSpec);
/*! @brief Return the number of files in the argv array.
*/
inline int FileCount() const { return m_nArgsLen; }
/*! @brief Return the full argv array. */
inline SOCHAR ** Files() {
SetArgvArrayType(POINTERS);
return m_rgpArgs;
}
/*! @brief Return the a single file. */
inline SOCHAR * File(int n) {
SG_ASSERT(n >= 0 && n < m_nArgsLen);
return Files()[n];
}
private:
CSimpleGlobTempl(const CSimpleGlobTempl &); // disabled
CSimpleGlobTempl & operator=(const CSimpleGlobTempl &); // disabled
/*! @brief The argv array has it's members stored as either an offset into
the string buffer, or as pointers to their string in the buffer. The
offsets are used because if the string buffer is dynamically resized,
all pointers into that buffer would become invalid.
*/
enum ARG_ARRAY_TYPE { OFFSETS, POINTERS };
/*! @brief Change the type of data stored in the argv array. */
void SetArgvArrayType(ARG_ARRAY_TYPE a_nNewType);
/*! @brief Add a filename to the array if it passes all requirements. */
int AppendName(const SOCHAR *a_pszFileName, bool a_bIsDir);
/*! @brief Grow the argv array to the required size. */
bool GrowArgvArray(int a_nNewLen);
/*! @brief Grow the string buffer to the required size. */
bool GrowStringBuffer(size_t a_uiMinSize);
/*! @brief Compare two (possible NULL) strings */
static int fileSortCompare(const void *a1, const void *a2);
private:
unsigned int m_uiFlags;
ARG_ARRAY_TYPE m_nArgArrayType; //!< argv is indexes or pointers
SOCHAR ** m_rgpArgs; //!< argv
int m_nReservedSlots; //!< # client slots in argv array
int m_nArgsSize; //!< allocated size of array
int m_nArgsLen; //!< used length
SOCHAR * m_pBuffer; //!< argv string buffer
size_t m_uiBufferSize; //!< allocated size of buffer
size_t m_uiBufferLen; //!< used length of buffer
SOCHAR m_szPathPrefix[MAX_PATH]; //!< wildcard path prefix
};
// ---------------------------------------------------------------------------
// IMPLEMENTATION
// ---------------------------------------------------------------------------
template<class SOCHAR>
CSimpleGlobTempl<SOCHAR>::CSimpleGlobTempl(
unsigned int a_uiFlags,
int a_nReservedSlots
)
{
m_rgpArgs = NULL;
m_nArgsSize = 0;
m_pBuffer = NULL;
m_uiBufferSize = 0;
Init(a_uiFlags, a_nReservedSlots);
}
template<class SOCHAR>
CSimpleGlobTempl<SOCHAR>::~CSimpleGlobTempl()
{
if (m_rgpArgs) free(m_rgpArgs);
if (m_pBuffer) free(m_pBuffer);
}
template<class SOCHAR>
int
CSimpleGlobTempl<SOCHAR>::Init(
unsigned int a_uiFlags,
int a_nReservedSlots
)
{
m_nArgArrayType = POINTERS;
m_uiFlags = a_uiFlags;
m_nArgsLen = a_nReservedSlots;
m_nReservedSlots = a_nReservedSlots;
m_uiBufferLen = 0;
if (m_nReservedSlots > 0) {
if (!GrowArgvArray(m_nReservedSlots)) {
return SG_ERR_MEMORY;
}
for (int n = 0; n < m_nReservedSlots; ++n) {
m_rgpArgs[n] = NULL;
}
}
return SG_SUCCESS;
}
template<class SOCHAR>
int
CSimpleGlobTempl<SOCHAR>::Add(
const SOCHAR *a_pszFileSpec
)
{
#ifdef _WIN32
// Windows FindFirst/FindNext recognizes forward slash as the same as
// backward slash and follows the directories. We need to do the same
// when calculating the prefix and when we have no wildcards.
SOCHAR szFileSpec[MAX_PATH];
SimpleGlobUtil::strcpy_s(szFileSpec, MAX_PATH, a_pszFileSpec);
const SOCHAR * pszPath = SimpleGlobUtil::strchr(szFileSpec, '/');
while (pszPath) {
szFileSpec[pszPath - szFileSpec] = SG_PATH_CHAR;
pszPath = SimpleGlobUtil::strchr(pszPath + 1, '/');
}
a_pszFileSpec = szFileSpec;
#endif
// if this doesn't contain wildcards then we can just add it directly
m_szPathPrefix[0] = 0;
if (!SimpleGlobUtil::strchr(a_pszFileSpec, '*') &&
!SimpleGlobUtil::strchr(a_pszFileSpec, '?'))
{
SG_FileType nType = this->GetFileTypeS(a_pszFileSpec);
if (nType == SG_FILETYPE_INVALID) {
if (m_uiFlags & SG_GLOB_NOCHECK) {
return AppendName(a_pszFileSpec, false);
}
return SG_ERR_NOMATCH;
}
return AppendName(a_pszFileSpec, nType == SG_FILETYPE_DIR);
}
#ifdef _WIN32
// Windows doesn't return the directory with the filename, so we need to
// extract the path from the search string ourselves and prefix it to the
// filename we get back.
const SOCHAR * pszFilename =
SimpleGlobUtil::strrchr(a_pszFileSpec, SG_PATH_CHAR);
if (pszFilename) {
SimpleGlobUtil::strcpy_s(m_szPathPrefix, MAX_PATH, a_pszFileSpec);
m_szPathPrefix[pszFilename - a_pszFileSpec + 1] = 0;
}
#endif
// search for the first match on the file
int rc = this->FindFirstFileS(a_pszFileSpec, m_uiFlags);
if (rc != SG_SUCCESS) {
if (rc == SG_ERR_NOMATCH && (m_uiFlags & SG_GLOB_NOCHECK)) {
int ok = AppendName(a_pszFileSpec, false);
if (ok != SG_SUCCESS) rc = ok;
}
return rc;
}
// add it and find all subsequent matches
int nError, nStartLen = m_nArgsLen;
bool bSuccess;
do {
nError = AppendName(this->GetFileNameS((SOCHAR)0), this->IsDirS((SOCHAR)0));
bSuccess = this->FindNextFileS((SOCHAR)0);
}
while (nError == SG_SUCCESS && bSuccess);
SimpleGlobBase<SOCHAR>::FindDone();
// sort these files if required
if (m_nArgsLen > nStartLen && !(m_uiFlags & SG_GLOB_NOSORT)) {
if (m_uiFlags & SG_GLOB_FULLSORT) {
nStartLen = m_nReservedSlots;
}
SetArgvArrayType(POINTERS);
qsort(
m_rgpArgs + nStartLen,
m_nArgsLen - nStartLen,
sizeof(m_rgpArgs[0]), fileSortCompare);
}
return nError;
}
template<class SOCHAR>
int
CSimpleGlobTempl<SOCHAR>::Add(
int a_nCount,
const SOCHAR * const * a_rgpszFileSpec
)
{
int nResult;
for (int n = 0; n < a_nCount; ++n) {
nResult = Add(a_rgpszFileSpec[n]);
if (nResult != SG_SUCCESS) {
return nResult;
}
}
return SG_SUCCESS;
}
template<class SOCHAR>
int
CSimpleGlobTempl<SOCHAR>::AppendName(
const SOCHAR * a_pszFileName,
bool a_bIsDir
)
{
// we need the argv array as offsets in case we resize it
SetArgvArrayType(OFFSETS);
// check for special cases which cause us to ignore this entry
if ((m_uiFlags & SG_GLOB_ONLYDIR) && !a_bIsDir) {
return SG_SUCCESS;
}
if ((m_uiFlags & SG_GLOB_ONLYFILE) && a_bIsDir) {
return SG_SUCCESS;
}
if ((m_uiFlags & SG_GLOB_NODOT) && a_bIsDir) {
if (a_pszFileName[0] == '.') {
if (a_pszFileName[1] == '\0') {
return SG_SUCCESS;
}
if (a_pszFileName[1] == '.' && a_pszFileName[2] == '\0') {
return SG_SUCCESS;
}
}
}
// ensure that we have enough room in the argv array
if (!GrowArgvArray(m_nArgsLen + 1)) {
return SG_ERR_MEMORY;
}
// ensure that we have enough room in the string buffer (+1 for null)
size_t uiPrefixLen = SimpleGlobUtil::strlen(m_szPathPrefix);
size_t uiLen = uiPrefixLen + SimpleGlobUtil::strlen(a_pszFileName) + 1;
if (a_bIsDir && (m_uiFlags & SG_GLOB_MARK) == SG_GLOB_MARK) {
++uiLen; // need space for the backslash
}
if (!GrowStringBuffer(m_uiBufferLen + uiLen)) {
return SG_ERR_MEMORY;
}
// add this entry. m_uiBufferLen is offset from beginning of buffer.
m_rgpArgs[m_nArgsLen++] = (SOCHAR*)m_uiBufferLen;
SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen,
m_uiBufferSize - m_uiBufferLen, m_szPathPrefix);
SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen + uiPrefixLen,
m_uiBufferSize - m_uiBufferLen - uiPrefixLen, a_pszFileName);
m_uiBufferLen += uiLen;
// add the directory slash if desired
if (a_bIsDir && (m_uiFlags & SG_GLOB_MARK) == SG_GLOB_MARK) {
const static SOCHAR szDirSlash[] = { SG_PATH_CHAR, 0 };
SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen - 2,
m_uiBufferSize - (m_uiBufferLen - 2), szDirSlash);
}
return SG_SUCCESS;
}
template<class SOCHAR>
void
CSimpleGlobTempl<SOCHAR>::SetArgvArrayType(
ARG_ARRAY_TYPE a_nNewType
)
{
if (m_nArgArrayType == a_nNewType) return;
if (a_nNewType == POINTERS) {
SG_ASSERT(m_nArgArrayType == OFFSETS);
for (int n = 0; n < m_nArgsLen; ++n) {
m_rgpArgs[n] = (m_rgpArgs[n] == (SOCHAR*)-1) ?
NULL : m_pBuffer + (size_t) m_rgpArgs[n];
}
}
else {
SG_ASSERT(a_nNewType == OFFSETS);
SG_ASSERT(m_nArgArrayType == POINTERS);
for (int n = 0; n < m_nArgsLen; ++n) {
m_rgpArgs[n] = (m_rgpArgs[n] == NULL) ?
(SOCHAR*) -1 : (SOCHAR*) (m_rgpArgs[n] - m_pBuffer);
}
}
m_nArgArrayType = a_nNewType;
}
template<class SOCHAR>
bool
CSimpleGlobTempl<SOCHAR>::GrowArgvArray(
int a_nNewLen
)
{
if (a_nNewLen >= m_nArgsSize) {
static const int SG_ARGV_INITIAL_SIZE = 32;
int nNewSize = (m_nArgsSize > 0) ?
m_nArgsSize * 2 : SG_ARGV_INITIAL_SIZE;
while (a_nNewLen >= nNewSize) {
nNewSize *= 2;
}
void * pNewBuffer = realloc(m_rgpArgs, nNewSize * sizeof(SOCHAR*));
if (!pNewBuffer) return false;
m_nArgsSize = nNewSize;
m_rgpArgs = (SOCHAR**) pNewBuffer;
}
return true;
}
template<class SOCHAR>
bool
CSimpleGlobTempl<SOCHAR>::GrowStringBuffer(
size_t a_uiMinSize
)
{
if (a_uiMinSize >= m_uiBufferSize) {
static const int SG_BUFFER_INITIAL_SIZE = 1024;
size_t uiNewSize = (m_uiBufferSize > 0) ?
m_uiBufferSize * 2 : SG_BUFFER_INITIAL_SIZE;
while (a_uiMinSize >= uiNewSize) {
uiNewSize *= 2;
}
void * pNewBuffer = realloc(m_pBuffer, uiNewSize * sizeof(SOCHAR));
if (!pNewBuffer) return false;
m_uiBufferSize = uiNewSize;
m_pBuffer = (SOCHAR*) pNewBuffer;
}
return true;
}
template<class SOCHAR>
int
CSimpleGlobTempl<SOCHAR>::fileSortCompare(
const void *a1,
const void *a2
)
{
const SOCHAR * s1 = *(const SOCHAR **)a1;
const SOCHAR * s2 = *(const SOCHAR **)a2;
if (s1 && s2) {
return SimpleGlobUtil::strcasecmp(s1, s2);
}
// NULL sorts first
return s1 == s2 ? 0 : (s1 ? 1 : -1);
}
// ---------------------------------------------------------------------------
// TYPE DEFINITIONS
// ---------------------------------------------------------------------------
/*! @brief ASCII/MBCS version of CSimpleGlob */
typedef CSimpleGlobTempl<char> CSimpleGlobA;
/*! @brief wchar_t version of CSimpleGlob */
typedef CSimpleGlobTempl<wchar_t> CSimpleGlobW;
#if SG_HAVE_ICU
/*! @brief UChar version of CSimpleGlob */
typedef CSimpleGlobTempl<UChar> CSimpleGlobU;
#endif
#ifdef _UNICODE
/*! @brief TCHAR version dependent on if _UNICODE is defined */
# if SG_HAVE_ICU
# define CSimpleGlob CSimpleGlobU
# else
# define CSimpleGlob CSimpleGlobW
# endif
#else
/*! @brief TCHAR version dependent on if _UNICODE is defined */
# define CSimpleGlob CSimpleGlobA
#endif
#endif // INCLUDED_SimpleGlob
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
