[Cmake-commits] CMake branch, next, updated. v2.8.8-2661-gb65906c

[David Cole]

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  b65906cbd789373a7270f04bcf81bdfcaf328a14 (commit)
       via  aa8acea3982582cb8e20f69ec897aed6dd31a0a5 (commit)
       via  2809379f15617fac97c6328e4241cab3212ee5ab (commit)
      from  7546abdfb11d14ffc55c5ba5f2a12203a2f78816 (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=b65906cbd789373a7270f04bcf81bdfcaf328a14
commit b65906cbd789373a7270f04bcf81bdfcaf328a14
Merge: 7546abd aa8acea
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sat Apr 21 11:48:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 21 11:48:28 2012 -0400

    Merge topic 'fix-13085-add-nsis-preinstall-hook' into next
    
    aa8acea CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)
    2809379 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa8acea3982582cb8e20f69ec897aed6dd31a0a5
commit aa8acea3982582cb8e20f69ec897aed6dd31a0a5
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sat Apr 21 11:33:58 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Sat Apr 21 11:36:25 2012 -0400

    CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)
    
    Allows custom NSIS commands to run prior to any installation
    actions. Projects that need to run an uninstaller first,
    especially one from a non-NSIS previous revision of a project
    that is NOW using CPack and NSIS, may do so by putting custom
    NSIS commands into this variable.
    
    Inspired-by: David Golub

diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index 5e2ba17..66c33a8 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -31,13 +31,21 @@
 ##end
 #
 ##variable
-#   CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra NSIS commands that will
-#   be added to the install Section.
+#   CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS - Extra NSIS commands that
+#   will be added to the beginning of the install Section, before your
+#   install tree is available on the target system.
+##end
+#
+##variable
+#   CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra NSIS commands that
+#   will be added to the end of the install Section, after your
+#   install tree is available on the target system.
 ##end
 #
 ##variable
 #   CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS - Extra NSIS commands that will
-#   be added to the uninstall Section.
+#   be added to the uninstall Section, before your install tree is
+#   removed from the target system.
 ##end
 #
 ##variable
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 819cc5c..e7edead 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -637,6 +637,7 @@ Section "-Core installation"
   ;Use the entire tree produced by the INSTALL target.  Keep the
   ;list of directories here in sync with the RMDir commands below.
   SetOutPath "$INSTDIR"
+  @CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS@
   @CPACK_NSIS_FULL_INSTALL@
   
   ;Store installation folder

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

Summary of changes:
 Modules/CPackNSIS.cmake   |   14 +++++++++++---
 Modules/NSIS.template.in  |    1 +
 Source/CMakeVersion.cmake |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake