[Cmake-commits] CMake branch, next, updated. v3.3.2-1479-ga5971e8

[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  a5971e8b348e48ff5bbb489992d41905f6aa5d65 (commit)
       via  fab35c95cbf47e583cbf86b1db1ac3e77ce7035e (commit)
      from  6e49b3c19d945d5a0822e3a8457451593b8b9369 (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=a5971e8b348e48ff5bbb489992d41905f6aa5d65
commit a5971e8b348e48ff5bbb489992d41905f6aa5d65
Merge: 6e49b3c fab35c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:14:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:14:01 2015 -0400

    Merge topic 'release-cygwin-subdir' into next
    
    fab35c95 Utilities/Release: Move cygwin packages to a subdirectory


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fab35c95cbf47e583cbf86b1db1ac3e77ce7035e
commit fab35c95cbf47e583cbf86b1db1ac3e77ce7035e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:13:28 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:13:28 2015 -0400

    Utilities/Release: Move cygwin packages to a subdirectory

diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake
index c0cd761..ca590ed 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/dash2win64_cygwin.cmake
@@ -28,4 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 # allows us to produce cygwin builds in the short term.
 set(EXTRA_CTEST_ARGS "-E ExternalProject")
 
+set(LOCAL_DIR cygwin)
+
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index 4c4dd8a..c50602d 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -119,27 +119,34 @@ foreach(gen ${generators})
     set(SUFFIXES ${SUFFIXES} "*.exe")
   endif()
 endforeach()
+
+if(LOCAL_DIR)
+  file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_DIR}")
+else()
+  set(LOCAL_DIR .)
+endif()
+
 # copy all the files over from the remote machine
 set(PROJECT_PREFIX cmake-)
 foreach(suffix ${SUFFIXES})
-  message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .")
+  message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}")
   execute_process(COMMAND
-    scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .
+    scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}
     RESULT_VARIABLE result)
   if(${result} GREATER 0)
-    message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .")
+    message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}")
   endif()
 endforeach()
 
 # if there are extra files to copy get them as well
 if(extra_files)
   foreach(f ${extra_files})
-    message("scp ${HOST}:${FINAL_PATH}/${f} .")
+    message("scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}")
     execute_process(COMMAND
-      scp ${HOST}:${FINAL_PATH}/${f} .
+      scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}
       RESULT_VARIABLE result)
     if(${result} GREATER 0)
-      message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} .")
+      message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}")
     endif()
   endforeach()
 endif()

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

Summary of changes:
 Utilities/Release/dash2win64_cygwin.cmake |    2 ++
 Utilities/Release/release_cmake.cmake     |   19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake