Update of /cvsroot/popfile/windows/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21588/test
Modified Files:
Tag: b0_22_2
pfidbstatus.nsi pfidiag.nsi
Log Message:
Explicitly set the execution privilege which Vista expects to find
in the manifest. Also customise the embedded manifest.
Index: pfidbstatus.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -d -r1.3.2.5 -r1.3.2.6
*** pfidbstatus.nsi 5 Dec 2006 23:15:55 -0000 1.3.2.5
--- pfidbstatus.nsi 8 Feb 2007 19:26:22 -0000 1.3.2.6
***************
*** 12,16 ****
# sqlite.exe version number before trying to execute any SQL.
#
! # Copyright (c) 2005-2006 John Graham-Cumming
#
# This file is part of POPFile
--- 12,16 ----
# sqlite.exe version number before trying to execute any SQL.
#
! # Copyright (c) 2005-2007 John Graham-Cumming
#
# This file is part of POPFile
***************
*** 157,161 ****
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.2" ; see 'VIProductVersion' comment below for format details
!define C_OUTFILE "pfidbstatus.exe"
--- 157,161 ----
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.4" ; see 'VIProductVersion' comment below for format details
!define C_OUTFILE "pfidbstatus.exe"
***************
*** 176,179 ****
--- 176,192 ----
Icon "..\POPFileIcon\popfile.ico"
+ ;--------------------------------------------------------------------------
+ ; Windows Vista expects to find a manifest specifying the execution level
+ ;--------------------------------------------------------------------------
+
+ RequestExecutionLevel user
+
+ !tempfile EXE_HDR
+ !packhdr "${EXE_HDR}" \
+ '"..\toolkit\pfi-manifest.exe" \
+ /FILE="${EXE_HDR}" \
+ /NAME="POPFile.utility" \
+ /DESCRIPTION="Check POPFile SQLite database integrity"'
+
#--------------------------------------------------------------------------
# Use the "Modern User Interface"
***************
*** 214,217 ****
--- 227,231 ----
VIAddVersionKey "OriginalFilename" "${C_OUTFILE}"
+ VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}"
VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
!ifdef C_PFI_LIBRARY_VERSION
Index: pfidiag.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v
retrieving revision 1.8.4.5
retrieving revision 1.8.4.6
diff -C2 -d -r1.8.4.5 -r1.8.4.6
*** pfidiag.nsi 5 Dec 2006 23:15:55 -0000 1.8.4.5
--- pfidiag.nsi 8 Feb 2007 19:26:22 -0000 1.8.4.6
***************
*** 5,9 ****
# by the Windows installer for POPFile v0.21.0 (or later).
#
! # Copyright (c) 2004-2006 John Graham-Cumming
#
# This file is part of POPFile
--- 5,9 ----
# by the Windows installer for POPFile v0.21.0 (or later).
#
! # Copyright (c) 2004-2007 John Graham-Cumming
#
# This file is part of POPFile
***************
*** 104,108 ****
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.2"
!define C_OUTFILE "pfidiag.exe"
--- 104,108 ----
;--------------------------------------------------------------------------
! !define C_VERSION "0.1.4"
!define C_OUTFILE "pfidiag.exe"
***************
*** 120,123 ****
--- 120,136 ----
!define C_PFI_PRODUCT_REGISTRY_ENTRY "Software\POPFile Project\${C_PFI_PRODUCT}\MRI"
+ ;--------------------------------------------------------------------------
+ ; Windows Vista expects to find a manifest specifying the execution level
+ ;--------------------------------------------------------------------------
+
+ RequestExecutionLevel user
+
+ !tempfile EXE_HDR
+ !packhdr "${EXE_HDR}" \
+ '"..\toolkit\pfi-manifest.exe" \
+ /FILE="${EXE_HDR}" \
+ /NAME="POPFile.utility" \
+ /DESCRIPTION="PFI Diagnostic Utility for POPFile"'
+
#--------------------------------------------------------------------------
# Use the "Modern User Interface"
***************
*** 156,159 ****
--- 169,173 ----
VIAddVersionKey "OriginalFilename" "${C_OUTFILE}"
+ VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}"
VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
!ifdef C_PFI_LIBRARY_VERSION
|
