[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1548-g372f343

[Daniele E. Domenichelli]

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  372f343688f89c3610c78cacd46b4a19cc48e566 (commit)
       via  2cc64ce62e731ad0d0de9655f10e5a3ee3137fcc (commit)
       via  c5ebe5753f4768b68be9ce6cf8452b96b0299cf1 (commit)
       via  bef58048fbc1048a2f2f564503b7546eaa2660c8 (commit)
      from  2b12371dd2f86b5a26e527362e6031e00f7ee772 (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=372f343688f89c3610c78cacd46b4a19cc48e566
commit 372f343688f89c3610c78cacd46b4a19cc48e566
Merge: 2b12371 2cc64ce
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Thu Mar 27 18:39:26 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 27 18:39:26 2014 -0400

    Merge topic 'ExternalProject_GitUpdate' into next
    
    2cc64ce6 ExternalProject: rebase instead of pull --rebase
    c5ebe575 ExternalProject: Allow tags in the form <remote>/<tag>
    bef58048 Revert "ExternalProject: Strip out "origin/" from git tag"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cc64ce62e731ad0d0de9655f10e5a3ee3137fcc
commit 2cc64ce62e731ad0d0de9655f10e5a3ee3137fcc
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Mar 27 23:38:08 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Mar 27 23:38:16 2014 +0100

    ExternalProject: rebase instead of pull --rebase
    
    Since fetch was executed a few lines before, it is not necessary to
    contact the remote repository again.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 3962c16..e490e69 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -533,7 +533,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\" STREQUAL \"\${head_sha}\"
 
     # Pull changes from the remote branch
     execute_process(
-      COMMAND \"${git_EXECUTABLE}\" pull --rebase \${git_remote} \${git_tag}
+      COMMAND \"${git_EXECUTABLE}\" rebase \${git_remote}/\${git_tag}
       WORKING_DIRECTORY \"${work_dir}\"
       RESULT_VARIABLE error_code
       )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5ebe5753f4768b68be9ce6cf8452b96b0299cf1
commit c5ebe5753f4768b68be9ce6cf8452b96b0299cf1
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Mar 27 23:17:44 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Mar 27 23:31:12 2014 +0100

    ExternalProject: Allow tags in the form <remote>/<tag>
    
    If tag is in the form <remote>/<tag> (i.e. origin/master) they are
    split and used for the pull.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7d4aa16..3962c16 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -473,6 +473,17 @@ else()
   set(is_remote_ref 0)
 endif()
 
+# Tag is in the form <remote>/<tag> (i.e. origin/master) we must strip
+# the remote from the tag.
+if(\"\${show_ref_output}\" MATCHES \"refs/remotes/${git_tag}\")
+  string(REGEX MATCH \"^([^/]+)/(.+)$\" _unused \"${git_tag}\")
+  set(git_remote \"\${CMAKE_MATCH_1}\")
+  set(git_tag \"\${CMAKE_MATCH_2}\")
+else()
+  set(git_remote \"origin\")
+  set(git_tag \"${git_tag}\")
+endif()
+
 # This will fail if the tag does not exist (it probably has not been fetched
 # yet).
 execute_process(
@@ -522,7 +533,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\" STREQUAL \"\${head_sha}\"
 
     # Pull changes from the remote branch
     execute_process(
-      COMMAND \"${git_EXECUTABLE}\" pull --rebase origin ${git_tag}
+      COMMAND \"${git_EXECUTABLE}\" pull --rebase \${git_remote} \${git_tag}
       WORKING_DIRECTORY \"${work_dir}\"
       RESULT_VARIABLE error_code
       )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bef58048fbc1048a2f2f564503b7546eaa2660c8
commit bef58048fbc1048a2f2f564503b7546eaa2660c8
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Mar 27 23:31:00 2014 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Mar 27 23:31:11 2014 +0100

    Revert "ExternalProject: Strip out "origin/" from git tag"
    
    This reverts commit 40bf640cec545d4cbc4728b6fae78525ebd66368.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 83ddafd..7d4aa16 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -293,9 +293,6 @@ define_property(DIRECTORY PROPERTY "EP_STEP_TARGETS" INHERITED
 
 
 function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_submodules src_name work_dir gitclone_infofile gitclone_stampfile)
-  if("${git_tag}" MATCHES "^origin/(.+)$")
-    set(git_tag ${CMAKE_MATCH_1})
-  endif()
   file(WRITE ${script_filename}
 "if(\"${git_tag}\" STREQUAL \"\")
   message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -447,9 +444,6 @@ endfunction()
 
 
 function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_submodules git_repository work_dir)
-  if("${git_tag}" MATCHES "^origin/(.+)$")
-    set(git_tag ${CMAKE_MATCH_1})
-  endif()
   file(WRITE ${script_filename}
 "if(\"${git_tag}\" STREQUAL \"\")
   message(FATAL_ERROR \"Tag for git checkout should not be empty.\")

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

Summary of changes:
 Modules/ExternalProject.cmake |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake