diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-08-23 22:02:30 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-08-23 22:02:30 (GMT) |
| commit | 538ff79e2f606c4c3722d94e10f0a759a1f97d86 (patch) | |
| tree | f5921690ef9778d9418e0fb74d260375398850c2 /Source | |
| parent | a4f40c31f1e160ab34d90c1a5e9ed5ab6cc1de59 (diff) | |
| download | CMake-538ff79e2f606c4c3722d94e10f0a759a1f97d86.zip CMake-538ff79e2f606c4c3722d94e10f0a759a1f97d86.tar.gz CMake-538ff79e2f606c4c3722d94e10f0a759a1f97d86.tar.bz2 | |
ENH: improve coverage
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 8 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 32 | ||||
| -rw-r--r-- | Source/cmSystemTools.h | 12 |
3 files changed, 6 insertions, 46 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ee27f58..a54b78a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -805,8 +805,12 @@ int cmMakefile::DumpDocumentationToFile(std::ostream& f) const char *name; const char *terse; const char *full; - - f << "<html><ul>\n"; + char tmp[1024]; + sprintf(tmp,"Version %d.%d", cmMakefile::GetMajorVersion(), + cmMakefile::GetMinorVersion()); + f << "<html>\n"; + f << "<h1>Documentation for commands of CMake " << tmp << "</h1>\n"; + f << "<ul>\n"; for(RegisteredCommandsMap::iterator j = m_Commands.begin(); j != m_Commands.end(); ++j) { diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 8ecd0c3..5020969 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -404,38 +404,6 @@ void cmSystemTools::CleanUpWindowsSlashes(std::string& path) } -int cmSystemTools::Grep(const char* dir, const char* file, - const char* expression) -{ - std::string path = dir; - path += "/"; - path += file; - std::ifstream fin(path.c_str()); - char buffer[2056]; - int count = 0; - cmRegularExpression reg(expression); - while(fin) - { - fin.getline(buffer, sizeof(buffer)); - count += reg.find(buffer); - } - return count; -} - - -void cmSystemTools::ConvertCygwinPath(std::string& pathname) -{ - if(pathname.find("/cygdrive/") != std::string::npos) - { - std::string cygStuff = pathname.substr(0, 11); - std::string replace; - replace += cygStuff.at(10); - replace += ":"; - cmSystemTools::ReplaceString(pathname, cygStuff.c_str(), replace.c_str()); - } -} - - bool cmSystemTools::ParseFunction(std::ifstream& fin, std::string& name, std::vector<std::string>& arguments) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index d256913..c63da9b 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -105,18 +105,6 @@ public: static bool FileExists(const char* filename); /** - * Return the number of times the given expression occurs in the file - * specified by the concatenation of dir/file. - */ - static int Grep(const char* dir, const char* file, const char* expression); - - /** - * Convert a path containing a cygwin drive specifier to its natural - * equivalent. - */ - static void ConvertCygwinPath(std::string& pathname); - - /** * Read a CMake command (or function) from an input file. This * returns the name of the function and a list of its * arguments. |