[Cmake-commits] CMake branch, next, updated. v2.8.1-1387-gbcc816a

[Brad King]

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  bcc816a7e89b1c241f70b9b8feda45958219201f (commit)
       via  5e102d5e014bb21c66511226b9c60e54863f0636 (commit)
      from  5db1496efaef0243836e253e7bc7951134d904b0 (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=bcc816a7e89b1c241f70b9b8feda45958219201f
commit bcc816a7e89b1c241f70b9b8feda45958219201f
Merge: 5db1496 5e102d5
Author: Brad King <brad.king at kitware.com>
Date:   Fri Jun 11 14:32:09 2010 -0400

    Merge branch 'msys-bootstrap-test' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e102d5e014bb21c66511226b9c60e54863f0636
commit 5e102d5e014bb21c66511226b9c60e54863f0636
Author: Brad King <brad.king at kitware.com>
Date:   Fri Jun 11 14:03:53 2010 -0400

    Enable BootstrapTest on MSYS
    
    The bootstrap script works under MSYS, so test it.  Use a launcher batch
    file since 'ctest --build-and-test' is a Windows program and will not
    honor the shebang line in the script.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1b8f4f3..3ffe70b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1572,16 +1572,24 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     # If there is CMakeLists.txt in the binary tree, assume in-source build
     SET(CMAKE_SKIP_BOOTSTRAP_TEST 1)
   ENDIF(EXISTS "${CMAKE_BINARY_DIR}/CMakeLists.txt")
-  IF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
-
-
+  SET(bootstrap "")
+  IF(CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
+    IF(UNIX)
+      SET(bootstrap ${CMake_SOURCE_DIR}/bootstrap)
+    ELSEIF(MSYS)
+      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bootstrap.bat.in
+                     ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.bat @ONLY)
+      SET(bootstrap ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.bat)
+    ENDIF()
+  ENDIF()
+  IF(bootstrap)
     ADD_TEST(BootstrapTest ${CMAKE_CTEST_COMMAND}
       --build-and-test
       ${CMake_SOURCE_DIR}
       ${CMake_BINARY_DIR}/Tests/BootstrapTest
       --build-nocmake
       --build-noclean
-      --build-makeprogram ${CMake_SOURCE_DIR}/bootstrap
+      --build-makeprogram ${bootstrap}
       --build-generator "${CMAKE_TEST_GENERATOR}"
       --test-command 
       ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
@@ -1595,7 +1603,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       SET_TESTS_PROPERTIES ( BootstrapTest
         PROPERTIES TIMEOUT 5400)
     ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
-  ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
+  ENDIF()
 
   # fortran does not work for IDE builds because
   # CMAKE_STANDARD_LIBRARIES needs to be per language
diff --git a/Tests/bootstrap.bat.in b/Tests/bootstrap.bat.in
new file mode 100644
index 0000000..aeb24b1
--- /dev/null
+++ b/Tests/bootstrap.bat.in
@@ -0,0 +1,2 @@
+ at echo off
+sh "@CMake_SOURCE_DIR@/bootstrap" %*

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt   |   18 +++++++++++++-----
 Tests/bootstrap.bat.in |    2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 Tests/bootstrap.bat.in


hooks/post-receive
-- 
CMake