kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: Drop "cmake -E comspec" Win9x helper 

Since we dropped Win9x support there is no need for this helper.
This commit is contained in:
Brad King 2013-10-18 15:37:09 -04:00
parent f551135208
commit c076476d7d
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Help/manual/cmake.1.rst
View File

@ -33,7 +33,7 @@ native tool on their platform.
copy_directory, copy_if_different, echo, echo_append, environment, copy_directory, copy_if_different, echo, echo_append, environment,
make_directory, md5sum, remove, remove_directory, rename, tar, time, make_directory, md5sum, remove, remove_directory, rename, tar, time,
touch, touch_nocreate. In addition, some platform specific commands touch, touch_nocreate. In addition, some platform specific commands
are available. On Windows: comspec, delete_regv, write_regv. On are available. On Windows: delete_regv, write_regv. On
UNIX: create_symlink. UNIX: create_symlink.
* ``-i``: Run in wizard mode. * ``-i``: Run in wizard mode.

14
Source/cmcmd.cxx
View File

@ -29,10 +29,6 @@
#include "cmVisualStudioWCEPlatformParser.h" #include "cmVisualStudioWCEPlatformParser.h"
#endif #endif
#if defined(_WIN32) && !defined(__CYGWIN__)
# include "cmWin32ProcessExecution.h"
#endif
#include <time.h> #include <time.h>
#include <stdlib.h> // required for atoi #include <stdlib.h> // required for atoi
@ -79,7 +75,6 @@ void CMakeCommandUsage(const char* program)
<< " touch_nocreate file - touch a file but do not create it.\n" << " touch_nocreate file - touch a file but do not create it.\n"
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
<< "Available on Windows only:\n" << "Available on Windows only:\n"
<< " comspec - on windows 9x use this for RunCommand\n"
<< " delete_regv key - delete registry value\n" << " delete_regv key - delete registry value\n"
<< " env_vs8_wince sdkname - displays a batch file which sets the " << " env_vs8_wince sdkname - displays a batch file which sets the "
"environment for the provided Windows CE SDK installed in VS2005\n" "environment for the provided Windows CE SDK installed in VS2005\n"
@ -743,13 +738,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
// Remove file // Remove file
else if (args[1] == "comspec" && args.size() > 2) else if (args[1] == "comspec" && args.size() > 2)
{ {
unsigned int cc; std::cerr << "Win9x helper \"cmake -E comspec\" no longer supported\n";
std::string command = args[2]; return 1;
for ( cc = 3; cc < args.size(); cc ++ )
{
command += " " + args[cc];
}
return cmWin32ProcessExecution::Windows9xHack(command.c_str());
} }
else if (args[1] == "env_vs8_wince" && args.size() == 3) else if (args[1] == "env_vs8_wince" && args.size() == 3)
{ {