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 e78a4f017e1414e2b5083e8ee972fcc05278c287 (commit)
via 9f24ff5406f8644bc5245df26d0c26adcad3e091 (commit)
via ff33e839df4fc09d9066538bb326a6c4f54a928a (commit)
via c998e16c851fe0134903227d615caf16488150c0 (commit)
from 53c8b78e1687596fe5f871e4262a9382904ca4cc (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78a4f017e1414e2b5083e8ee972fcc05278c287
commit e78a4f017e1414e2b5083e8ee972fcc05278c287
Merge: 53c8b78 9f24ff5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 5 11:18:31 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jul 5 11:18:31 2016 -0400
Merge topic 'reorganize-cmCTest' into next
9f24ff54 Revert "cmCTest: Improve doxygen for Part and Model enums"
ff33e839 Revert "doxygen: Teach doc_makeall.sh how to skip cleaning of
intermediate files"
c998e16c Revert "doxygen: Introduce \cm_manual alias to reference manual
from within doxygen"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f24ff5406f8644bc5245df26d0c26adcad3e091
commit 9f24ff5406f8644bc5245df26d0c26adcad3e091
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 5 11:18:09 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 5 11:18:09 2016 -0400
Revert "cmCTest: Improve doxygen for Part and Model enums"
This reverts commit 2aa8e005a3f6e2fa357f5d11549a609213f738e5.
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 669401c..b6657c9 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -66,48 +66,7 @@ class cmCTest
friend class cmCTestMultiProcessHandler;
public:
- /**
- * \enum Part
- * Enumerate parts of the testing and submission process.
- *
- * For more details,
- * see \cm_manual{manual/ctest.1.html#dashboard-client-steps,
- * dashboard client steps}.
- *
- * \sa PartInfo
- *
- * \var Part PartStart
- * See \cm_manual{manual/ctest.1.html#ctest-start-step, start step}.
- *
- * \var Part PartUpdate
- * The \cm_manual{manual/ctest.1.html#ctest-update-step, update step}
- * is handled by cmCTestUpdateHandler.
- *
- * \var Part PartConfigure
- * The \cm_manual{manual/ctest.1.html#ctest-configure-step, configure step}
- * is handled by cmCTestConfigureHandler.
- *
- * \var Part PartBuild
- * The \cm_manual{manual/ctest.1.html#ctest-build-step, build step}
- * is handled by cmCTestBuildHandler.
- *
- * \var Part PartTest
- * The \cm_manual{manual/ctest.1.html#ctest-test-step, test step}
- * is handled by cmCTestTestHandler.
- *
- * \var Part PartCoverage
- * The \cm_manual{manual/ctest.1.html#ctest-coverage-step, coverage step}
- * is handled by cmCTestCoverageHandler.
- *
- * \var Part PartMemCheck
- * The \cm_manual{manual/ctest.1.html#ctest-memcheck-step, memcheck step}
- * is handled by cmCTestMemCheckHandler.
- *
- * \var Part PartSubmit
- * The \cm_manual{manual/ctest.1.html#ctest-submit-step, submit step}
- * is handled by cmCTestSubmitHandler.
- *
- */
+ /** Enumerate parts of the testing and submission process. */
enum Part
{
PartStart,
@@ -364,10 +323,6 @@ public:
*/
std::string GetShortPathToFile(const char* fname);
- /**
- * Enumerate all \cm_manual{manual/ctest.1.html#dashboard-client-modes,
- * dashboard client modes}.
- */
enum
{
EXPERIMENTAL,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff33e839df4fc09d9066538bb326a6c4f54a928a
commit ff33e839df4fc09d9066538bb326a6c4f54a928a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 5 11:18:03 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 5 11:18:03 2016 -0400
Revert "doxygen: Teach doc_makeall.sh how to skip cleaning of intermediate
files"
This reverts commit f4613f70efb1762d6ce69ba3066186a1cd3e53a3.
diff --git a/Utilities/Doxygen/doc_makeall.sh.in
b/Utilities/Doxygen/doc_makeall.sh.in
index 4ed1852..fceafdd 100755
--- a/Utilities/Doxygen/doc_makeall.sh.in
+++ b/Utilities/Doxygen/doc_makeall.sh.in
@@ -20,15 +20,7 @@ export GNUPLOT_PROG="@GNUPLOT@" # gnuplot (data
plotting program)
export HHC_PROG="@HTML_HELP_COMPILER@" # HTML Help Compiler
export MV_PROG="@MV@" # mv (Unix-like 'move/rename files')
export PERL_PROG="@PERL@" # Perl
-
-# Skip cleaning steps. This will allow faster regeneration when locally
-# developing the documentation.
-if [[ "$1" == "--skip-clean" ]]; then
- echo "Invoked with '--skip-clean'"
- export RM_PROG="NOTFOUND"
-else
- export RM_PROG="@RM@" # rm (Unix-like 'remove files')
-fi
+export RM_PROG="@RM@" # rm (Unix-like 'remove files')
export TAR_PROG="@TAR@" # tar (Unix-like 'archiver')
export WGET_PROG="@WGET@" # wget (remote file retrieval)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c998e16c851fe0134903227d615caf16488150c0
commit c998e16c851fe0134903227d615caf16488150c0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 5 11:17:58 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 5 11:17:58 2016 -0400
Revert "doxygen: Introduce \cm_manual alias to reference manual from within
doxygen"
This reverts commit 4572d36b1eb9527a7a23e7d777b1b7a5227bc960.
diff --git a/Utilities/Doxygen/doxyfile.in b/Utilities/Doxygen/doxyfile.in
index c143ab2..2c131f5 100644
--- a/Utilities/Doxygen/doxyfile.in
+++ b/Utilities/Doxygen/doxyfile.in
@@ -35,9 +35,6 @@ GRAPHICAL_HIERARCHY = YES
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
-ALIASES += cm_manual{1}="<a
href=\"https://cmake.org/cmake/help/v@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/\1\";>https://cmake.org/cmake/help/v@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/\1</a>"
-ALIASES += cm_manual{2}="<a
href=\"https://cmake.org/cmake/help/v@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/\1\";>\2</a>"
-
ALLEXTERNALS = NO
IMAGE_PATH = "@CMake_BINARY_DIR@/Utilities/Doxygen/contrib"
-----------------------------------------------------------------------
Summary of changes:
Source/cmCTest.h | 47 +----------------------------------
Utilities/Doxygen/doc_makeall.sh.in | 10 +-------
Utilities/Doxygen/doxyfile.in | 3 ---
3 files changed, 2 insertions(+), 58 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
