Menu
▾
▴
[popfile-commit] windows adduser-Version.nsh, 1.6.2.11, 1.6.2.12 adduser.nsi, 1.59.4.12, 1.59.4.13 MonitorCC.nsi, 1.19.4.5, 1.19.4.6 msgcapture.nsi, 1.7.4.5, 1.7.4.6 runpopfile.nsi, 1.11.4.6, 1.11.4.7 runsqlite.nsi, 1.1.4.5, 1.1.4.6 stop_popfile.nsi, 1.14.4.5, 1.14.4.6
|
From: Brian S. <xue...@us...> - 2007-02-08 19:26:30
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21588 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi MonitorCC.nsi msgcapture.nsi runpopfile.nsi runsqlite.nsi stop_popfile.nsi Log Message: Explicitly set the execution privilege which Vista expects to find in the manifest. Also customise the embedded manifest. Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.5 retrieving revision 1.14.4.6 diff -C2 -d -r1.14.4.5 -r1.14.4.6 *** stop_popfile.nsi 5 Dec 2006 23:15:55 -0000 1.14.4.5 --- stop_popfile.nsi 8 Feb 2007 19:26:22 -0000 1.14.4.6 *************** *** 3,7 **** # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 3,7 ---- # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 123,127 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.2" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 123,127 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" *************** *** 137,140 **** --- 137,153 ---- SilentInstall silent + ;-------------------------------------------------------------------------- + ; 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="Silent shutdown utility for POPFile"' + ;------------------------------------------------------------------------------- ; Time delay constants used in conjunction with the NSISdl plugin *************** *** 178,181 **** --- 191,195 ---- VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION *************** *** 231,235 **** usage: MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION} \ ! Copyright (c) 2006 John Graham-Cumming\ ${MB_NL}${MB_NL}\ This command-line utility shuts POPFile down silently, without opening a browser window.\ --- 245,249 ---- usage: MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION} \ ! Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming\ ${MB_NL}${MB_NL}\ This command-line utility shuts POPFile down silently, without opening a browser window.\ Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.5 retrieving revision 1.19.4.6 diff -C2 -d -r1.19.4.5 -r1.19.4.6 *** MonitorCC.nsi 5 Dec 2006 20:33:50 -0000 1.19.4.5 --- MonitorCC.nsi 8 Feb 2007 19:26:21 -0000 1.19.4.6 *************** *** 5,9 **** # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 111,115 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.3" !define C_OUTFILE "monitorcc.exe" --- 111,115 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.5" !define C_OUTFILE "monitorcc.exe" *************** *** 119,122 **** --- 119,135 ---- Caption "${C_PFI_PRODUCT} ${C_PFI_VERSION}" + ;-------------------------------------------------------------------------- + ; 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="Monitor flat-file or BerkeleyDB corpus conversion"' + ;------------------------------------------------ ; Define PFI_VERBOSE to get more compiler output *************** *** 153,156 **** --- 166,170 ---- VIAddVersionKey "Build" "Multi-Language" + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.6 retrieving revision 1.11.4.7 diff -C2 -d -r1.11.4.6 -r1.11.4.7 *** runpopfile.nsi 5 Dec 2006 23:15:55 -0000 1.11.4.6 --- runpopfile.nsi 8 Feb 2007 19:26:21 -0000 1.11.4.7 *************** *** 11,15 **** # mode is selected in 'popfile.cfg'. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 11,15 ---- # mode is selected in 'popfile.cfg'. # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 117,121 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.3" !define C_OUTFILE "runpopfile.exe" --- 117,121 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.6" !define C_OUTFILE "runpopfile.exe" *************** *** 136,139 **** --- 136,152 ---- !define C_PFI_PRODUCT "POPFile" + ;-------------------------------------------------------------------------- + ; 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="Intelligent front-end used to launch POPFile"' + #-------------------------------------------------------------------------- # Use the standard NSIS list of common Windows Messages *************** *** 172,175 **** --- 185,189 ---- VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7.4.5 retrieving revision 1.7.4.6 diff -C2 -d -r1.7.4.5 -r1.7.4.6 *** msgcapture.nsi 5 Dec 2006 23:15:54 -0000 1.7.4.5 --- msgcapture.nsi 8 Feb 2007 19:26:21 -0000 1.7.4.6 *************** *** 7,11 **** # used by earlier installers it caused confusion amongst some users). # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 7,11 ---- # used by earlier installers it caused confusion amongst some users). # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 115,119 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.2" !define C_OUTFILE "msgcapture.exe" --- 115,119 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" !define C_OUTFILE "msgcapture.exe" *************** *** 133,136 **** --- 133,149 ---- Caption "$(^Name) v${C_VERSION}" + ;-------------------------------------------------------------------------- + ; 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="Capture console messages from POPFile"' + #-------------------------------------------------------------------------- # Use the "Modern User Interface" *************** *** 169,172 **** --- 182,186 ---- VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.11 retrieving revision 1.6.2.12 diff -C2 -d -r1.6.2.11 -r1.6.2.12 *** adduser-Version.nsh 31 Jan 2007 13:23:48 -0000 1.6.2.11 --- adduser-Version.nsh 8 Feb 2007 19:26:21 -0000 1.6.2.12 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.6" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.8" #-------------------------------------------------------------------------- Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.5 retrieving revision 1.1.4.6 diff -C2 -d -r1.1.4.5 -r1.1.4.6 *** runsqlite.nsi 5 Dec 2006 23:15:55 -0000 1.1.4.5 --- runsqlite.nsi 8 Feb 2007 19:26:22 -0000 1.1.4.6 *************** *** 10,14 **** # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 10,14 ---- # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 75,79 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.2" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 75,79 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" *************** *** 93,96 **** --- 93,109 ---- SilentInstall silent + ;-------------------------------------------------------------------------- + ; 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="Intelligent front-end to SQLite command-line utility"' + #-------------------------------------------------------------------------- # Include private library functions and macro definitions *************** *** 121,124 **** --- 134,138 ---- VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.12 retrieving revision 1.59.4.13 diff -C2 -d -r1.59.4.12 -r1.59.4.13 *** adduser.nsi 31 Jan 2007 13:23:48 -0000 1.59.4.12 --- adduser.nsi 8 Feb 2007 19:26:21 -0000 1.59.4.13 *************** *** 213,216 **** --- 213,229 ---- UninstallCaption "Remove POPFile User v${C_PFI_VERSION}" + ;-------------------------------------------------------------------------- + ; 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.wizard" \ + /DESCRIPTION="Add POPFile User wizard"' + ;---------------------------------------------------------------------- ; Default location for POPFile User Data files (popfile.cfg and others) *************** *** 355,358 **** --- 368,372 ---- !endif + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION |
