[Cmake-commits] CMake branch, next, updated. v2.8.12-3973-g3213734
Brad King
brad.king at kitware.com
Tue Oct 15 09:36:24 EDT 2013
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 3213734d14048e9c2aa921dc533f66a3a543b9c5 (commit)
via fd3de2f425cd13b3418a175a213c4a7592cfc279 (commit)
from 33c1cdc254b3942ebd0d704dd5f967205857676e (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=3213734d14048e9c2aa921dc533f66a3a543b9c5
commit 3213734d14048e9c2aa921dc533f66a3a543b9c5
Merge: 33c1cdc fd3de2f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 15 09:36:21 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 15 09:36:21 2013 -0400
Merge topic 'concepts-help' into next
fd3de2f Revert topic 'concepts-help'
diff --cc Source/cmake.cxx
index db5bba3,290aff0..de5459c
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@@ -18,10 -19,12 +18,9 @@@
#include "cmCommands.h"
#include "cmCommand.h"
#include "cmFileTimeComparison.h"
-#include "cmGeneratedFileStream.h"
-#include "cmQtAutomoc.h"
#include "cmSourceFile.h"
-#include "cmVersion.h"
#include "cmTest.h"
#include "cmDocumentationFormatterText.h"
- #include "cmDocumentConcepts.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmGraphVizWriter.h"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd3de2f425cd13b3418a175a213c4a7592cfc279
commit fd3de2f425cd13b3418a175a213c4a7592cfc279
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 15 09:32:08 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 15 09:32:20 2013 -0400
Revert topic 'concepts-help'
This will be superseded by a new documentation system.
diff --git a/Docs/bash-completion/cmake b/Docs/bash-completion/cmake
index ca04b2e..59e0298 100644
--- a/Docs/bash-completion/cmake
+++ b/Docs/bash-completion/cmake
@@ -134,11 +134,6 @@ _cmake()
2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
return
;;
- --help-concept)
- COMPREPLY=( $( compgen -W '$( cmake --help-concept-list \
- 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) )
- return
- ;;
esac
$split && return
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index d5a5335..8412e3e 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -166,8 +166,6 @@ set(SRCS
cmDocumentationFormatterUsage.cxx
cmDocumentationSection.cxx
cmDocumentCompileDefinitions.h
- cmDocumentConcepts.h
- cmDocumentConcepts.cxx
cmDocumentGeneratorExpressions.h
cmDocumentLocationUndefined.h
cmDocumentVariables.cxx
diff --git a/Source/cmDocumentConcepts.cxx b/Source/cmDocumentConcepts.cxx
deleted file mode 100644
index 2c2a2ae..0000000
--- a/Source/cmDocumentConcepts.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*============================================================================
- CMake - Cross Platform Makefile Generator
- Copyright 2013 Stephen Kelly <steveire at gmail.com>
-
- Distributed under the OSI-approved BSD License (the "License");
- see accompanying file Copyright.txt for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
-============================================================================*/
-#include "cmDocumentConcepts.h"
-
-void cmDocumentConcepts::GetDocumentation(std::vector<cmDocumentationEntry>&v)
-{
- v.push_back(cmDocumentationEntry("policies",
- "Policies and minimum version settings",
- "Policies in CMake are used to preserve backward compatible behavior "
- "across multiple releases. When a new policy is introduced, newer CMake "
- "versions will begin to warn about the backward compatible behavior. It "
- "is possible to disable the warning by explicitly requesting the OLD, or"
- "backward compatible behavior using the cmake_policy command. It is "
- "also possible to request NEW, or non-backward compatible behavior for a "
- "policy."
- "\n"
- "The cmake_minimum_required() command does more than report an error if "
- "a too-old version of CMake is used to build a project. It also sets "
- "all policies introduced in that CMake version or earlier to NEW "
- "behavior."
- "\n"
- "The CMAKE_MINIMUM_REQUIRED_VERSION variable may also be used to "
- "determine whether to report an error on use of deprecated macros or "
- "functions."
- ));
-}
diff --git a/Source/cmDocumentConcepts.h b/Source/cmDocumentConcepts.h
deleted file mode 100644
index b7f03c3..0000000
--- a/Source/cmDocumentConcepts.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*============================================================================
- CMake - Cross Platform Makefile Generator
- Copyright 2013 Stephen Kelly <steveire at gmail.com>
-
- Distributed under the OSI-approved BSD License (the "License");
- see accompanying file Copyright.txt for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
-============================================================================*/
-#ifndef cmDocumentConcepts_h
-#define cmDocumentConcepts_h
-
-#include "cmStandardIncludes.h"
-
-class cmDocumentConcepts
-{
-public:
- static void GetDocumentation(std::vector<cmDocumentationEntry>&);
-};
-
-#endif
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 8c6df7d..4edacbb 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -128,14 +128,6 @@ static const char *cmDocumentationGeneratorsHeader[][3] =
};
//----------------------------------------------------------------------------
-static const char *cmDocumentationConceptsHeader[][3] =
-{
- {0,
- "The following concepts are central to using CMake.", 0},
- {0,0,0}
-};
-
-//----------------------------------------------------------------------------
static const char *cmDocumentationStandardSeeAlso[][3] =
{
{0,
@@ -213,8 +205,6 @@ DOCUMENT_INTRO(Properties, "cmakeprops",
"Reference of CMake properties.");
DOCUMENT_INTRO(Variables, "cmakevars",
"Reference of CMake variables.");
-DOCUMENT_INTRO(Concepts, "cmakeconcepts",
- "Reference of CMake concepts.");
DOCUMENT_INTRO(Commands, "cmakecommands",
"Reference of available CMake commands.");
DOCUMENT_INTRO(CompatCommands, "cmakecompat",
@@ -348,8 +338,6 @@ bool cmDocumentation::PrintDocumentation(Type ht, std::ostream& os,
return this->PrintDocumentationSingleProperty(os);
case cmDocumentation::SingleVariable:
return this->PrintDocumentationSingleVariable(os);
- case cmDocumentation::SingleConcept:
- return this->PrintDocumentationSingleConcept(os);
case cmDocumentation::List:
this->PrintDocumentationList(os,"Commands");
this->PrintDocumentationList(os,"Compatibility Commands");
@@ -383,9 +371,6 @@ bool cmDocumentation::PrintDocumentation(Type ht, std::ostream& os,
this->PrintDocumentationList(os,i->c_str());
}
return true;
- case cmDocumentation::ConceptList:
- this->PrintDocumentationList(os,"Concepts");
- return true;
case cmDocumentation::Full:
return this->PrintDocumentationFull(os);
case cmDocumentation::Modules:
@@ -402,8 +387,6 @@ bool cmDocumentation::PrintDocumentation(Type ht, std::ostream& os,
return this->PrintDocumentationCurrentCommands(os);
case cmDocumentation::CompatCommands:
return this->PrintDocumentationCompatCommands(os);
- case cmDocumentation::Concepts:
- return this->PrintDocumentationConcepts(os);
case cmDocumentation::Copyright:
return this->PrintCopyright(os);
@@ -723,10 +706,6 @@ void cmDocumentation::addCMakeStandardDocSections()
sec->Append(cmDocumentationGeneratorsHeader);
this->AllSections["Generators"] = sec;
- sec = new cmDocumentationSection("CMake Concepts","CONCEPTS");
- sec->Append(cmDocumentationConceptsHeader);
- this->AllSections["Concepts"] = sec;
-
this->PropertySections.push_back("Properties of Global Scope");
this->PropertySections.push_back("Properties on Directories");
this->PropertySections.push_back("Properties on Targets");
@@ -1192,13 +1171,6 @@ bool cmDocumentation::CheckOptions(int argc, const char* const* argv,
help.HelpForm = this->GetFormFromFilename(help.Filename,
&help.ManSection);
}
- else if(strcmp(argv[i], "--help-concepts") == 0)
- {
- help.HelpType = cmDocumentation::Concepts;
- GET_OPT_ARGUMENT(help.Filename);
- help.HelpForm = this->GetFormFromFilename(help.Filename,
- &help.ManSection);
- }
else if(strcmp(argv[i], "--help-full") == 0)
{
help.HelpType = cmDocumentation::Full;
@@ -1260,14 +1232,6 @@ bool cmDocumentation::CheckOptions(int argc, const char* const* argv,
help.HelpForm = this->GetFormFromFilename(help.Filename,
&help.ManSection);
}
- else if(strcmp(argv[i], "--help-concept") == 0)
- {
- help.HelpType = cmDocumentation::SingleConcept;
- GET_OPT_ARGUMENT(help.Argument);
- GET_OPT_ARGUMENT(help.Filename);
- help.HelpForm = this->GetFormFromFilename(help.Filename,
- &help.ManSection);
- }
else if(strcmp(argv[i], "--help-command-list") == 0)
{
help.HelpType = cmDocumentation::List;
@@ -1292,12 +1256,6 @@ bool cmDocumentation::CheckOptions(int argc, const char* const* argv,
GET_OPT_ARGUMENT(help.Filename);
help.HelpForm = cmDocumentation::TextForm;
}
- else if(strcmp(argv[i], "--help-concept-list") == 0)
- {
- help.HelpType = cmDocumentation::ConceptList;
- GET_OPT_ARGUMENT(help.Filename);
- help.HelpForm = cmDocumentation::TextForm;
- }
else if(strcmp(argv[i], "--copyright") == 0)
{
help.HelpType = cmDocumentation::Copyright;
@@ -1666,20 +1624,6 @@ bool cmDocumentation::PrintDocumentationSinglePolicy(std::ostream& os)
}
//----------------------------------------------------------------------------
-bool cmDocumentation::PrintDocumentationSingleConcept(std::ostream& os)
-{
- if (this->PrintDocumentationGeneric(os,"Concepts"))
- {
- return true;
- }
-
- // Argument was not a concept. Complain.
- os << "Argument \"" << this->CurrentArgument.c_str()
- << "\" to --help-concept is not a CMake concept.\n";
- return false;
-}
-
-//----------------------------------------------------------------------------
bool cmDocumentation::PrintDocumentationSingleVariable(std::ostream& os)
{
bool done = false;
@@ -1840,20 +1784,6 @@ bool cmDocumentation::PrintDocumentationVariables(std::ostream& os)
}
//----------------------------------------------------------------------------
-bool cmDocumentation::PrintDocumentationConcepts(std::ostream& os)
-{
- this->ClearSections();
- this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Concepts));
- this->AddSectionToPrint("Concepts");
- this->AddSectionToPrint("Copyright");
- this->AddSectionToPrint("Standard See Also");
- this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os);
- this->Print(os);
- this->CurrentFormatter->PrintFooter(os);
- return true;
-}
-
-//----------------------------------------------------------------------------
bool cmDocumentation::PrintDocumentationCurrentCommands(std::ostream& os)
{
this->ClearSections();
@@ -1919,8 +1849,6 @@ void cmDocumentation::CreateFullDocumentation()
emitted.insert("Generators");
this->AddSectionToPrint("Commands");
emitted.insert("Commands");
- this->AddSectionToPrint("Concepts");
- emitted.insert("Concepts");
this->AddSectionToPrint("Properties Description");
@@ -2030,7 +1958,6 @@ const char* cmDocumentation::GetDefaultDocName(Type ht) const
CASE_DEFAULT_DOCNAME(Variables)
CASE_DEFAULT_DOCNAME(Commands)
CASE_DEFAULT_DOCNAME(CompatCommands)
- CASE_DEFAULT_DOCNAME(Concepts)
default: break;
}
return 0;
diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h
index 2db8330..e180f60 100644
--- a/Source/cmDocumentation.h
+++ b/Source/cmDocumentation.h
@@ -214,7 +214,6 @@ private:
bool PrintDocumentationSingleProperty(std::ostream& os);
bool PrintDocumentationSinglePolicy(std::ostream& os);
bool PrintDocumentationSingleVariable(std::ostream& os);
- bool PrintDocumentationSingleConcept(std::ostream& os);
bool PrintDocumentationUsage(std::ostream& os);
bool PrintDocumentationFull(std::ostream& os);
bool PrintDocumentationModules(std::ostream& os);
@@ -222,7 +221,6 @@ private:
bool PrintDocumentationPolicies(std::ostream& os);
bool PrintDocumentationProperties(std::ostream& os);
bool PrintDocumentationVariables(std::ostream& os);
- bool PrintDocumentationConcepts(std::ostream& os);
bool PrintDocumentationCurrentCommands(std::ostream& os);
bool PrintDocumentationCompatCommands(std::ostream& os);
void PrintDocumentationCommand(std::ostream& os,
diff --git a/Source/cmDocumentationFormatter.cxx b/Source/cmDocumentationFormatter.cxx
index 1aed324..9f01949 100644
--- a/Source/cmDocumentationFormatter.cxx
+++ b/Source/cmDocumentationFormatter.cxx
@@ -146,10 +146,6 @@ cmDocumentationFormatter::ComputeSectionLinkPrefix(std::string const& name)
{
return "single_item";
}
- else if(name.find("Concepts") != name.npos)
- {
- return "concept";
- }
else
{
std::cerr
diff --git a/Source/cmDocumentationFormatter.h b/Source/cmDocumentationFormatter.h
index 7cbcf99..665b9b6 100644
--- a/Source/cmDocumentationFormatter.h
+++ b/Source/cmDocumentationFormatter.h
@@ -28,8 +28,7 @@ public:
{ None, Usage, Single, SingleModule, SingleProperty, SingleVariable,
List, ModuleList, PropertyList, VariableList,
Full, Properties, Variables, Modules, CustomModules, Commands,
- CompatCommands, Copyright, Version, Policies, SinglePolicy, Concepts,
- SingleConcept, ConceptList };
+ CompatCommands, Copyright, Version, Policies, SinglePolicy };
/** Forms of documentation output. */
enum Form { TextForm, HTMLForm, ManForm, UsageForm, DocbookForm };
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3245721..290aff0 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -25,7 +25,6 @@
#include "cmVersion.h"
#include "cmTest.h"
#include "cmDocumentationFormatterText.h"
-#include "cmDocumentConcepts.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmGraphVizWriter.h"
@@ -2775,11 +2774,6 @@ void cmake::GetPolicyDocumentation(std::vector<cmDocumentationEntry>& v)
this->Policies->GetDocumentation(v);
}
-void cmake::GetConceptDocumentation(std::vector<cmDocumentationEntry>& v)
-{
- cmDocumentConcepts::GetDocumentation(v);
-}
-
void cmake::GetPropertiesDocumentation(std::map<std::string,
cmDocumentationSection *>& v)
{
diff --git a/Source/cmake.h b/Source/cmake.h
index 488e967..a50c1ed 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -286,7 +286,6 @@ class cmake
cmDocumentationSection *>&);
void GetGeneratorDocumentation(std::vector<cmDocumentationEntry>&);
void GetPolicyDocumentation(std::vector<cmDocumentationEntry>& entries);
- void GetConceptDocumentation(std::vector<cmDocumentationEntry>&);
///! Set/Get a property of this target file
void SetProperty(const char *prop, const char *value);
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 0518a4e..68d8339 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -235,24 +235,6 @@ static const char * cmDocumentationOptions[][3] =
"If a file is specified, the documentation is written into and the output "
"format is determined depending on the filename suffix. Supported are man "
"page, HTML, DocBook and plain text."},
- {"--help-concept concept [file]",
- "Print help for a single concept and exit.",
- "Full documentation specific to the given concept is displayed. "
- "If a file is specified, the documentation is written into and the output "
- "format is determined depending on the filename suffix. Supported are man "
- "page, HTML, DocBook and plain text."},
- {"--help-concept-list [file]", "List documented concepts and exit.",
- "The list contains all concepts for which help may be obtained by using "
- "the --help-concept argument followed by a concept id. If a file is "
- "specified, the help is written into it. "
- "If a file is specified, the documentation is written into and the output "
- "format is determined depending on the filename suffix. Supported are man "
- "page, HTML, DocBook and plain text."},
- {"--help-concepts [file]", "Print help for all concepts and exit.",
- "Full documentation for all concepts is displayed."
- "If a file is specified, the documentation is written into and the output "
- "format is determined depending on the filename suffix. Supported are man "
- "page, HTML, DocBook and plain text."},
{0,0,0}
};
@@ -267,7 +249,6 @@ static const char * cmDocumentationSeeAlso[][3] =
{0, "cmakemodules", 0},
{0, "cmakeprops", 0},
{0, "cmakevars", 0},
- {0, "cmakeconcepts", 0},
{0, 0, 0}
};
@@ -403,7 +384,6 @@ int do_cmake(int ac, char** av)
std::vector<cmDocumentationEntry> policies;
std::vector<cmDocumentationEntry> compatCommands;
std::vector<cmDocumentationEntry> generators;
- std::vector<cmDocumentationEntry> concepts;
std::map<std::string,cmDocumentationSection *> propDocs;
hcm.GetPolicyDocumentation(policies);
@@ -411,7 +391,6 @@ int do_cmake(int ac, char** av)
hcm.GetCommandDocumentation(compatCommands, false, true);
hcm.GetPropertiesDocumentation(propDocs);
hcm.GetGeneratorDocumentation(generators);
- hcm.GetConceptDocumentation(concepts);
doc.SetName("cmake");
doc.SetSection("Name",cmDocumentationName);
@@ -422,7 +401,6 @@ int do_cmake(int ac, char** av)
doc.SetSection("Commands",commands);
doc.SetSection("Policies",policies);
doc.AppendSection("Compatibility Commands",compatCommands);
- doc.AppendSection("Concepts",concepts);
doc.SetSections(propDocs);
cmDocumentationEntry e;
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 16df08f..bad8d63 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -24,7 +24,6 @@ set(MAN_FILES
${CMake_BINARY_DIR}/Docs/cmakepolicies.1
${CMake_BINARY_DIR}/Docs/cmakevars.1
${CMake_BINARY_DIR}/Docs/cmakemodules.1
- ${CMake_BINARY_DIR}/Docs/cmakeconcepts.1
)
set(TEXT_FILES
${CMake_BINARY_DIR}/Docs/cmake.txt
@@ -34,7 +33,6 @@ set(TEXT_FILES
${CMake_BINARY_DIR}/Docs/cmake-modules.txt
${CMake_BINARY_DIR}/Docs/cmake-commands.txt
${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt
- ${CMake_BINARY_DIR}/Docs/cmake-concepts.txt
)
set(HTML_FILES
${CMake_BINARY_DIR}/Docs/cmake.html
@@ -44,7 +42,6 @@ set(HTML_FILES
${CMake_BINARY_DIR}/Docs/cmake-modules.html
${CMake_BINARY_DIR}/Docs/cmake-commands.html
${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html
- ${CMake_BINARY_DIR}/Docs/cmake-concepts.html
)
set(DOCBOOK_FILES
${CMake_BINARY_DIR}/Docs/cmake.docbook
@@ -122,9 +119,6 @@ add_custom_command(
--help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt
--help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html
--help-compatcommands ${CMake_BINARY_DIR}/Docs/cmakecompat.1
- --help-concepts ${CMake_BINARY_DIR}/Docs/cmake-concepts.txt
- --help-concepts ${CMake_BINARY_DIR}/Docs/cmake-concepts.html
- --help-concepts ${CMake_BINARY_DIR}/Docs/cmakeconcepts.1
DEPENDS cmake
MAIN_DEPENDENCY ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt
)
diff --git a/bootstrap b/bootstrap
index 11a1e53..fb4a0a0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -254,7 +254,6 @@ CMAKE_CXX_SOURCES="\
cmTest \
cmCustomCommand \
cmCustomCommandGenerator \
- cmDocumentConcepts \
cmDocumentVariables \
cmCacheManager \
cmListFileCache \
-----------------------------------------------------------------------
Summary of changes:
Docs/bash-completion/cmake | 5 --
Source/CMakeLists.txt | 2 -
Source/cmDocumentConcepts.cxx | 35 -----------------
Source/cmDocumentConcepts.h | 23 -----------
Source/cmDocumentation.cxx | 73 -----------------------------------
Source/cmDocumentation.h | 2 -
Source/cmDocumentationFormatter.cxx | 4 --
Source/cmDocumentationFormatter.h | 3 +-
Source/cmake.cxx | 6 ---
Source/cmake.h | 1 -
Source/cmakemain.cxx | 22 ----------
Utilities/CMakeLists.txt | 6 ---
bootstrap | 1 -
13 files changed, 1 insertions(+), 182 deletions(-)
delete mode 100644 Source/cmDocumentConcepts.cxx
delete mode 100644 Source/cmDocumentConcepts.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list