[Cmake-commits] CMake branch, next, updated. v2.8.3-1572-ga3a96c2
David Cole
david.cole at kitware.com
Fri Feb 4 12:03:06 EST 2011
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, next has been updated
via a3a96c28320204968d2df40bd17702aae26ee4f0 (commit)
via 1019d8272758ba615aface2291faca2bd53a5f0b (commit)
via 2434d8826ee193f38090d97f73bdbf276bf7df10 (commit)
from ed1f5d77c6957788685ccf96fca296d7fc39da88 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3a96c28320204968d2df40bd17702aae26ee4f0
commit a3a96c28320204968d2df40bd17702aae26ee4f0
Merge: ed1f5d7 1019d82
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Feb 4 12:03:02 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 4 12:03:02 2011 -0500
Merge topic 'fix-10446-improve-dash-E-docs' into next
1019d82 Documentation: Sync two differing copies of -E docs (#10446)
2434d88 Documentation: document platform specific -E commands (#10446)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1019d8272758ba615aface2291faca2bd53a5f0b
commit 1019d8272758ba615aface2291faca2bd53a5f0b
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Feb 4 11:36:21 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Feb 4 11:45:26 2011 -0500
Documentation: Sync two differing copies of -E docs (#10446)
Alphabetize both lists. Put platform-specific docs in both places too.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index bab0aaf..a1a3a68 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -979,37 +979,39 @@ void CMakeCommandUsage(const char* program)
errorStream
<< "Usage: " << program << " -E [command] [arguments ...]\n"
<< "Available commands: \n"
+ << " build build_dir - build the project in build_dir.\n"
<< " chdir dir cmd [args]... - run command in a given directory\n"
- << " rename oldname newname - rename a file or directory "
- "(on one volume)\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_if_different in-file out-file - copy file if input has "
- "changed\n"
<< " copy_directory source destination - copy directory 'source' "
"content to directory 'destination'\n"
- << " compare_files file1 file2 - check if file1 is same as file2\n"
+ << " copy_if_different in-file out-file - copy file if input has "
+ "changed\n"
<< " echo [string]... - displays arguments as text\n"
<< " echo_append [string]... - displays arguments as text but no new "
"line\n"
<< " environment - display the current environment\n"
<< " make_directory dir - create a directory\n"
<< " md5sum file1 [...] - compute md5sum of files\n"
- << " remove_directory dir - remove a directory and its contents\n"
<< " remove [-f] file1 file2 ... - 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 "
+ "(on one volume)\n"
<< " tar [cxt][vfz][cvfj] file.tar "
"file/dir1 file/dir2 ... - create a tar "
"archive\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"
- << " build build_dir - build the project in build_dir.\n"
#if defined(_WIN32) && !defined(__CYGWIN__)
- << " write_regv key value - write registry value\n"
- << " delete_regv key - delete registry value\n"
+ << "Available on Windows only:\n"
<< " comspec - on windows 9x use this for RunCommand\n"
+ << " delete_regv key - delete registry value\n"
+ << " write_regv key value - write registry value\n"
#else
+ << "Available on UNIX only:\n"
<< " create_symlink old new - create a symbolic link new -> old\n"
#endif
;
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index c63f667..a5dca18 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -71,13 +71,13 @@ static const char * cmDocumentationOptions[][3] =
{"-E", "CMake command mode.",
"For true platform independence, CMake provides a list of commands "
"that can be used on all systems. Run with -E help for the usage "
- "information. Commands available are: chdir, copy, copy_if_different "
- "copy_directory, compare_files, echo, echo_append, environment, "
- "make_directory, md5sum, remove_directory, remove, tar, time, "
+ "information. Commands available are: build, chdir, compare_files, copy, "
+ "copy_directory, copy_if_different, echo, echo_append, environment, "
+ "make_directory, md5sum, remove, remove_directory, rename, tar, time, "
"touch, touch_nocreate. In addition, some platform specific commands "
"are available. "
- "Windows: comspec, delete_regv, write_regv. "
- "UNIX: create_symlink."},
+ "On Windows: comspec, delete_regv, write_regv. "
+ "On UNIX: create_symlink."},
{"-i", "Run in wizard mode.",
"Wizard mode runs cmake interactively without a GUI. The user is "
"prompted to answer questions about the project configuration. "
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2434d8826ee193f38090d97f73bdbf276bf7df10
commit 2434d8826ee193f38090d97f73bdbf276bf7df10
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
AuthorDate: Sun Mar 21 12:20:48 2010 +0100
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Feb 4 11:45:20 2011 -0500
Documentation: document platform specific -E commands (#10446)
Signed-off-by: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index a51673c..c63f667 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -74,8 +74,10 @@ static const char * cmDocumentationOptions[][3] =
"information. Commands available are: chdir, copy, copy_if_different "
"copy_directory, compare_files, echo, echo_append, environment, "
"make_directory, md5sum, remove_directory, remove, tar, time, "
- "touch, touch_nocreate, write_regv, delete_regv, comspec, "
- "create_symlink."},
+ "touch, touch_nocreate. In addition, some platform specific commands "
+ "are available. "
+ "Windows: comspec, delete_regv, write_regv. "
+ "UNIX: create_symlink."},
{"-i", "Run in wizard mode.",
"Wizard mode runs cmake interactively without a GUI. The user is "
"prompted to answer questions about the project configuration. "
-----------------------------------------------------------------------
Summary of changes:
Source/cmake.cxx | 20 +++++++++++---------
Source/cmakemain.cxx | 12 +++++++-----
2 files changed, 18 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list