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
discards a16cf09e57105c0ccb3d86419b1daf72c3b0e6e2 (commit)
discards 2a826e330d67889c70009170020bef661195f6da (commit)
via 61beaf2735aec3a10ce8806639785403b487974b (commit)
via e1ee7b4305bdf2b50640c4c500705bb4bbff47bf (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (a16cf09e57105c0ccb3d86419b1daf72c3b0e6e2)
\
N -- N -- N (61beaf2735aec3a10ce8806639785403b487974b)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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=61beaf2735aec3a10ce8806639785403b487974b
commit 61beaf2735aec3a10ce8806639785403b487974b
Merge: 5d2f30f e1ee7b4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 22 14:01:34 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Mar 22 10:01:46 2017 -0400
Stage topic 'cpack_nsis_sign_uninstaller'
Topic-id: 23173
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/605
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1ee7b4305bdf2b50640c4c500705bb4bbff47bf
commit e1ee7b4305bdf2b50640c4c500705bb4bbff47bf
Author: Roman Wüger <roman.wue...@gmx.at>
AuthorDate: Wed Mar 22 13:15:24 2017 +0100
Commit: Roman Wüger <roman.wue...@gmx.at>
CommitDate: Wed Mar 22 13:15:24 2017 +0100
CPack/NSIS: Avoid a race condition when generating the installer
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index ffa6277..4f6aa75 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -30,19 +30,20 @@
;--------------------------------
;General
!ifdef INNER
- OutFile "$%TEMP%\tempinstaller.exe"
+ OutFile "${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
+ !tempfile TEMPINSTALLER
+ !tempfile TEMPUNINSTALLER
+ !system "$\"${NSISDIR}\makensis$\" /DTEMPINSTALLER=$\"${TEMPINSTALLER}$\"
/DTEMPUNINSTALLER=$\"${TEMPUNINSTALLER}$\" /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
+ !system "$\"${TEMPINSTALLER}.exe$\"" = 2
; That will have written an uninstaller binary for us. Now we sign it with
your
; favourite code signing tool.
@@ -52,7 +53,7 @@
!include "${INCEXIST}"
!delfile "${INCEXIST}"
!ifdef HAVE_SIGN_UNINST
- !system '"@CPACK_NSIS_SIGN_UNINSTALLER@" "$%TEMP%\Uninstall.exe"' = 0
+ !system '"@CPACK_NSIS_SIGN_UNINSTALLER@" "${TEMPUNINSTALLER}.exe"' = 0
!endif
; Good. Now we can carry on writing the real installer.
@@ -674,7 +675,7 @@ Section "-Core installation"
;Create uninstaller
!ifndef INNER
; this packages the signed uninstaller
- File "$%TEMP%\Uninstall.exe"
+ File "/oname=Uninstall.exe" "${TEMPUNINSTALLER}.exe"
!endif
Push "DisplayName"
Push "@CPACK_NSIS_DISPLAY_NAME@"
@@ -938,7 +939,7 @@ Function .onInit
; 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"
+ WriteUninstaller "${TEMPUNINSTALLER}.exe"
Quit ; just bail out quickly when running the "inner" installer
!endif
StrCmp "@CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL@" "ON" 0 inst
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/cpack-sign-uninstaller.rst | 5 +++
Modules/CPackNSIS.cmake | 4 +++
Modules/NSIS.template.in | 46 ++++++++++++++++++++++++++-
3 files changed, 54 insertions(+), 1 deletion(-)
create 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
