[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2854-gef9ed36

[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  ef9ed366f06fdbc276de64f08df3f4f5a11f8058 (commit)
       via  40566ef2f808cc5bffa5109250f0edf864da5f7e (commit)
       via  e9e088a4df62f33cacffe7bfd1840ade3ac52db8 (commit)
      from  1a14eba31ea37f22d163d2aa757f1a82f5aa5010 (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=ef9ed366f06fdbc276de64f08df3f4f5a11f8058
commit ef9ed366f06fdbc276de64f08df3f4f5a11f8058
Merge: 1a14eba 40566ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 2 10:24:12 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 2 10:24:12 2013 -0400

    Merge topic 'cpack-nsis-uninstall' into next
    
    40566ef CPack/NSIS: Obtain path from which to uninstall from registry (#14124)
    e9e088a CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40566ef2f808cc5bffa5109250f0edf864da5f7e
commit 40566ef2f808cc5bffa5109250f0edf864da5f7e
Author:     David Golub <golubdr at gmail.com>
AuthorDate: Thu May 2 09:47:08 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 2 10:22:20 2013 -0400

    CPack/NSIS: Obtain path from which to uninstall from registry (#14124)
    
    Without this, when CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL is set,
    the installer tries to uninstall the old version from the default
    installation path for the new version, rather than using the path from
    the registry where the old version is installed.

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 59a444b..76310af 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -916,7 +916,9 @@ Function .onInit
 ;Run the uninstaller
 uninst:
   ClearErrors
-  ExecWait '$0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
+  StrLen $2 "\Uninstall.exe"
+  StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path
+  ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file
 
   IfErrors uninst_failed inst
 uninst_failed:

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

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


hooks/post-receive
-- 
CMake