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 7d1a84228d336288da78fc0efac3a94e651fbdd0 (commit)
via 7ce4ccc8503cdfce400ccc809b1cb52c6624f906 (commit)
from fd27403b79c6bb2f8e2568c456cf2fb615944a75 (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=7d1a84228d336288da78fc0efac3a94e651fbdd0
commit 7d1a84228d336288da78fc0efac3a94e651fbdd0
Merge: fd27403 7ce4ccc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Feb 28 08:53:29 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Feb 28 08:53:29 2017 -0500
Merge topic 'cpack_nsis_sign_uninstaller' into next
7ce4ccc8 Revert "CPack/NSIS: Sign the uninstaller"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ce4ccc8503cdfce400ccc809b1cb52c6624f906
commit 7ce4ccc8503cdfce400ccc809b1cb52c6624f906
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Feb 28 08:53:10 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Feb 28 08:53:10 2017 -0500
Revert "CPack/NSIS: Sign the uninstaller"
This reverts commit 10b2e0e479b1015c905aef19439c10d7546a0232.
diff --git a/Help/release/dev/cpack-sign-uninstaller.rst
b/Help/release/dev/cpack-sign-uninstaller.rst
deleted file mode 100644
index ff2b402..0000000
--- a/Help/release/dev/cpack-sign-uninstaller.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-cpack-sign_uninstaller
-----------------------
-
-* The :module:`CPackNSIS` module learned to sign the uninstaller
- when using :variable:`CPACK_NSIS_SIGN_UNINSTALLER` variable.
diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index 37fedf3..18d1871 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -133,10 +133,6 @@
# "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html"
# "CMake Help" "https://cmake.org"; "CMake Web Site")
#
-# .. variable:: CPACK_NSIS_SIGN_UNINSTALLER
-#
-# Specify a command to use for signing the uninstaller. The command will
-# be invoked a path to the uninstaller as its only argument.
#FIXME we should put NSIS specific code here
#FIXME but I'm not doing it because I'm not able to test it...
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index a8903f6..9001888 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -29,33 +29,6 @@
;--------------------------------
;General
-!ifdef INNER
- OutFile "$%TEMP%\tempinstaller.exe"
- SetCompress off ; for speed
-!else
- ; Call makensis again, defining INNER. This writes an installer for us
which, when
- ; it is invoked, will just write the uninstaller to some location, and then
exit.
- ; Be sure to substitute the name of this script here.
-
- !system "$\"${NSISDIR}\makensis$\" /DINNER
@CPACK_TEMPORARY_DIRECTORY@/../project.nsi" = 0
-
- ; So now run that installer we just created as %TEMP%\tempinstaller.exe.
Since it
- ; calls quit the return value isn't zero.
-
- !system "$%TEMP%\tempinstaller.exe" = 2
-
- ; That will have written an uninstaller binary for us. Now we sign it with
your
- ; favourite code signing tool.
-
- !tempfile INCEXIST
- !system 'if exist "@CPACK_NSIS_SIGN_UNINSTALLER@" echo !define
HAVE_SIGN_UNINST > "${INCEXIST}"'
- !include "${INCEXIST}"
- !delfile "${INCEXIST}"
- !ifdef HAVE_SIGN_UNINST
- !system '"@CPACK_NSIS_SIGN_UNINSTALLER@" $%TEMP%\Uninstall.exe' = 0
- !endif
-
- ; Good. Now we can carry on writing the real installer.
;Name and file
Name "@CPACK_NSIS_PACKAGE_NAME@"
@@ -63,7 +36,6 @@
;Set compression
SetCompressor @CPACK_NSIS_COMPRESSOR@
-!endif
;Require administrator access
RequestExecutionLevel admin
@@ -587,10 +559,8 @@ FunctionEnd
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
-!ifdef INNER
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
-!endif
;--------------------------------
;Languages
@@ -672,10 +642,7 @@ Section "-Core installation"
WriteRegStr SHCTX
"Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" ""
$INSTDIR
;Create uninstaller
-!ifndef INNER
- ; this packages the signed uninstaller
- File $%TEMP%\Uninstall.exe
-!endif
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
Push "DisplayName"
Push "@CPACK_NSIS_DISPLAY_NAME@"
Call ConditionalAddToRegisty
@@ -834,7 +801,6 @@ FunctionEnd
;--------------------------------
;Uninstaller Section
-!ifdef INNER
Section "Uninstall"
ReadRegStr $START_MENU SHCTX \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
"StartMenu"
@@ -920,7 +886,6 @@ Section "Uninstall"
Call un.RemoveFromPath
doNotRemoveFromPath:
SectionEnd
-!endif
;--------------------------------
; determine admin versus local install
@@ -933,14 +898,6 @@ SectionEnd
; "Program Files" for AllUsers, "My Documents" for JustMe...
Function .onInit
-!ifdef INNER
- ; If INNER is defined, then we aren't supposed to do anything except write
out
- ; the installer. This is better than processing a command line option as it
means
- ; this entire code path is not present in the final (real) installer.
-
- WriteUninstaller "$%TEMP%\Uninstall.exe"
- Quit ; just bail out quickly when running the "inner" installer
-!endif
StrCmp "@CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL@" "ON" 0 inst
ReadRegStr $0 HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
"UninstallString"
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/cpack-sign-uninstaller.rst | 5 ---
Modules/CPackNSIS.cmake | 4 ---
Modules/NSIS.template.in | 45 +--------------------------
3 files changed, 1 insertion(+), 53 deletions(-)
delete mode 100644 Help/release/dev/cpack-sign-uninstaller.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
