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 22173cc693a1fe4c4587773e1747ae82471cfe43 (commit) via e3336025672383c6345989af9539943a74850614 (commit) from f569ddcd9c28864067062b6a8dad5a5b1db74348 (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=22173cc693a1fe4c4587773e1747ae82471cfe43 commit 22173cc693a1fe4c4587773e1747ae82471cfe43 Merge: f569ddc e333602 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Mar 2 14:46:13 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Mar 2 14:46:13 2012 -0500 Merge topic 'fix-msys-cvs-local-repo' into next e333602 Fix MSYS CVS local test repo path format (#13001) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3336025672383c6345989af9539943a74850614 commit e3336025672383c6345989af9539943a74850614 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Mar 2 14:20:58 2012 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Mar 2 14:23:01 2012 -0500 Fix MSYS CVS local test repo path format (#13001) The MSYS cvs tool interprets "c:/" as a "machine:" name for SSH. Detect the MSYS cvs by looking for the string "msys" in the executable file itself. Then convert the repo path to an MSYS path such as "/c/...". Fix both the CTest.UpdateCVS and ExternalProject tests that use local CVS repositories. diff --git a/Tests/CTestUpdateCVS.cmake.in b/Tests/CTestUpdateCVS.cmake.in index a04673e..f7f5db6 100644 --- a/Tests/CTestUpdateCVS.cmake.in +++ b/Tests/CTestUpdateCVS.cmake.in @@ -18,6 +18,19 @@ set(CVS "@CVS_EXECUTABLE@") message(" cvs = ${CVS}") set(REPO ${TOP}/repo) + +# The MSYS cvs tool interprets "c:/" as a "machine:" name for SSH. +# Detect the MSYS cvs and convert the repo path to an MSYS path. +if(WIN32) + if(EXISTS "${CVS}") + file(STRINGS "${CVS}" cvs_is_msys LIMIT_COUNT 1 REGEX "[Mm][Ss][Yy][Ss]") + if(cvs_is_msys) + message(" '${CVS}' is from MSYS (contains '${cvs_is_msys}')") + string(REGEX REPLACE "^([A-Za-z]):" "/\\1" REPO "${REPO}") + endif() + endif() +endif() + set(CVSCMD ${CVS} -d${REPO}) # CVSNT requires an extra option to 'cvs init'. diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt index ac70129..7a76261 100644 --- a/Tests/ExternalProject/CMakeLists.txt +++ b/Tests/ExternalProject/CMakeLists.txt @@ -280,6 +280,18 @@ if(do_cvs_tests) set_property(TARGET ${proj} PROPERTY FOLDER "SetupRepos/Local/Deeply/Nested/For/Testing") + # The MSYS cvs tool interprets "c:/" as a "machine:" name for SSH. + # Detect the MSYS cvs and convert the repo path to an MSYS path. + if(WIN32) + if(EXISTS "${CVS_EXECUTABLE}") + file(STRINGS "${CVS_EXECUTABLE}" cvs_is_msys LIMIT_COUNT 1 REGEX "[Mm][Ss][Yy][Ss]") + if(cvs_is_msys) + message(STATUS "'${CVS_EXECUTABLE}' is from MSYS (contains '${cvs_is_msys}')") + string(REGEX REPLACE "^([A-Za-z]):" "/\\1" local_cvs_repo "${local_cvs_repo}") + endif() + endif() + endif() + # CVS by date stamp: # set(proj TutorialStep1-CVS-20090626) ----------------------------------------------------------------------- Summary of changes: Tests/CTestUpdateCVS.cmake.in | 13 +++++++++++++ Tests/ExternalProject/CMakeLists.txt | 12 ++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits