Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Brian S. <xue...@us...> - 2007-07-29 16:16:27
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3223 Modified Files: Tag: b0_22_2 pfidiag.nsi Log Message: Take the size of the details view window into account when scrolling to bring the important part of the "simple" report into view. Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8.4.7 retrieving revision 1.8.4.8 diff -C2 -d -r1.8.4.7 -r1.8.4.8 *** pfidiag.nsi 5 May 2007 12:28:07 -0000 1.8.4.7 --- pfidiag.nsi 29 Jul 2007 16:16:26 -0000 1.8.4.8 *************** *** 104,108 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" !define C_OUTFILE "pfidiag.exe" --- 104,108 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.6" !define C_OUTFILE "pfidiag.exe" *************** *** 1608,1611 **** --- 1608,1612 ---- !define C_LVM_GETITEMCOUNT 0x1004 !define C_LVM_ENSUREVISIBLE 0x1013 + !define C_LVM_COUNTPERPAGE 0x1028 #-------------------------------------------------------------------------- *************** *** 1628,1634 **** Function ScrollToShowPaths ! !define L_TEMP $R9 ! !define L_TOPROW $R8 ; item index of the line we want to be at the top of the window Push ${L_TEMP} Push ${L_TOPROW} --- 1629,1637 ---- Function ScrollToShowPaths ! !define L_DLG_ITEM $R9 ; the dialog item we are going to manipulate ! !define L_TEMP $R8 ! !define L_TOPROW $R7 ; item index of the line we want to be at the top of the window + Push ${L_DLG_ITEM} Push ${L_TEMP} Push ${L_TOPROW} *************** *** 1639,1649 **** ; this is the information most users will want to find first). StrCpy ${L_TOPROW} 9 ; index of the blank line immediately before "Current UserName" ! ; Check how many 'details' lines there are ! FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT ! GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view ! SendMessage ${L_TEMP} ${C_LVM_GETITEMCOUNT} 0 0 ${L_TEMP} ; No point in trying to display a non-existent line --- 1642,1663 ---- ; this is the information most users will want to find first). + FindWindow ${L_DLG_ITEM} "#32770" "" $HWNDPARENT + GetDlgItem ${L_DLG_ITEM} ${L_DLG_ITEM} 0x3F8 ; This is the Control ID of the details view + + ; Check how many lines can be shown in the details view + + SendMessage ${L_DLG_ITEM} ${C_LVM_COUNTPERPAGE} 0 0 ${L_TEMP} + + ; The important information for the simple report is held in rows 10 to 19 (starting from 0) + + StrCpy ${L_TOPROW} 10 ; index of the "Current UserName" row in the simple report + IntCmp ${L_TEMP} 10 getrowcount getrowcount StrCpy ${L_TOPROW} 9 ; index of the blank line immediately before "Current UserName" ! getrowcount: ! ; Check how many 'details' lines there are in the report ! ! SendMessage ${L_DLG_ITEM} ${C_LVM_GETITEMCOUNT} 0 0 ${L_TEMP} ; No point in trying to display a non-existent line *************** *** 1653,1664 **** ; Scroll up (in effect) to show Current UserName, Program folder & User Data folder entries ! FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT ! GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view ! SendMessage ${L_TEMP} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 exit: Pop ${L_TOPROW} Pop ${L_TEMP} !undef L_TEMP !undef L_TOPROW --- 1667,1678 ---- ; Scroll up (in effect) to show Current UserName, Program folder & User Data folder entries ! SendMessage ${L_DLG_ITEM} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 exit: Pop ${L_TOPROW} Pop ${L_TEMP} + Pop ${L_DLG_ITEM} + !undef L_DLG_ITEM !undef L_TEMP !undef L_TOPROW |
|
From: Brian S. <xue...@us...> - 2007-07-29 16:15:24
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2839 Modified Files: Tag: b0_22_2 pfidbstatus.nsi Log Message: Take the size of the details view window into account when scrolling to bring the important part of the results into view. Index: pfidbstatus.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v retrieving revision 1.3.2.7 retrieving revision 1.3.2.8 diff -C2 -d -r1.3.2.7 -r1.3.2.8 *** pfidbstatus.nsi 5 May 2007 12:28:07 -0000 1.3.2.7 --- pfidbstatus.nsi 29 Jul 2007 16:15:21 -0000 1.3.2.8 *************** *** 157,161 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" --- 157,161 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" *************** *** 946,949 **** --- 946,951 ---- !define C_LVM_GETTOPINDEX 0x1027 + !define C_LVM_COUNTPERPAGE 0x1028 + #-------------------------------------------------------------------------- # Installer Function: GetDetailViewItemCount *************** *** 1025,1057 **** Function HideFinalTimestamp ! !define L_TEMP $R9 ! !define L_TOPROW $R8 Push ${L_TEMP} Push ${L_TOPROW} ! ; The final timestamp block uses 3 lines so we want to scroll up 3 lines to bring ; more important lines back into view at the top of the list. The LVM_SCROLL message ; uses a pixel-based vertical scroll value instead of an item-based value so we take ; an easier approach: find the item index of the currently visible top row and then ! ; make visible the item which is 3 rows before that. (The item index is zero based so ! ; we must ensure we never supply a negative item index) ! FindWindow ${L_TOPROW} "#32770" "" $HWNDPARENT ! GetDlgItem ${L_TOPROW} ${L_TOPROW} 0x3F8 ; This is the Control ID of the details view ! SendMessage ${L_TOPROW} ${C_LVM_GETTOPINDEX} 0 0 ${L_TOPROW} - IntOp ${L_TOPROW} ${L_TOPROW} - 3 IntCmp ${L_TOPROW} 0 scrollup 0 scrollup StrCpy ${L_TOPROW} 0 scrollup: ! FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT ! GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view ! SendMessage ${L_TEMP} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 Pop ${L_TOPROW} Pop ${L_TEMP} !undef L_TEMP !undef L_TOPROW --- 1027,1080 ---- Function HideFinalTimestamp ! !define L_DLG_ITEM $R9 ; the dialog item we are going to manipulate ! !define L_SCROLLUP $R8 ; number of lines to scroll up ! !define L_TEMP $R7 ! !define L_TOPROW $R6 ; index of the row to appear at the top + Push ${L_DLG_ITEM} + Push ${L_SCROLLUP} Push ${L_TEMP} Push ${L_TOPROW} ! ; The final timestamp block uses several lines so we scroll up a few lines to bring ; more important lines back into view at the top of the list. The LVM_SCROLL message ; uses a pixel-based vertical scroll value instead of an item-based value so we take ; an easier approach: find the item index of the currently visible top row and then ! ; make visible the item which is a few rows before that. ! FindWindow ${L_DLG_ITEM} "#32770" "" $HWNDPARENT ! GetDlgItem ${L_DLG_ITEM} ${L_DLG_ITEM} 0x3F8 ; This is the Control ID of the details view ! ! ; Check how many lines can be shown in the details view ! ! SendMessage ${L_DLG_ITEM} ${C_LVM_COUNTPERPAGE} 0 0 ${L_TEMP} ! ! StrCpy ${L_SCROLLUP} 4 ; hide the three-line timestamp plus the blank line before it ! IntCmp ${L_TEMP} 10 findtop findtop ! StrCpy ${L_SCROLLUP} 3 ; hide the timestamp, leaving a blank line before & after the important lines ! ! findtop: ! ! ; Get the index of the row currently shown at the top of the details view ! ! SendMessage ${L_DLG_ITEM} ${C_LVM_GETTOPINDEX} 0 0 ${L_TOPROW} ! ! IntOp ${L_TOPROW} ${L_TOPROW} - ${L_SCROLLUP} ! ! ; The item index is zero based so we must ensure we never supply a negative item index IntCmp ${L_TOPROW} 0 scrollup 0 scrollup StrCpy ${L_TOPROW} 0 scrollup: ! SendMessage ${L_DLG_ITEM} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 Pop ${L_TOPROW} Pop ${L_TEMP} + Pop ${L_SCROLLUP} + Pop ${L_DLG_ITEM} + !undef L_DLG_ITEM + !undef L_SCROLLUP !undef L_TEMP !undef L_TOPROW |
|
From: Brian S. <xue...@us...> - 2007-07-13 21:36:01
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13597 Modified Files: Tag: b0_22_2 getssl.nsh installer.nsi Log Message: The 0.22.5 installer did not work very well when run from a 'standard' account in Vista. Use the UAC plugin to allow part of the installer to run at 'admin' level and the remainder to run at the current 'user' level. This lets the installer work properly when it is run from a 'standard' account in Vista. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.10 retrieving revision 1.242.4.11 diff -C2 -d -r1.242.4.10 -r1.242.4.11 *** installer.nsi 12 May 2007 17:16:05 -0000 1.242.4.10 --- installer.nsi 13 Jul 2007 21:35:51 -0000 1.242.4.11 *************** *** 100,103 **** --- 100,121 ---- #-------------------------------------------------------------------------- + ;------------------------------------------------ + ; This script requires the 'UAC' NSIS plugin + ;------------------------------------------------ + + ; The new 'User Account Control' (UAC) feature in Windows Vista makes it difficult to install + ; POPFile from a 'standard' user account. This script uses a special NSIS plugin (UAC) which + ; allows the 'POPFile program files' part of the installation to be run at the 'admin' level + ; and the user-specific POPFile configuration part to be run at the 'user' level. + ; + ; The 'NSIS Wiki' page for the 'UAC' plugin (description, example and download links): + ; http://nsis.sourceforge.net/UAC_plug-in + ; + ; To compile this script, copy the 'UAC.dll' file to the standard NSIS plugins folder + ; (${NSISDIR}\Plugins\). The 'UAC' source and example files can be unzipped to the + ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. + ; + ; Tested with version v0.0.6b of the 'UAC' plugin. + #-------------------------------------------------------------------------- # Compile-time command-line switches (used by 'makensis.exe') *************** *** 230,236 **** ;-------------------------------------------------------------------------- ; Windows Vista expects to find a manifest specifying the execution level ;-------------------------------------------------------------------------- ! RequestExecutionLevel admin ;---------------------------------------------------------------------- --- 248,270 ---- ;-------------------------------------------------------------------------- ; Windows Vista expects to find a manifest specifying the execution level + ; + ; The POPFile installer has two stages; the first stage (setup.exe) installs the + ; POPFile program and then calls the second stage (adduser.exe) to configure POPFile + ; for the current user. + ; + ; The first stage has to be able to write to the default installation folder + ; (C:\Program Files\POPFile, or its equivalent) and be able to create/update + ; some HKLM registry entries so it requires 'administrator' privileges. The + ; second stage creates user-specific environment variables and HKCU registry + ; entries so it requires 'current user' privileges. + ; + ; A special NSIS plugin (UAC) is used to allow these two stages of the + ; installer to run with the required privileges. Although this script is + ; used to create the 'administrator' privileges stage of the installer + ; the UAC plugin requires this script to specify 'user' instead of 'admin' + ; when requesting the execution level. ;-------------------------------------------------------------------------- ! RequestExecutionLevel user ;---------------------------------------------------------------------- *************** *** 242,246 **** !define C_PERL_VERSION "5.8.8" !define C_PERL_BUILD "820" ! ;---------------------------------------------------------------------- ; Recently there have been some significant changes to the structure and --- 276,280 ---- !define C_PERL_VERSION "5.8.8" !define C_PERL_BUILD "820" ! ;---------------------------------------------------------------------- ; Recently there have been some significant changes to the structure and *************** *** 254,273 **** !system '".\toolkit\ap-vcheck.exe" ${C_PERL_DIR}' !include /NONFATAL ".\ap-version.nsh" ! ; The above '!system' call can fail on older (slower/Win9x?) systems so if the expected ; output file is not found we try a safer version of the '!system' call. If this call ; also fails then the NSIS compiler will stop with a fatal error. ! !ifndef C_AP_STATUS !system 'start /w toolkit\ap-vcheck.exe ${C_PERL_DIR}' !include ".\ap-version.nsh" !endif ! ; Delete the "include" file after it has been read ! !delfile ".\ap-version.nsh" ! ; Now we can check that the location defined in ${C_PERL_DIR} is suitable ! !if "${C_AP_STATUS}" == "failure" !error "${MB_NL}${MB_NL}Fatal error:${MB_NL}\ --- 288,307 ---- !system '".\toolkit\ap-vcheck.exe" ${C_PERL_DIR}' !include /NONFATAL ".\ap-version.nsh" ! ; The above '!system' call can fail on older (slower/Win9x?) systems so if the expected ; output file is not found we try a safer version of the '!system' call. If this call ; also fails then the NSIS compiler will stop with a fatal error. ! !ifndef C_AP_STATUS !system 'start /w toolkit\ap-vcheck.exe ${C_PERL_DIR}' !include ".\ap-version.nsh" !endif ! ; Delete the "include" file after it has been read ! !delfile ".\ap-version.nsh" ! ; Now we can check that the location defined in ${C_PERL_DIR} is suitable ! !if "${C_AP_STATUS}" == "failure" !error "${MB_NL}${MB_NL}Fatal error:${MB_NL}\ *************** *** 275,281 **** ${MB_NL} (${C_AP_ERRORMSG})${MB_NL}" !endif ! ; For this build of the installer we require an exact match for the ActivePerl version number _and_ build number ! !if "${C_AP_VERSION}.${C_AP_BUILD}" != "${C_PERL_VERSION}.${C_PERL_BUILD}" !error "${MB_NL}${MB_NL}Fatal error:${MB_NL}\ --- 309,315 ---- ${MB_NL} (${C_AP_ERRORMSG})${MB_NL}" !endif ! ; For this build of the installer we require an exact match for the ActivePerl version number _and_ build number ! !if "${C_AP_VERSION}.${C_AP_BUILD}" != "${C_PERL_VERSION}.${C_PERL_BUILD}" !error "${MB_NL}${MB_NL}Fatal error:${MB_NL}\ *************** *** 284,288 **** ${MB_NL} $\"${C_AP_FOLDER}$\" folder${MB_NL}" !endif ! !echo "${MB_NL}\ ${MB_NL} ActivePerl version ${C_AP_VERSION} Build ${C_AP_BUILD} will be used to prepare the minimal Perl${MB_NL}${MB_NL}" --- 318,322 ---- ${MB_NL} $\"${C_AP_FOLDER}$\" folder${MB_NL}" !endif ! !echo "${MB_NL}\ ${MB_NL} ActivePerl version ${C_AP_VERSION} Build ${C_AP_BUILD} will be used to prepare the minimal Perl${MB_NL}${MB_NL}" *************** *** 735,739 **** ReserveFile "ioG.ini" ReserveFile "${C_RELEASE_NOTES}" ! ReserveFile "SSL_pm.pat" #-------------------------------------------------------------------------- --- 769,774 ---- ReserveFile "ioG.ini" ReserveFile "${C_RELEASE_NOTES}" ! ReserveFile "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf" ! ; ReserveFile "SSL_pm.pat" ; 0.22.5 does not need any SSL patches so there's no need for a built-in copy #-------------------------------------------------------------------------- *************** *** 743,746 **** --- 778,812 ---- Function .onInit + ; Use the UAC plugin to ensure that this installer runs with 'administrator' privileges + ; (UAC = Vista's new "User Account Control" feature). + ; + ; WARNING: The UAC plugin uses $0, $1, $2 and $3 registers + + UAC_Elevate: + UAC::RunElevated + StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user? + StrCmp 0 $0 0 UAC_Err ; Error? + StrCmp 1 $1 0 UAC_Success ; Are we the real deal or just the wrapper? + Quit + + UAC_Err: + MessageBox mb_iconstop "Unable to elevate , error $0" + Abort + + UAC_ElevationAborted: + MessageBox mb_iconstop "This installer requires admin access, aborting!" + Abort + + UAC_Success: + # if $0==0 && $1==0, UAC not supported (Probably <NT6), run as normal? + # if $0==0 && $1==3, we can try to elevate again + # if $0==0 && $3==1, we are a member of the admin group (Any OS) + StrCmp 1 $3 continue ; Admin? + StrCmp 3 $1 0 UAC_ElevationAborted ; Try again? + MessageBox mb_iconstop "This installer requires admin access, try again" + goto UAC_Elevate + + continue: + ; The reason why '.onInit' preserves the registers it uses is that it makes debugging easier! *************** *** 793,796 **** --- 859,883 ---- FunctionEnd + + #-------------------------------------------------------------------------- + # Installer Function: .OnInstFailed (required by UAC plugin) + #-------------------------------------------------------------------------- + + Function .OnInstFailed + + UAC::Unload ; Must call unload! + + FunctionEnd + + #-------------------------------------------------------------------------- + # Installer Function: .OnInstSuccess (required by UAC plugin) + #-------------------------------------------------------------------------- + + Function .OnInstSuccess + + UAC::Unload ; Must call unload! + + FunctionEnd + #-------------------------------------------------------------------------- # Installer Function: PFIGUIInit *************** *** 858,864 **** StrCpy $G_SSL_ONLY "0" ; assume a full installation is required ! Call PFI_GetParameters ! Pop ${L_RESERVED} ! StrCmp ${L_RESERVED} "/SSL" 0 exit StrCpy $G_SSL_ONLY "1" ; just download and install the SSL support files --- 945,958 ---- StrCpy $G_SSL_ONLY "0" ; assume a full installation is required ! Call PFI_GetParameters ; The UAC plugin may modify the command-line ! Push "/SSL" ; so we need to check for "/SSL" anywhere on ! Call PFI_StrStr ; the command-line (instead of assuming the ! Pop ${L_RESERVED} ; command-line is either /SSL or empty) ! StrCmp ${L_RESERVED} "" exit ! StrCpy ${L_RESERVED} ${L_RESERVED} 5 ! StrCmp ${L_RESERVED} "/SSL" sslonly ! StrCmp ${L_RESERVED} "/SSL " 0 exit ! ! sslonly: StrCpy $G_SSL_ONLY "1" ; just download and install the SSL support files *************** *** 1982,1991 **** ; [Future builds may pass more than just a command-line switch to the wizard] IfRebootFlag special_case ! Exec '"$G_ROOTDIR\adduser.exe" /install' Abort special_case: ! Exec '"$G_ROOTDIR\adduser.exe" /installreboot' Abort --- 2076,2090 ---- ; [Future builds may pass more than just a command-line switch to the wizard] + ; Use the UAC plugin to ensure that adduser.exe runs with 'current user' privileges + ; (UAC = Vista's new "User Account Control" feature). + ; + ; WARNING: The UAC plugin uses $0, $1, $2 and $3 registers + IfRebootFlag special_case ! UAC::Exec "" "$G_ROOTDIR\adduser.exe" "/install" "" Abort special_case: ! UAC::Exec "" "$G_ROOTDIR\adduser.exe" "/installreboot" "" Abort Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.13 retrieving revision 1.6.2.14 diff -C2 -d -r1.6.2.13 -r1.6.2.14 *** getssl.nsh 13 Jun 2007 23:26:35 -0000 1.6.2.13 --- getssl.nsh 13 Jul 2007 21:35:51 -0000 1.6.2.14 *************** *** 149,152 **** --- 149,153 ---- !define C_PATCH_WEBSITE "http://getpopfile.org/ssl-patch" + !ifdef INSTALLER !define C_PATCH_CTRL_FILE "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf" *************** *** 554,557 **** --- 555,559 ---- ; 0.22.5 release does not need any SSL patches so "SSL_pm.pat" is not needed here + ; File /nonfatal "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat" !else |
|
From: Brian S. <xue...@us...> - 2007-06-13 23:26:39
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21630 Modified Files: Tag: b0_22_2 getssl.nsh Added Files: Tag: b0_22_2 0.22.5.pcf Log Message: Use release-specific PCF files for greater flexibility. --- NEW FILE: 0.22.5.pcf --- ; POPFILE PATCH CONTROL FILE [PCF] Format=1 [Settings] POPFileVersion=0.22.5 PatchIssue=1 NumberOfPatches=0 Comment=The current SSL Support files are compatible (13 Jun 2007 @ 19:08 GMT) Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.12 retrieving revision 1.6.2.13 diff -C2 -d -r1.6.2.12 -r1.6.2.13 *** getssl.nsh 28 Jan 2007 21:17:35 -0000 1.6.2.12 --- getssl.nsh 13 Jun 2007 23:26:35 -0000 1.6.2.13 *************** *** 21,24 **** --- 21,28 ---- # will be applied to downgrade the SSL.pm file to the compatible v0.97 version. # + # POPFile 0.22.5 uses a new minimal Perl and at the time of its release there + # was no need to patch any of the SSL Support files from the University of + # Winnipeg repository. + # # Starting with the 0.22.5 release any patches required to make the SSL Support # files compatible with POPFile will be downloaded from the POPFile web site. *************** *** 145,149 **** !define C_PATCH_WEBSITE "http://getpopfile.org/ssl-patch" ! !define C_PATCH_CTRL_FILE "0.22.x.pcf" !define C_MD5SUMS_FILE "MD5SUMS" --- 149,157 ---- !define C_PATCH_WEBSITE "http://getpopfile.org/ssl-patch" ! !ifdef INSTALLER ! !define C_PATCH_CTRL_FILE "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf" ! !else ! !define C_PATCH_CTRL_FILE "0.22.x.pcf" ! !endif !define C_MD5SUMS_FILE "MD5SUMS" *************** *** 242,246 **** ; Assume we will use the built-in SSL files which are compatible with pre-0.22.3 releases ! ; (these SSL support files do not require any patches to make them POPFIle-compatible) StrCpy $G_SSL_SOURCE "${C_BUILTIN}" --- 250,254 ---- ; Assume we will use the built-in SSL files which are compatible with pre-0.22.3 releases ! ; (these SSL support files do not require any patches to make them POPFile-compatible) StrCpy $G_SSL_SOURCE "${C_BUILTIN}" *************** *** 536,540 **** ; Failed to download POPFile's SSL Patch Control file or the MD5 sums ! StrCpy $G_PATCH_SOURCE "${C_BUILTIN}" DetailPrint "Unable to download data from POPFile website, using built-in SSL patches instead" --- 544,548 ---- ; Failed to download POPFile's SSL Patch Control file or the MD5 sums ! StrCpy $G_PATCH_SOURCE "${C_BUILTIN}" DetailPrint "Unable to download data from POPFile website, using built-in SSL patches instead" *************** *** 543,548 **** SetDetailsPrint none !ifdef INSTALLER ! File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "0.22.x.pcf" ! File /nonfatal "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat" !else File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "..\0.22.x.pcf" --- 551,558 ---- SetDetailsPrint none !ifdef INSTALLER ! File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "${C_PATCH_CTRL_FILE}" ! ! ; 0.22.5 release does not need any SSL patches so "SSL_pm.pat" is not needed here ! !else File "/oname=$PLUGINSDIR\${C_PATCH_CTRL_FILE}" "..\0.22.x.pcf" *************** *** 684,688 **** # (b) column 33 is a space character # (c) column 34 is the text/binary flag (' ' = text, '*' = binary) ! # (d) column 35 is the first character of the filename (fiename terminates with end-of-line) # # Inputs: --- 694,698 ---- # (b) column 33 is a space character # (c) column 34 is the text/binary flag (' ' = text, '*' = binary) ! # (d) column 35 is the first character of the filename (filename terminates with end-of-line) # # Inputs: *************** *** 833,837 **** !define L_FILENAME $R9 ; name of input file (assumed to be in $PLUGINSDIR) ! !define L_SOURCE $R8 ; handle used ot access the input file !define L_TARGET $R7 ; handle used to access the output file !define L_TEMP $R6 --- 843,847 ---- !define L_FILENAME $R9 ; name of input file (assumed to be in $PLUGINSDIR) ! !define L_SOURCE $R8 ; handle used to access the input file !define L_TARGET $R7 ; handle used to access the output file !define L_TEMP $R6 *************** *** 997,1004 **** --- 1007,1019 ---- DetailPrint "" DetailPrint "" + StrCmp ${L_LISTSIZE} "0" no_patches StrCmp ${L_LISTSIZE} "1" single_patch DetailPrint "Apply ${L_LISTSIZE} SSL patches..." Goto start_patching + no_patches: + DetailPrint "No POPFile SSL patches are required" + Goto all_done + single_patch: DetailPrint "Apply the SSL patch..." |
|
From: John Graham-C. <jgr...@us...> - 2007-06-11 07:15:43
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30118 Modified Files: Tag: b0_22_2 Makefile Log Message: Add automatic building of the version checking executable Index: Makefile =================================================================== RCS file: /cvsroot/popfile/windows/Makefile,v retrieving revision 1.22.4.2 retrieving revision 1.22.4.3 diff -C2 -d -r1.22.4.2 -r1.22.4.3 *** Makefile 13 Sep 2005 20:35:49 -0000 1.22.4.2 --- Makefile 11 Jun 2007 07:15:38 -0000 1.22.4.3 *************** *** 35,42 **** MSGCAPTURE=msgcapture.exe RUNSQLITE=runsqlite.exe ALLEXES := $(SETUP) $(RUNPOPFILE) $(ADDUSER) \ $(MONITORCC) $(STOP_PF) $(MSGCAPTURE) \ ! $(RUNSQLITE) $(POPFILE_WINDOWS_ZIP) all: build --- 35,44 ---- MSGCAPTURE=msgcapture.exe RUNSQLITE=runsqlite.exe + APVERCHECK=toolkit/ap-vcheck.exe ALLEXES := $(SETUP) $(RUNPOPFILE) $(ADDUSER) \ $(MONITORCC) $(STOP_PF) $(MSGCAPTURE) \ ! $(APVERCHECK) \ ! $(RUNSQLITE) $(POPFILE_WINDOWS_ZIP) all: build *************** *** 70,73 **** --- 72,76 ---- $(SETUP): $(STOP_PF) $(ENGINE)/popfile.exe $(ENGINE)/popfileb.exe $(ENGINE)/popfileib.exe $(ENGINE)/popfilef.exe $(ENGINE)/popfileif.exe $(ENGINE)/popfile-service.exe $(SETUP): $(RUNPOPFILE) $(ADDUSER) $(MONITORCC) $(STOP_PF) $(MSGCAPTURE) + $(SETUP): $(APVERCHECK) $(SETUP): ioG.ini WriteEnvStr.nsh $(SETUP): languages/*-pfi.nsh hdr-common.bmp special.bmp remove.ico *************** *** 92,93 **** --- 95,98 ---- $(MSGCAPTURE): hdr-common.bmp $(MSGCAPTURE): UI/pfi_headerbmpr.exe UI/pfi_modern.exe + + $(APVERCHECK): $(patsubst %.exe,%.nsi,$(APVERCHECK)) |
|
From: John Graham-C. <jgr...@us...> - 2007-06-11 07:14:53
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29726 Modified Files: Tag: b0_22_2 popfile.pck vars.mak Log Message: Updated version number and remove Fcntl from packing list Index: vars.mak =================================================================== RCS file: /cvsroot/popfile/engine/vars.mak,v retrieving revision 1.11.4.3 retrieving revision 1.11.4.4 diff -C2 -d -r1.11.4.3 -r1.11.4.4 *** vars.mak 21 Feb 2006 10:07:29 -0000 1.11.4.3 --- vars.mak 11 Jun 2007 07:14:51 -0000 1.11.4.4 *************** *** 8,12 **** export POPFILE_MAJOR_VERSION=0 export POPFILE_MINOR_VERSION=22 ! export POPFILE_REVISION=4 export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION) POPFILE_VERSION_FILE=POPFile/popfile_version --- 8,12 ---- export POPFILE_MAJOR_VERSION=0 export POPFILE_MINOR_VERSION=22 ! export POPFILE_REVISION=5 export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION) POPFILE_VERSION_FILE=POPFile/popfile_version Index: popfile.pck =================================================================== RCS file: /cvsroot/popfile/engine/popfile.pck,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** popfile.pck 3 Dec 2004 15:04:27 -0000 1.4 --- popfile.pck 11 Jun 2007 07:14:51 -0000 1.4.4.1 *************** *** 6,10 **** OPTIONAL-Japanese Language Support 0.0.0 Encode OPTIONAL-Japanese Language Support 0.0.0 Encode::Guess - REQUIRED 0.0.0 Fcntl REQUIRED 0.0.0 File::Copy REQUIRED 0.0.0 Getopt::Long --- 6,9 ---- |
|
From: Brian S. <xue...@us...> - 2007-06-10 16:06:59
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30729 Modified Files: Tag: b0_22_2 installer-Uninstall.nsh Log Message: Oops! Forgot to update the uninstaller after adding a new component to the minimal Perl recently. Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -C2 -d -r1.4.2.6 -r1.4.2.7 *** installer-Uninstall.nsh 10 Feb 2007 14:29:22 -0000 1.4.2.6 --- installer-Uninstall.nsh 10 Jun 2007 16:06:59 -0000 1.4.2.7 *************** *** 686,689 **** --- 686,690 ---- RMDir /r "$G_MPLIBDIR\HTML" RMDir /r "$G_MPLIBDIR\IO" + RMDir /r "$G_MPLIBDIR\List" RMDir /r "$G_MPLIBDIR\Math" RMDir /r "$G_MPLIBDIR\MIME" |
|
From: Brian S. <xue...@us...> - 2007-05-12 17:16:06
|
Update of /cvsroot/popfile/windows/toolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24148/toolkit Added Files: Tag: b0_22_2 ap-vcheck.nsi Log Message: At compile-time check that the ActivePerl installation specified in installer.nsi is suitable (the build machine has several different versions of Perl installed!). A compiler error is raised if the check finds an unsuitable version in the specified location. --- NEW FILE: ap-vcheck.nsi --- #------------------------------------------------------------------------------------------- # # ap-vcheck.nsi --- A simple utility used at compile-time to obtain the version and build # number of the ActivePerl installation specified in the 'installer.nsi' # source file. Recent updates to ActivePerl have caused run-time problems # with the minimal Perl and these prompted the creation of this utility. # This utility creates an INCLUDE file which is used by 'installer.nsi' # at compile-time to ensure that the installer is built using a suitable # version of ActivePerl. # # Copyright (c) 2007 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #------------------------------------------------------------------------------------------- #------------------------------------------------------------------------------------------- # Usage: # # AP-VCHECK Perl installation path # # where "Perl installation path" is the value defined as ${C_PERL_DIR} in 'installer.nsi' # #------------------------------------------------------------------------------------------- ; This version of the script has been tested with the "NSIS v2.22" compiler, ; released 27 November 2006. This particular compiler can be downloaded from ; http://prdownloads.sourceforge.net/nsis/nsis-2.22-setup.exe?download !define ${NSIS_VERSION}_found !ifndef v2.22_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ $\r$\n*** This script has only been tested using the NSIS v2.22 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ $\r$\n*** The resulting 'installer' program should be tested carefully!\ $\r$\n$\r$\n" !endif !undef ${NSIS_VERSION}_found ;-------------------------------------------------------------------------- ; Symbol used to avoid confusion over where the line breaks occur. ; ; ${MB_NL} is used for MessageBox-style 'new line' sequences. ; ; (this constant does not follow the 'C_' naming convention described below) ;-------------------------------------------------------------------------- !define MB_NL "$\r$\n" ;-------------------------------------------------------------------------- ; POPFile constants have been given names beginning with 'C_' (eg C_README) ;-------------------------------------------------------------------------- !define C_VERSION "0.0.1" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "ap-vcheck.exe" Name "ActivePerl Version Check ${C_VERSION}" ; Specify EXE filename and icon for the 'installer' OutFile "${C_OUTFILE}" Icon "..\POPFileIcon\popfile.ico" ; Selecting 'silent' mode makes the installer behave like a command-line utility SilentInstall silent ;-------------------------------------------------------------------------- ; Windows Vista expects to find a manifest specifying the execution level ;-------------------------------------------------------------------------- RequestExecutionLevel user #-------------------------------------------------------------------------- ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ; representing the following values: Major.Minor.Release.Build VIProductVersion "${C_VERSION}.0" !define /date C_BUILD_YEAR "%Y" VIAddVersionKey "ProductName" "ActivePerl Version Check Utility" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of \ John Graham-Cumming" VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Used when compiling the POPFile installer" VIAddVersionKey "FileVersion" "${C_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" !endif VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #---------------------------------------------------------------------------------------- Section default !define C_DEF_AP_FOLDER "!define C_AP_FOLDER " !define C_DEF_AP_MAJOR "!define C_AP_MAJOR " !define C_DEF_AP_MINOR "!define C_AP_MINOR " !define C_DEF_AP_REVSN "!define C_AP_REVISION " !define C_DEF_AP_BUILD "!define C_AP_BUILD " !define C_DEF_AP_VERSN "!define C_AP_VERSION " !define C_DEF_AP_STATUS "!define C_AP_STATUS " !define C_DEF_AP_ERRMSG "!define C_AP_ERRORMSG " !define L_PERL_FOLDER $R9 ; Location of ActivePerl installation (passed via the command-line) !define L_RESULTS_FILE $R8 ; File handle used to access the output file (ap-version.nsh) StrCpy ${L_PERL_FOLDER} "" ; Get the location of the ActivePerl installation we are to check Call GetParameters Pop ${L_PERL_FOLDER} StrCmp ${L_PERL_FOLDER} "" 0 look_for_Perl FileOpen ${L_RESULTS_FILE} "ap-version.nsh" w FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_STATUS} $\"failure$\"${MB_NL}${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_ERRMSG} $\"ActivePerl location not supplied$\"${MB_NL}" FileClose ${L_RESULTS_FILE} Goto exit look_for_Perl: IfFileExists "${L_PERL_FOLDER}\bin\*.*" look_for_DLL FileOpen ${L_RESULTS_FILE} "ap-version.nsh" w FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_STATUS} $\"failure$\"${MB_NL}${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_FOLDER} $\"${L_PERL_FOLDER}$\"${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_ERRMSG} $\"'${L_PERL_FOLDER}\bin' folder not found$\"${MB_NL}" FileClose ${L_RESULTS_FILE} Goto exit look_for_DLL: IfFileExists "${L_PERL_FOLDER}\bin\perl58.dll" check_Perl_version FileOpen ${L_RESULTS_FILE} "ap-version.nsh" w FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_STATUS} $\"failure$\"${MB_NL}${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_FOLDER} $\"${L_PERL_FOLDER}$\"${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_ERRMSG} $\"perl58.dll not found in '${L_PERL_FOLDER}\bin' folder$\"${MB_NL}" FileClose ${L_RESULTS_FILE} Goto exit check_Perl_version: !define L_MAJOR $R1 !define L_MINOR $R2 !define L_REVSN $R3 !define L_BUILD $R4 GetDllVersion "${L_PERL_FOLDER}\bin\perl58.dll" ${L_MINOR} ${L_BUILD} IntOp ${L_MAJOR} ${L_MINOR} / 0x00010000 IntOp ${L_MINOR} ${L_MINOR} & 0x0000FFFF IntOp ${L_REVSN} ${L_BUILD} / 0x00010000 IntOp ${L_BUILD} ${L_BUILD} & 0x0000FFFF FileOpen ${L_RESULTS_FILE} "ap-version.nsh" w FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_STATUS} $\"success$\"${MB_NL}${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_FOLDER} $\"${L_PERL_FOLDER}$\"${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_MAJOR} $\"${L_MAJOR}$\"${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_MINOR} $\"${L_MINOR}$\"${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_REVSN} $\"${L_REVSN}$\"${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_VERSN} $\"${L_MAJOR}.${L_MINOR}.${L_REVSN}$\"${MB_NL}" FileWrite ${L_RESULTS_FILE} "${C_DEF_AP_BUILD} $\"${L_BUILD}$\"${MB_NL}" FileClose ${L_RESULTS_FILE} exit: SectionEnd #-------------------------------------------------------------------------- # Function: GetParameters # # Returns the command-line parameters (if any) supplied when the installer was started # # Inputs: # none # Outputs: # (top of stack) - all of the parameters supplied on the command line (may be "") # # Usage: # Call GetParameters # Pop $R0 # # (if 'setup.exe /SSL' was used to start the installer, $R0 will hold '/SSL') # #-------------------------------------------------------------------------- Function GetParameters Push $R0 Push $R1 Push $R2 Push $R3 StrCpy $R2 1 StrLen $R3 $CMDLINE ; Check for quote or space StrCpy $R0 $CMDLINE $R2 StrCmp $R0 '"' 0 +3 StrCpy $R1 '"' Goto loop StrCpy $R1 " " loop: IntOp $R2 $R2 + 1 StrCpy $R0 $CMDLINE 1 $R2 StrCmp $R0 $R1 get StrCmp $R2 $R3 get Goto loop get: IntOp $R2 $R2 + 1 StrCpy $R0 $CMDLINE 1 $R2 StrCmp $R0 " " get StrCpy $R0 $CMDLINE "" $R2 Pop $R3 Pop $R2 Pop $R1 Exch $R0 FunctionEnd ;-------------------------------------- ; end-of-file ;-------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-05-12 17:16:05
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24148 Modified Files: Tag: b0_22_2 installer.nsi Log Message: At compile-time check that the ActivePerl installation specified in installer.nsi is suitable (the build machine has several different versions of Perl installed!). A compiler error is raised if the check finds an unsuitable version in the specified location. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.9 retrieving revision 1.242.4.10 diff -C2 -d -r1.242.4.9 -r1.242.4.10 *** installer.nsi 8 Feb 2007 19:21:14 -0000 1.242.4.9 --- installer.nsi 12 May 2007 17:16:05 -0000 1.242.4.10 *************** *** 236,242 **** --- 236,290 ---- ;---------------------------------------------------------------------- ; Root directory for the Perl files (used when building the installer) + ; and the version number and build number required for the minimal Perl ;---------------------------------------------------------------------- !define C_PERL_DIR "C:\Perl" + !define C_PERL_VERSION "5.8.8" + !define C_PERL_BUILD "820" + + ;---------------------------------------------------------------------- + ; Recently there have been some significant changes to the structure and + ; behaviour of ActivePerl. These changes have affected the way in which + ; the minimal Perl is assembled therefore a new compile-time check has + ; been introduced to ensure that a suitable ActivePerl installation is + ; available for use in preparing the minimal Perl used by POPFile. + ;---------------------------------------------------------------------- + + !system 'if exist ".\ap-version.nsh" del ".\ap-version.nsh"' + !system '".\toolkit\ap-vcheck.exe" ${C_PERL_DIR}' + !include /NONFATAL ".\ap-version.nsh" + + ; The above '!system' call can fail on older (slower/Win9x?) systems so if the expected + ; output file is not found we try a safer version of the '!system' call. If this call + ; also fails then the NSIS compiler will stop with a fatal error. + + !ifndef C_AP_STATUS + !system 'start /w toolkit\ap-vcheck.exe ${C_PERL_DIR}' + !include ".\ap-version.nsh" + !endif + + ; Delete the "include" file after it has been read + + !delfile ".\ap-version.nsh" + + ; Now we can check that the location defined in ${C_PERL_DIR} is suitable + + !if "${C_AP_STATUS}" == "failure" + !error "${MB_NL}${MB_NL}Fatal error:${MB_NL}\ + ${MB_NL} ActivePerl version check failed${MB_NL}\ + ${MB_NL} (${C_AP_ERRORMSG})${MB_NL}" + !endif + + ; For this build of the installer we require an exact match for the ActivePerl version number _and_ build number + + !if "${C_AP_VERSION}.${C_AP_BUILD}" != "${C_PERL_VERSION}.${C_PERL_BUILD}" + !error "${MB_NL}${MB_NL}Fatal error:${MB_NL}\ + ${MB_NL} ActivePerl ${C_PERL_VERSION} Build ${C_PERL_BUILD} is required for this installer\ + ${MB_NL} but ActivePerl ${C_AP_VERSION} Build ${C_AP_BUILD} has been detected in the\ + ${MB_NL} $\"${C_AP_FOLDER}$\" folder${MB_NL}" + !endif + + !echo "${MB_NL}\ + ${MB_NL} ActivePerl version ${C_AP_VERSION} Build ${C_AP_BUILD} will be used to prepare the minimal Perl${MB_NL}${MB_NL}" ;---------------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-05-12 17:12:31
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23210 Modified Files: Tag: b0_22_2 installer-SecMinPerl-body.nsh Log Message: Add missing Perl component to the minimal Perl. Index: installer-SecMinPerl-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v retrieving revision 1.2.2.8 retrieving revision 1.2.2.9 diff -C2 -d -r1.2.2.8 -r1.2.2.9 *** installer-SecMinPerl-body.nsh 10 Feb 2007 12:21:40 -0000 1.2.2.8 --- installer-SecMinPerl-body.nsh 12 May 2007 17:12:30 -0000 1.2.2.9 *************** *** 117,120 **** --- 117,123 ---- File "${C_PERL_DIR}\lib\IO\Socket\*" + SetOutPath "$G_MPLIBDIR\List" + File "${C_PERL_DIR}\lib\List\Util.pm" + SetOutPath "$G_MPLIBDIR\MIME" File "${C_PERL_DIR}\lib\MIME\*" *************** *** 151,154 **** --- 154,160 ---- File "${C_PERL_DIR}\lib\auto\IO\*" + SetOutPath "$G_MPLIBDIR\auto\List\Util" + File "${C_PERL_DIR}\lib\auto\List\Util\*" + SetOutPath "$G_MPLIBDIR\auto\MIME\Base64" File "${C_PERL_DIR}\lib\auto\MIME\Base64\*" *************** *** 202,206 **** ; which includes the 3.x flavour of the DBD::SQLite module so we now default to using ; DBD::SQLite2 since POPFile 0.22.x is not compatible with SQLite 3.x. The 0.23.0 release ! ; of POPFile ia expected to use SQLite 3.x. ; If DBD::SQLite is currently installed, disable it (because we are installing --- 208,212 ---- ; which includes the 3.x flavour of the DBD::SQLite module so we now default to using ; DBD::SQLite2 since POPFile 0.22.x is not compatible with SQLite 3.x. The 0.23.0 release ! ; of POPFile is expected to use SQLite 3.x. ; If DBD::SQLite is currently installed, disable it (because we are installing |
|
From: Brian S. <xue...@us...> - 2007-05-05 12:30:24
|
Update of /cvsroot/popfile/windows/toolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18938 Removed Files: Tag: b0_22_2 pfi-manifest.nsi Log Message: Remove redundant code (it seems this was a misguided attempt to fix a problem which did not really exist) --- pfi-manifest.nsi DELETED --- |
|
From: Brian S. <xue...@us...> - 2007-05-05 12:28:09
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16988 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi MonitorCC.nsi msgcapture.nsi runpopfile.nsi runsqlite.nsi stop_popfile.nsi Log Message: Remove redundant code (it seems this was a misguided attempt to fix a problem which did not really exist) Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.6 retrieving revision 1.14.4.7 diff -C2 -d -r1.14.4.6 -r1.14.4.7 *** stop_popfile.nsi 8 Feb 2007 19:26:22 -0000 1.14.4.6 --- stop_popfile.nsi 5 May 2007 12:28:07 -0000 1.14.4.7 *************** *** 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" --- 123,127 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.5" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" *************** *** 143,153 **** 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 --- 143,146 ---- Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.6 retrieving revision 1.19.4.7 diff -C2 -d -r1.19.4.6 -r1.19.4.7 *** MonitorCC.nsi 8 Feb 2007 19:26:21 -0000 1.19.4.6 --- MonitorCC.nsi 5 May 2007 12:28:07 -0000 1.19.4.7 *************** *** 111,115 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.5" !define C_OUTFILE "monitorcc.exe" --- 111,115 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.6" !define C_OUTFILE "monitorcc.exe" *************** *** 125,135 **** 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 --- 125,128 ---- Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.7 retrieving revision 1.11.4.8 diff -C2 -d -r1.11.4.7 -r1.11.4.8 *** runpopfile.nsi 8 Feb 2007 19:26:21 -0000 1.11.4.7 --- runpopfile.nsi 5 May 2007 12:28:07 -0000 1.11.4.8 *************** *** 117,121 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.6" !define C_OUTFILE "runpopfile.exe" --- 117,121 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.7" !define C_OUTFILE "runpopfile.exe" *************** *** 142,152 **** 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 --- 142,145 ---- Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7.4.6 retrieving revision 1.7.4.7 diff -C2 -d -r1.7.4.6 -r1.7.4.7 *** msgcapture.nsi 8 Feb 2007 19:26:21 -0000 1.7.4.6 --- msgcapture.nsi 5 May 2007 12:28:07 -0000 1.7.4.7 *************** *** 115,119 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" !define C_OUTFILE "msgcapture.exe" --- 115,119 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.6" !define C_OUTFILE "msgcapture.exe" *************** *** 139,149 **** 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" --- 139,142 ---- Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.12 retrieving revision 1.6.2.13 diff -C2 -d -r1.6.2.12 -r1.6.2.13 *** adduser-Version.nsh 8 Feb 2007 19:26:21 -0000 1.6.2.12 --- adduser-Version.nsh 5 May 2007 12:28:07 -0000 1.6.2.13 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.8" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.9" #-------------------------------------------------------------------------- Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.6 retrieving revision 1.1.4.7 diff -C2 -d -r1.1.4.6 -r1.1.4.7 *** runsqlite.nsi 8 Feb 2007 19:26:22 -0000 1.1.4.6 --- runsqlite.nsi 5 May 2007 12:28:07 -0000 1.1.4.7 *************** *** 75,79 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 75,79 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" *************** *** 99,109 **** 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 --- 99,102 ---- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.13 retrieving revision 1.59.4.14 diff -C2 -d -r1.59.4.13 -r1.59.4.14 *** adduser.nsi 8 Feb 2007 19:26:21 -0000 1.59.4.13 --- adduser.nsi 5 May 2007 12:28:07 -0000 1.59.4.14 *************** *** 219,229 **** 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) --- 219,222 ---- |
|
From: Brian S. <xue...@us...> - 2007-05-05 12:28:08
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16988/test Modified Files: Tag: b0_22_2 pfidbstatus.nsi pfidiag.nsi Log Message: Remove redundant code (it seems this was a misguided attempt to fix a problem which did not really exist) Index: pfidbstatus.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -C2 -d -r1.3.2.6 -r1.3.2.7 *** pfidbstatus.nsi 8 Feb 2007 19:26:22 -0000 1.3.2.6 --- pfidbstatus.nsi 5 May 2007 12:28:07 -0000 1.3.2.7 *************** *** 157,161 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" --- 157,161 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" *************** *** 182,192 **** 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" --- 182,185 ---- Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8.4.6 retrieving revision 1.8.4.7 diff -C2 -d -r1.8.4.6 -r1.8.4.7 *** pfidiag.nsi 8 Feb 2007 19:26:22 -0000 1.8.4.6 --- pfidiag.nsi 5 May 2007 12:28:07 -0000 1.8.4.7 *************** *** 104,108 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.4" !define C_OUTFILE "pfidiag.exe" --- 104,108 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" !define C_OUTFILE "pfidiag.exe" *************** *** 126,136 **** 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" --- 126,129 ---- |
|
From: Brian S. <xue...@us...> - 2007-05-05 12:28:07
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16988/add-ons Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Remove redundant code (it seems this was a misguided attempt to fix a problem which did not really exist) Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.9 retrieving revision 1.3.4.10 diff -C2 -d -r1.3.4.9 -r1.3.4.10 *** addssl.nsi 8 Feb 2007 19:26:21 -0000 1.3.4.9 --- addssl.nsi 5 May 2007 12:28:07 -0000 1.3.4.10 *************** *** 265,269 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.8" ; Mention the wizard's version number in the window title --- 265,269 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.9" ; Mention the wizard's version number in the window title *************** *** 281,291 **** RequestExecutionLevel admin - !tempfile EXE_HDR - !packhdr "${EXE_HDR}" \ - '"..\toolkit\pfi-manifest.exe" \ - /FILE="${EXE_HDR}" \ - /NAME="POPFile.wizard" \ - /DESCRIPTION="Add SSL Support to POPFile"' - #-------------------------------------------------------------------------- # User Registers (Global) --- 281,284 ---- |
|
From: Brian S. <xue...@us...> - 2007-05-04 18:04:01
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14971 Added Files: Tag: b0_22_2 OnDemand-default.ini OnDemand.ico OnDemand.nsi Log Message: A small utility which provides an alternative to always starting POPFile when Windows starts. It starts POPFile (v0.21.0 or later) then after an optional delay (to give POPFile time to start up and be ready to accept commands from the email client) it starts the specified email client (Eudora, Outlook Express, Thunderbird, etc). The utility waits until the email client is shut down before it shuts down POPFile. --- NEW FILE: OnDemand.nsi --- #------------------------------------------------------------------------------------------- # # OnDemand.nsi --- An 'invisible' utility which starts POPFile, starts an email client, # waits for the email client to shutdown and then shuts down POPFile. # Provided as an alternative to having POPFile running all the time. # # If POPFile's database is very large it can take POPFile several seconds # to start up so an optional delay can be inserted between starting POPFile # and starting the email client (to avoid problems if the email client looks # for new mail before POPFile is ready to accept commands). # # Copyright (c) 2005-2007 John Graham-Cumming # # This file creates a utility for use with POPFile. # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #------------------------------------------------------------------------------------------- ; This version of the script has been tested with the "NSIS v2.22" compiler, ; released 27 November 2006. This particular compiler can be downloaded from ; http://prdownloads.sourceforge.net/nsis/nsis-2.22-setup.exe?download !define ${NSIS_VERSION}_found !ifndef v2.22_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ $\r$\n*** This script has only been tested using the NSIS v2.22 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ $\r$\n*** The resulting 'installer' program should be tested carefully!\ $\r$\n$\r$\n" !endif !undef ${NSIS_VERSION}_found #------------------------------------------------------------------------------------------- # Parameters are supplied via an INI file stored in the same folder as this utility: # # [Mail Client] # Executable=C:\Program Files\Outlook Express\msimn.exe # Parameters= # # [Settings] # StartupDelay=15 # StopPOPFile=yes # # Notes: # # (optional) identifies settings which can be left out of the INI file # # (1) 'Executable' is the full pathname of the email client program # # (2) (optional) 'Parameters' specifies any optional parameters to be passed # to the email client (e.g. Eudora can be told where to find its configuration data) # # (3) (optional) 'StartupDelay' specifies the delay (in seconds) between starting # POPFile and starting the email client. If this parameter is not supplied a # delay of zero is assumed. This value should only contain the digits 0 to 9. # # (4) (optional) 'StopPOPFile' can be either "yes" or "no". If this parameter is # missing POPFile will be shutdown when the email client exits. #------------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------- ; Select standard LZMA compression (to generate smallest EXE file) ;-------------------------------------------------------------------------- SetCompressor lzma ;-------------------------------------------------------------------------- ; Symbols used to avoid confusion over where the line breaks occur. ; ; ${IO_NL} is used for InstallOptions-style 'new line' sequences. ; ${MB_NL} is used for MessageBox-style 'new line' sequences. ; ; (these two constants do not follow the 'C_' naming convention described below) ;-------------------------------------------------------------------------- !define IO_NL "\r\n" !define MB_NL "$\r$\n" ;-------------------------------------------------------------------------- ; POPFile constants have been given names beginning with 'C_' (eg C_README) ;-------------------------------------------------------------------------- ; This build is for use with POPFile 0.21.0 (or later) installer-created installations !define C_PFI_PRODUCT "POPFile" ;-------------------------------------------------------------------------- ; The URL used to access the POPFile User Interface (UI) ;-------------------------------------------------------------------------- !define C_UI_URL "127.0.0.1" ;-------------------------------------------------------------------------- ; Specify filename for the EXE and INI files ;-------------------------------------------------------------------------- !define C_OUTFILE "OnDemand.exe" !define C_INIFILE "OnDemand.ini" ;-------------------------------------------------------------------------- Name "Run POPFile & email client on demand" Caption "$(^Name)" ; used in the title bar of any message boxes the utility displays OutFile ${C_OUTFILE} !define C_VERSION "0.0.5" ; Specify the icon file for the utility Icon "OnDemand.ico" ; Selecting 'silent' install makes 'installer' behave like a command-line utility SilentInstall silent ;-------------------------------------------------------------------------- ; Windows Vista expects to find a manifest specifying the execution level ;-------------------------------------------------------------------------- RequestExecutionLevel user #-------------------------------------------------------------------------- ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ; representing the following values: Major.Minor.Release.Build VIProductVersion "${C_VERSION}.0" !define /date C_BUILD_YEAR "%Y" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Run POPFile and Mail Client together" VIAddVersionKey "FileVersion" "${C_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" VIAddVersionKey "Product Description" "A simple utility which starts POPFile, \ runs the Mail Client, waits for it to exit and \ then silently shuts POPFile down." VIAddVersionKey "Build" "Compatible with POPFile 0.21.0 (or later)" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" !endif VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #---------------------------------------------------------------------------------------- ;-------------------------------------- ; Section: default ;-------------------------------------- Section default Call INI_File_Check Call Start_POPFILE Call Start_MailClient Call Shutdown_POPFile SectionEnd ;-------------------------------------- ; Function: INI_File_Check ;-------------------------------------- Function INI_File_Check IfFileExists "$EXEDIR\${C_INIFILE}" exit MessageBox MB_YESNO|MB_ICONEXCLAMATION "The INI file for this utility is missing!\ ${MB_NL}${MB_NL}\ Create the INI file now ?\ ${MB_NL}${MB_NL}\ ($EXEDIR\${C_INIFILE})" IDYES create_INI_file Abort create_INI_file: SetOutPath $EXEDIR File "/oname=${C_INIFILE}" "OnDemand-default.ini" Call Edit_INI_File exit: FunctionEnd ;-------------------------------------- ; Function: Start_POPFile ;-------------------------------------- Function Start_POPFile !define L_CLIENT_EXEPATH $R9 ; fullpathname of the email client program !define L_RESULT $R8 Push ${L_CLIENT_EXEPATH} Push ${L_RESULT} read_client_path: ReadINIStr ${L_CLIENT_EXEPATH} "$EXEDIR\${C_INIFILE}" "MailClient" "Executable" StrCmp ${L_CLIENT_EXEPATH} "" 0 check_client_exists MessageBox MB_YESNO|MB_ICONQUESTION "No mail client defined in the INI file\ ${MB_NL}${MB_NL}\ Edit the INI file now ?\ ${MB_NL}${MB_NL}\ ($EXEDIR\${C_INIFILE})" IDNO error_exit IDYES edit_client check_client_exists: IfFileExists ${L_CLIENT_EXEPATH} start_popfile MessageBox MB_YESNO|MB_ICONEXCLAMATION "Mail client not found! (${L_CLIENT_EXEPATH})\ ${MB_NL}${MB_NL}\ Edit the INI file now ?\ ${MB_NL}${MB_NL}\ ($EXEDIR\${C_INIFILE})" IDNO error_exit edit_client: Call Edit_INI_File Goto read_client_path start_popfile: ReadRegStr $INSTDIR HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" StrCmp $INSTDIR "" 0 got_path ReadRegStr $INSTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" StrCmp $INSTDIR "" 0 got_path MessageBox MB_OK|MB_ICONEXCLAMATION "Error: Unable to find compatible version of POPFile" Goto error_exit got_path: IfFileExists "$INSTDIR\runpopfile.exe" check_if_POPFile_running MessageBox MB_OK|MB_ICONEXCLAMATION "Error: Unable to find the 'runpopfile' utility" Goto error_exit check_if_POPFile_running: Push "$INSTDIR\popfileb.exe" Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit Push "$INSTDIR\popfilef.exe" Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit Push "$INSTDIR\popfileib.exe" Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit Push "$INSTDIR\popfileif.exe" Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit Push "$INSTDIR\perl.exe" Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit Push "$INSTDIR\wperl.exe" Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit ; Assume POPFile is not running, so start it up now ClearErrors SetOutPath "$INSTDIR" ; added this to get the dummy EXE files to work Exec '"$INSTDIR\runpopfile.exe"' IfErrors 0 exit MessageBox MB_OK|MB_ICONSTOP "Error trying to start POPFile" error_exit: Abort exit: Pop ${L_RESULT} Pop ${L_CLIENT_EXEPATH} !undef L_CLIENT_EXEPATH !undef L_RESULT FunctionEnd ;-------------------------------------- ; Function: Start_MailClient ;-------------------------------------- Function Start_MailClient !define C_MAX_DELAY 300 ; delay is in seconds so '300' represents 5 minutes !define L_CLIENT_EXEPATH $R9 ; fullpathname of the email client program !define L_CLIENT_PARAMS $R8 ; parameters (if any) to be supplied to email client !define L_RESULT $R7 !define L_STARTUP_DELAY $R6 ; delay (in seconds) before we start the email client ; (valid values are 0 to ${C_MAX_DELAY} inclusive) Push ${L_CLIENT_EXEPATH} Push ${L_CLIENT_PARAMS} Push ${L_RESULT} Push ${L_STARTUP_DELAY} ReadINIStr ${L_STARTUP_DELAY} "$EXEDIR\${C_INIFILE}" "Settings" "StartupDelay" StrCmp ${L_STARTUP_DELAY} "" start_client Push ${L_STARTUP_DELAY} Call StrCheckDecimal Pop ${L_RESULT} StrCmp ${L_RESULT} "" invalid_delay_supplied IntCmp ${L_STARTUP_DELAY} 0 start_client invalid_delay_supplied IntCmp ${L_STARTUP_DELAY} ${C_MAX_DELAY} use_delay use_delay MessageBox MB_OK|MB_ICONINFORMATION "Maximum StartupDelay is ${C_MAX_DELAY} seconds\ ${MB_NL}${MB_NL}\ The INI file has 'StartupDelay=${L_STARTUP_DELAY}'\ ${MB_NL}${MB_NL}\ (see $EXEDIR\${C_INIFILE})" Goto start_client invalid_delay_supplied: MessageBox MB_OK|MB_ICONINFORMATION "StartupDelay range is 0 to ${C_MAX_DELAY} (in seconds)\ ${MB_NL}${MB_NL}\ The INI file has 'StartupDelay=${L_STARTUP_DELAY}'\ ${MB_NL}${MB_NL}\ (see $EXEDIR\${C_INIFILE})" Goto start_client use_delay: Sleep "${L_STARTUP_DELAY}000" start_client: ReadINIStr ${L_CLIENT_EXEPATH} "$EXEDIR\${C_INIFILE}" "MailClient" "Executable" ReadINIStr ${L_CLIENT_PARAMS} "$EXEDIR\${C_INIFILE}" "MailClient" "Parameters" StrCmp ${L_CLIENT_EXEPATH} "" 0 check_client MessageBox MB_OK|MB_ICONEXCLAMATION "No mail client defined in $EXEDIR\${C_INIFILE}" Goto done check_client: IfFileExists ${L_CLIENT_EXEPATH} run_client MessageBox MB_OK|MB_ICONEXCLAMATION "Mail client not found! (${L_CLIENT_EXEPATH})\ ${MB_NL}${MB_NL}\ (Check the settings in $EXEDIR\${C_INIFILE})" Goto done run_client: ExecWait '"${L_CLIENT_EXEPATH}" "${L_CLIENT_PARAMS}"' done: Pop ${L_STARTUP_DELAY} Pop ${L_RESULT} Pop ${L_CLIENT_PARAMS} Pop ${L_CLIENT_EXEPATH} !undef L_CLIENT_EXEPATH !undef L_CLIENT_PARAMS !undef L_RESULT !undef L_STARTUP_DELAY FunctionEnd ;-------------------------------------- ; Function: Shutdown_POPFile ;-------------------------------------- Function Shutdown_POPFile !define L_CFG $R9 ; file handle !define L_EXE $R8 ; name of EXE file to be monitored !define L_LINE $R7 ; data read from popfile.cfg !define L_NEW_GUI $R6 ; POPFile UI port number (extracted from popfile.cfg) !define L_PARAM $R5 ; current popfile.cfg parameter !define L_RESULT $R4 !define L_STOP_PF $R3 ; StopPOPFile setting extracted from the utility's INI file !define L_TEXTEND $R2 ; used to ensure correct handling of lines longer than 1023 chars Push ${L_CFG} Push ${L_EXE} Push ${L_LINE} Push ${L_NEW_GUI} Push ${L_PARAM} Push ${L_RESULT} Push ${L_STOP_PF} Push ${L_TEXTEND} ReadINIStr ${L_STOP_PF} "$EXEDIR\${C_INIFILE}" "Settings" "StopPOPFile" StrCmp ${L_STOP_PF} "" stop_popfile StrCmp ${L_STOP_PF} "yes" stop_popfile StrCmp ${L_STOP_PF} "no" exit MessageBox MB_OK|MB_ICONINFORMATION "The 'StopPOPfile' setting is invalid\ ${MB_NL}${MB_NL}\ The INI file has 'StopPOPFile=${L_STOP_PF}'\ ${MB_NL}${MB_NL}\ (see $EXEDIR\${C_INIFILE})\ ${MB_NL}${MB_NL}\ Default setting (yes) will be assumed" stop_popfile: ; Attempt to discover which POPFile UI port is used by the current user, ; so we can shutdown POPFile silently without opening a browser window. ReadRegStr ${L_CFG} HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UserDir_LFN" StrCmp ${L_CFG} "" try_root_dir IfFileExists "${L_CFG}\popfile.cfg" check_cfg_file try_root_dir: IfFileExists "$INSTDIR\popfile.cfg" 0 manual_shutdown StrCpy ${L_CFG} "$INSTDIR" check_cfg_file: StrCpy ${L_NEW_GUI} "" ; See if we can get the current gui port from an existing configuration. ; There may be more than one entry for this port in the file - use the last one found FileOpen ${L_CFG} "${L_CFG}\popfile.cfg" r found_eol: StrCpy ${L_TEXTEND} "<eol>" loop: FileRead ${L_CFG} ${L_LINE} StrCmp ${L_LINE} "" done StrCmp ${L_TEXTEND} "<eol>" 0 check_eol StrCmp ${L_LINE} "$\n" loop StrCpy ${L_PARAM} ${L_LINE} 10 StrCmp ${L_PARAM} "html_port " 0 check_eol StrCpy ${L_NEW_GUI} ${L_LINE} 5 10 ; Now read file until we get to end of the current line ; (i.e. until we find text ending in <CR><LF>, <CR> or <LF>) check_eol: StrCpy ${L_TEXTEND} ${L_LINE} 1 -1 StrCmp ${L_TEXTEND} "$\n" found_eol StrCmp ${L_TEXTEND} "$\r" found_eol loop done: FileClose ${L_CFG} Push ${L_NEW_GUI} Call TrimNewlines Pop ${L_NEW_GUI} StrCmp ${L_NEW_GUI} "" manual_shutdown Push ${L_NEW_GUI} Call ShutdownSilently Pop ${L_RESULT} StrCmp ${L_RESULT} "success" check_exe StrCmp ${L_RESULT} "password?" manual_shutdown check_exe: Push ${L_EXE} Call WaitUntilExeUnlocked Push ${L_EXE} Call CheckIfExeLocked Pop ${L_EXE} StrCmp ${L_EXE} "" exit manual_shutdown: MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to shutdown POPFile automatically" exit: Pop ${L_TEXTEND} Pop ${L_STOP_PF} Pop ${L_RESULT} Pop ${L_PARAM} Pop ${L_NEW_GUI} Pop ${L_LINE} Pop ${L_EXE} Pop ${L_CFG} !undef L_CFG !undef L_EXE !undef L_LINE !undef L_NEW_GUI !undef L_PARAM !undef L_RESULT !undef L_STOP_PF !undef L_TEXTEND FunctionEnd ;-------------------------------------- ; Function: Edit_INI_File ;-------------------------------------- Function Edit_INI_File !define L_NOTEPAD $R9 Push ${L_NOTEPAD} SearchPath ${L_NOTEPAD} notepad.exe StrCmp ${L_NOTEPAD} "" use_file_association ExecWait 'notepad.exe "$EXEDIR\${C_INIFILE}"' GoTo exit use_file_association: ExecShell "open" "$EXEDIR\${C_INIFILE}" exit: Pop ${L_NOTEPAD} !undef L_NOTEPAD FunctionEnd #-------------------------------------------------------------------------- # General Purpose Function: CheckIfExeLocked #-------------------------------------------------------------------------- # # This function checks if a particular executable file (an EXE file) is being used. # If the specified EXE file is no longer in use, this function returns an empty string # (otherwise it returns the input parameter unchanged). # # Inputs: # (top of stack) - the full path of the EXE file to be checked # # Outputs: # (top of stack) - if file is no longer in use, an empty string ("") is returned # otherwise the input string is returned # # Usage: # # Push "$INSTDIR\wperl.exe" # Call CheckIfExeLocked # Pop $R0 # # (if the file is no longer in use, $R0 will be "") # (if the file is still being used, $R0 will be "$INSTDIR\wperl.exe") #-------------------------------------------------------------------------- Function CheckIfExeLocked !define L_EXE $R9 ; full path to the EXE file which is to be monitored !define L_FILE_HANDLE $R8 Exch ${L_EXE} Push ${L_FILE_HANDLE} IfFileExists "${L_EXE}" 0 unlocked_exit SetFileAttributes "${L_EXE}" NORMAL ClearErrors FileOpen ${L_FILE_HANDLE} "${L_EXE}" a FileClose ${L_FILE_HANDLE} IfErrors exit unlocked_exit: StrCpy ${L_EXE} "" exit: Pop ${L_FILE_HANDLE} Exch ${L_EXE} !undef L_EXE !undef L_FILE_HANDLE FunctionEnd #-------------------------------------------------------------------------- # General Purpose Function: WaitUntilExeUnlocked #-------------------------------------------------------------------------- # # This function waits until a particular executable file (an EXE file) is no longer in use. # # It may take a little while for POPFile to shutdown so this function waits in a loop until # the specified EXE file is no longer in use. A timeout is used to avoid an infinite loop. # # Inputs: # (top of stack) - the full path of the EXE file to be checked # # Outputs: # (none) # # Usage: # # Push "$INSTDIR\wperl.exe" # Call WaitUntilExeUnlocked # #-------------------------------------------------------------------------- Function WaitUntilExeUnlocked !define L_EXE $R9 ; full path to the EXE file which is to be monitored !define L_FILE_HANDLE $R8 !define L_TIMEOUT $R7 ; used to avoid an infinite loop ;----------------------------------------------------------- ; Timeout loop counter start value (counts down to 0) !ifndef C_SHUTDOWN_LIMIT !define C_SHUTDOWN_LIMIT 20 !endif ; Delay (in milliseconds) used inside the timeout loop !ifndef C_SHUTDOWN_DELAY !define C_SHUTDOWN_DELAY 1000 !endif ;----------------------------------------------------------- Exch ${L_EXE} Push ${L_FILE_HANDLE} Push ${L_TIMEOUT} IfFileExists "${L_EXE}" 0 exit_now SetFileAttributes "${L_EXE}" NORMAL StrCpy ${L_TIMEOUT} ${C_SHUTDOWN_LIMIT} check_if_unlocked: Sleep ${C_SHUTDOWN_DELAY} ClearErrors FileOpen ${L_FILE_HANDLE} "${L_EXE}" a FileClose ${L_FILE_HANDLE} IfErrors 0 exit_now IntOp ${L_TIMEOUT} ${L_TIMEOUT} - 1 IntCmp ${L_TIMEOUT} 0 exit_now exit_now check_if_unlocked exit_now: Pop ${L_TIMEOUT} Pop ${L_FILE_HANDLE} Pop ${L_EXE} !undef L_EXE !undef L_FILE_HANDLE !undef L_TIMEOUT FunctionEnd #-------------------------------------------------------------------------- # General Purpose Function: ShutdownSilently #-------------------------------------------------------------------------- # # This function attempts to shutdown POPFile using the User Interface (UI) invisibly # (i.e. no browser window is used). # # We use NSISdl to shutdown POPFile by "downloading" the POPFile Shutdown page. Normally one # successful download attempt is enough to shutdown POPFile and the page which NSISdl receives # will be the "POPFile has shut down" one. However if the UI is password protected then NSISdl # will receive a page requesting the UI password instead of the "POPFile has shut down" page. # # To avoid the need to parse the HTML page downloaded by NSISdl, we make a second attempt to # download the POPFile Shutdown page. If POPFile has shutdown then this second call will fail # or it will download an empty page (i.e. one which is 0 bytes long). If the second NSISdl call # downloads a page which is not empty then we assume it is a page requesting the UI password. # # To help debug problems, the first HTML file is _not_ overwritten with the second HTML file. # # Inputs: # (top of stack) - UI port to be used when issuing the shutdown request # # Outputs: # (top of stack) - string containing one of the following result codes: # # "success" (meaning UI shutdown request appeared to work) # # "failure" (meaning UI shutdown request failed) # # "password?" (meaning failure: UI may be password protected) # # "badport" (meaning failure: invalid UI port supplied) # # Usage: # # Push "8080" # Call ShutdownSilently # Pop $R0 # # (if $R0 at this point is "password?" then POPFile is still running) # #-------------------------------------------------------------------------- Function ShutdownSilently ;-------------------------------------------------------------------------- ; Override the default timeout for NSISdl requests (specifies timeout in milliseconds) !define C_SVU_DLTIMEOUT /TIMEOUT=10000 ; Delay between the two shutdown requests (in milliseconds) !define C_SVU_DLGAP 2000 ;-------------------------------------------------------------------------- !define L_RESULT $R9 !define L_UIPORT $R8 Exch ${L_UIPORT} Push ${L_RESULT} Exch StrCmp ${L_UIPORT} "" badport Push ${L_UIPORT} Call StrCheckDecimal Pop ${L_UIPORT} StrCmp ${L_UIPORT} "" badport IntCmp ${L_UIPORT} 1 port_ok badport IntCmp ${L_UIPORT} 65535 port_ok port_ok badport: StrCpy ${L_RESULT} "badport" Goto exit port_ok: NSISdl::download_quiet \ ${C_SVU_DLTIMEOUT} http://${C_UI_URL}:${L_UIPORT}/shutdown "$PLUGINSDIR\shutdown_1.htm" Pop ${L_RESULT} StrCmp ${L_RESULT} "success" try_again StrCpy ${L_RESULT} "failure" Goto exit try_again: Sleep ${C_SVU_DLGAP} NSISdl::download_quiet \ ${C_SVU_DLTIMEOUT} http://${C_UI_URL}:${L_UIPORT}/shutdown "$PLUGINSDIR\shutdown_2.htm" Pop ${L_RESULT} StrCmp ${L_RESULT} "success" 0 shutdown_ok Push "$PLUGINSDIR\shutdown_2.htm" Call GetFileSize Pop ${L_RESULT} StrCmp ${L_RESULT} 0 shutdown_ok StrCpy ${L_RESULT} "password?" Goto exit shutdown_ok: StrCpy ${L_RESULT} "success" exit: Pop ${L_UIPORT} Exch ${L_RESULT} !undef C_SVU_DLTIMEOUT !undef C_SVU_DLGAP !undef L_RESULT !undef L_UIPORT FunctionEnd #-------------------------------------------------------------------------- # General Purpose Function: StrCheckDecimal #-------------------------------------------------------------------------- # # This function checks if a given string contains only the digits 0 to 9 # (if the string contains any invalid characters, "" is returned) # # Inputs: # (top of stack) - string which may contain a decimal number # # Outputs: # (top of stack) - the input string (if valid) or "" (if invalid) # # Usage: # # Push "12345" # Call StrCheckDecimal # Pop $R0 # ($R0 at this point is "12345") # #-------------------------------------------------------------------------- Function StrCheckDecimal !define DECIMAL_DIGIT "0123456789" ; accept only these digits !define BAD_OFFSET 10 ; length of DECIMAL_DIGIT string Exch $0 ; The input string Push $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) Push $2 ; A character from the input string Push $3 ; The offset to a character in the "validity check" string Push $4 ; A character from the "validity check" string Push $5 ; Holds the current "validity check" string StrCpy $1 "" next_input_char: StrCpy $2 $0 1 ; Get the next character from the input string StrCmp $2 "" done StrCpy $5 ${DECIMAL_DIGIT}$2 ; Add it to end of "validity check" to guarantee a match StrCpy $0 $0 "" 1 StrCpy $3 -1 next_valid_char: IntOp $3 $3 + 1 StrCpy $4 $5 1 $3 ; Extract next "valid" char (from "validity check" string) StrCmp $2 $4 0 next_valid_char IntCmp $3 ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char invalid: StrCpy $1 "" done: StrCpy $0 $1 ; Result is either a string of decimal digits or "" Pop $5 Pop $4 Pop $3 Pop $2 Pop $1 Exch $0 ; place result on top of the stack !undef DECIMAL_DIGIT !undef BAD_OFFSET FunctionEnd #-------------------------------------------------------------------------- # General Purpose Function: GetFileSize #-------------------------------------------------------------------------- # # This function gets the size (in bytes) of a particular file. # # If the specified file is not found, the function returns -1 # # Inputs: # (top of stack) - filename of file to be checked # Outputs: # (top of stack) - length of the file (in bytes) # or '-1' if file not found # or '-2' if error occurred # # Usage: # # Push "corpus\spam\table" # Call GetFileSize # Pop $R0 # # ($R0 now holds the size (in bytes) of the 'spam' bucket's 'table' file) # #-------------------------------------------------------------------------- Function GetFileSize !define L_FILENAME $R9 !define L_RESULT $R8 Exch ${L_FILENAME} Push ${L_RESULT} Exch IfFileExists ${L_FILENAME} find_size StrCpy ${L_RESULT} "-1" Goto exit find_size: ClearErrors FileOpen ${L_RESULT} ${L_FILENAME} r FileSeek ${L_RESULT} 0 END ${L_FILENAME} FileClose ${L_RESULT} IfErrors 0 return_size StrCpy ${L_RESULT} "-2" Goto exit return_size: StrCpy ${L_RESULT} ${L_FILENAME} exit: Pop ${L_FILENAME} Exch ${L_RESULT} !undef L_FILENAME !undef L_RESULT FunctionEnd #-------------------------------------------------------------------------- # General Purpose Function: TrimNewlines #-------------------------------------------------------------------------- # # This function trims newlines from lines of text. # # Inputs: # (top of stack) - string which may end with one or more newlines # # Outputs: # (top of stack) - the input string with the trailing newlines (if any) removed # # Usage: # # Push "whatever$\r$\n" # Call TrimNewlines # Pop $R0 # ($R0 at this point is "whatever") # #-------------------------------------------------------------------------- Function TrimNewlines Exch $R0 Push $R1 Push $R2 StrCpy $R1 0 loop: IntOp $R1 $R1 - 1 StrCpy $R2 $R0 1 $R1 StrCmp $R2 "$\r" loop StrCmp $R2 "$\n" loop IntOp $R1 $R1 + 1 IntCmp $R1 0 no_trim_needed StrCpy $R0 $R0 $R1 no_trim_needed: Pop $R2 Pop $R1 Exch $R0 FunctionEnd #-------------------------------------------------------------------------- # End of OnDemand.nsi #-------------------------------------------------------------------------- --- NEW FILE: OnDemand-default.ini --- ;--------------------------------------------------------------- ; INI file for the 'OnDemand' utility which starts POPFile and ; a mail client then stops POPFile when the mail client stops. ;--------------------------------------------------------------- ; Format: ; ; The [MailClient] section defines the mail client to be used ; ; 'Executable' - full pathname of the email client program ; ; 'Parameters' - optional parameters supplied to email client ; ; The [Settings] section defines settings for the utility ; ; 'StartupDelay' - delay (in seconds) to be used between starting ; POPFile and starting the client. When POPFile ; is used with a large corpus/database this setting ; can be used to ensure that POPFile can respond if ; the email client immediately checks for new mail. ; Default setting: StartupDelay=0 ; (maximum delay is 300 seconds, minimum is 0) ; ; 'StopPOPFile' - Normally this utility will shutdown POPFile when ; the email client exits. To leave POPFile running, ; use StopPOPFile=no ;--------------------------------------------------------------- ; Example: Start POPFile, wait for 5 seconds, start Outlook Express, ; wait for Outlook Express to stop then shutdown POPFile. ; ; [MailClient] ; Executable=C:\Program Files\Outlook Express\msimn.exe ; Parameters= ; ; [Settings] ; StartupDelay=5 ; StopPOPFile=yes ;--------------------------------------------------------------- [MailClient] Executable= Parameters= [Settings] StartupDelay= StopPOPFile= --- NEW FILE: OnDemand.ico --- (This appears to be a binary file; contents omitted.) |
|
From: Brian S. <xue...@us...> - 2007-02-10 22:56:23
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11563 Modified Files: Tag: b0_22_2 HTML.pm Log Message: Change the MIME type used for the download of a single message file to force the browser to display the "Save as" menu (instead of simply displaying the message in the browser) Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.311.4.9 retrieving revision 1.311.4.10 diff -C2 -d -r1.311.4.9 -r1.311.4.10 *** HTML.pm 17 Jan 2007 03:16:24 -0000 1.311.4.9 --- HTML.pm 10 Feb 2007 22:56:18 -0000 1.311.4.10 *************** *** 2576,2580 **** if ( defined( $self->{form_}{text} ) ) { ! $self->http_file_( $client, $self->{history__}->get_slot_file( $self->{form_}{view} ), 'text/plain' ); return 1; } --- 2576,2580 ---- if ( defined( $self->{form_}{text} ) ) { ! $self->http_file_( $client, $self->{history__}->get_slot_file( $self->{form_}{view} ), 'application/save-as' ); return 1; } |
|
From: Brian S. <xue...@us...> - 2007-02-10 14:29:28
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14147 Modified Files: Tag: b0_22_2 installer-Uninstall.nsh Log Message: Updated to cope with the latest changes to the minimal Perl. Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -C2 -d -r1.4.2.5 -r1.4.2.6 *** installer-Uninstall.nsh 6 Feb 2006 16:52:03 -0000 1.4.2.5 --- installer-Uninstall.nsh 10 Feb 2007 14:29:22 -0000 1.4.2.6 *************** *** 4,8 **** # NSIS 'installer.nsi' script used to create the POPFile installer. # ! # Copyright (c) 2005-2006 John Graham-Cumming # # This file is part of POPFile --- 4,8 ---- # NSIS 'installer.nsi' script used to create the POPFile installer. # ! # Copyright (c) 2005-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 688,691 **** --- 688,692 ---- RMDir /r "$G_MPLIBDIR\Math" RMDir /r "$G_MPLIBDIR\MIME" + RMDir /r "$G_MPLIBDIR\Scalar" RMDir /r "$G_MPLIBDIR\String" RMDir /r "$G_MPLIBDIR\Sys" *************** *** 693,700 **** RMDir /r "$G_MPLIBDIR\Time" RMDir /r "$G_MPLIBDIR\warnings" - IfFileExists "$G_MPLIBDIR\Win32\*.*" 0 skip_Win32 RMDir /r "$G_MPLIBDIR\Win32" - - skip_Win32: Delete "$G_MPLIBDIR\*.pm" Delete "$G_MPLIBDIR\*.pl" --- 694,698 ---- |
|
From: Brian S. <xue...@us...> - 2007-02-10 12:21:43
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30078 Modified Files: Tag: b0_22_2 installer-SecMinPerl-body.nsh installer-SecPOPFile-body.nsh Log Message: Enhance the minimal Perl to cope with the new dependencies found in an updated ActivePerl 5.8.8 Build 820 installation. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.7 retrieving revision 1.3.2.8 diff -C2 -d -r1.3.2.7 -r1.3.2.8 *** installer-SecPOPFile-body.nsh 31 Jan 2007 13:23:48 -0000 1.3.2.7 --- installer-SecPOPFile-body.nsh 10 Feb 2007 12:21:40 -0000 1.3.2.8 *************** *** 197,201 **** ; for the non-service EXE files plus renamed versions of the old 0.22.2 EXE files. These ; old ActivePerl 5.8.4 files can now be deleted as this installer contains versions based ! ; upon ActivePerl 5.8.7. Delete "$G_ROOTDIR\popfile-584.exe" --- 197,201 ---- ; for the non-service EXE files plus renamed versions of the old 0.22.2 EXE files. These ; old ActivePerl 5.8.4 files can now be deleted as this installer contains versions based ! ; upon a more recent version of ActivePerl (e.g. 0.22.5 is based upon 5.8.8 Build 820). Delete "$G_ROOTDIR\popfile-584.exe" Index: installer-SecMinPerl-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v retrieving revision 1.2.2.7 retrieving revision 1.2.2.8 diff -C2 -d -r1.2.2.7 -r1.2.2.8 *** installer-SecMinPerl-body.nsh 28 Jan 2007 21:22:04 -0000 1.2.2.7 --- installer-SecMinPerl-body.nsh 10 Feb 2007 12:21:40 -0000 1.2.2.8 *************** *** 49,53 **** SetDetailsPrint listonly ! ; Install the minimal Perl "core" based upon ActivePerl 5.8.8 Build 819 ; (extra Perl files are added by the "Kakasi", "SOCKS" & "XMLRPC" sections in installer.nsi) --- 49,53 ---- SetDetailsPrint listonly ! ; Install the minimal Perl "core" based upon ActivePerl 5.8.8 Build 820 ; (extra Perl files are added by the "Kakasi", "SOCKS" & "XMLRPC" sections in installer.nsi) *************** *** 79,82 **** --- 79,83 ---- File "${C_PERL_DIR}\lib\vars.pm" File "${C_PERL_DIR}\lib\warnings.pm" + File "${C_PERL_DIR}\lib\Win32.pm" File "${C_PERL_DIR}\lib\XSLoader.pm" *************** *** 119,122 **** --- 120,126 ---- File "${C_PERL_DIR}\lib\MIME\*" + SetOutPath "$G_MPLIBDIR\Scalar" + File "${C_PERL_DIR}\lib\Scalar\Util.pm" + SetOutPath "$G_MPLIBDIR\Sys" File "${C_PERL_DIR}\lib\Sys\*" *************** *** 126,130 **** SetOutPath "$G_MPLIBDIR\Time" ! File "${C_PERL_DIR}\lib\Time\Local.pm" File "${C_PERL_DIR}\site\lib\Time\Zone.pm" --- 130,134 ---- SetOutPath "$G_MPLIBDIR\Time" ! File "${C_PERL_DIR}\site\lib\Time\Local.pm" File "${C_PERL_DIR}\site\lib\Time\Zone.pm" *************** *** 161,164 **** --- 165,171 ---- File "${C_PERL_DIR}\lib\auto\Sys\Hostname\*" + SetOutPath "$G_MPLIBDIR\auto\Win32" + File "${C_PERL_DIR}\lib\auto\Win32\*" + ; Install Perl modules and library files for BerkeleyDB support. Although POPFile now uses ; SQLite (or another SQL database) to store the corpus and other essential data, it retains *************** *** 192,196 **** File "${C_PERL_DIR}\lib\auto\DBI\DBI.lib" ! ; Install SQLite2 support. The 0.22.5 release is based upon ActivePerl 5.8.8 Build 819 ; which includes the 3.x flavour of the DBD::SQLite module so we now default to using ; DBD::SQLite2 since POPFile 0.22.x is not compatible with SQLite 3.x. The 0.23.0 release --- 199,203 ---- File "${C_PERL_DIR}\lib\auto\DBI\DBI.lib" ! ; Install SQLite2 support. The 0.22.5 release is based upon ActivePerl 5.8.8 Build 820 ; which includes the 3.x flavour of the DBD::SQLite module so we now default to using ; DBD::SQLite2 since POPFile 0.22.x is not compatible with SQLite 3.x. The 0.23.0 release |
|
From: naoki i. <am...@us...> - 2007-02-09 14:27:56
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23121/languages Modified Files: Nihongo.msg Log Message: update translation Index: Nihongo.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Nihongo.msg,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Nihongo.msg 19 Jan 2007 14:53:14 -0000 1.14 --- Nihongo.msg 9 Feb 2007 14:27:51 -0000 1.15 *************** *** 374,378 **** Shutdown_Message POPFile ¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£ ! Help_Training POPFile ¤ò¤³¤ì¤«¤é»È¤¤»Ï¤á¤ë¾ì¹ç¡¢¤¢¤ëÄøÅ٤Υȥ졼¥Ë¥ó¥°¤¬É¬ÍפȤʤê¤Þ¤¹¡£¤½¤ì¤Ï¡¢POPFile ¤Ï¤É¤Î¥á¡¼¥ë¤¬É¬Íפʥ᡼¥ë¤Ç¤É¤Î¥á¡¼¥ë¤¬ÉÔÍפʥ᡼¥ë¤«¤Ë¤Ä¤¤¤Æ¤Ê¤Ë¤âÃΤé¤Ê¤¤¤«¤é¤Ç¤¹¡£¥È¥ì¡¼¥Ë¥ó¥°¤Ï¤½¤ì¤¾¤ì¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¹Ô¤¦É¬Íפ¬¤¢¤ê¡ÊºÇÄã¤Ç¤â£±¤Ä¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¡¢£±¤Ä°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤òºÆʬÎह¤ë¡Ë¡¢POPFile ¤¬Ê¬Îà¤ò´Ö°ã¤¨¤¿¥á¥Ã¥»¡¼¥¸¤òÀµ¤·¤¤¥Ð¥±¥Ä¤ËºÆʬÎह¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥È¥ì¡¼¥Ë¥ó¥°¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¤Þ¤¿¡¢POPFile ¤¬¹Ô¤Ã¤¿Ê¬Îà¤Ë¤¢¤ï¤»¤Æ¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤¹¤ë¤Ê¤É¡¢¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://popfile.sourceforge.net/cgi-bin/wiki.pl?JP_FrequentlyAskedQuestions/EmailSorting">POPFile ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ Help_Bucket_Setup POPFile ¤Ç¤Ï¡¢¤â¤È¤â¤È¤¢¤ë unclassified ¤È¤¤¤¦²¾ÁÛŪ¤Ê¥Ð¥±¥Ä°Ê³°¤Ë¡¢ºÇÄã¤Ç¤â£²¤Ä¤Î¥Ð¥±¥Ä¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£POPFile ¤ÎÆÃħ¤Ï¡¢¡Ê¥á¡¼¥ë¤ò spam ¤È¤½¤ì°Ê³°¤ËʬÎह¤ë¤È¤¤¤¦¤À¤±¤Ç¤Ï¤Ê¤¯¡Ë¤¤¤¯¤Ä¤Ç¤â¥Ð¥±¥Ä¤òºîÀ®¤·¡¢¤½¤ì¤é¤Ë¥á¡¼¥ë¤òʬÎह¤ë¤³¤È¤¬¤Ç¤¤ë¤³¤È¤Ç¤¹¡£´Êñ¤ÊÀßÄê¤Ç¤Ï¡¢"spam"¡¢"personal"¡¢"work" ¤È¤¤¤Ã¤¿¥Ð¥±¥Ä¤òÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ Help_No_More ¼¡²ó¤«¤éɽ¼¨¤·¤Ê¤¤¡£ --- 374,378 ---- Shutdown_Message POPFile ¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£ ! Help_Training POPFile ¤ò¤³¤ì¤«¤é»È¤¤»Ï¤á¤ë¾ì¹ç¡¢¤¢¤ëÄøÅ٤Υȥ졼¥Ë¥ó¥°¤¬É¬ÍפȤʤê¤Þ¤¹¡£¤½¤ì¤Ï¡¢POPFile ¤Ï¤É¤Î¥á¡¼¥ë¤¬É¬Íפʥ᡼¥ë¤Ç¤É¤Î¥á¡¼¥ë¤¬ÉÔÍפʥ᡼¥ë¤«¤Ë¤Ä¤¤¤Æ¤Ê¤Ë¤âÃΤé¤Ê¤¤¤«¤é¤Ç¤¹¡£¥È¥ì¡¼¥Ë¥ó¥°¤Ï¤½¤ì¤¾¤ì¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¹Ô¤¦É¬Íפ¬¤¢¤ê¡ÊºÇÄã¤Ç¤â£±¤Ä¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¡¢£±¤Ä°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤òºÆʬÎह¤ë¡Ë¡¢POPFile ¤¬Ê¬Îà¤ò´Ö°ã¤¨¤¿¥á¥Ã¥»¡¼¥¸¤òÀµ¤·¤¤¥Ð¥±¥Ä¤ËºÆʬÎह¤ë¡ÊÍúÎò¤Î±¦Â¦¤Ë¤¢¤ë¥á¥Ë¥å¡¼¤«¤éÀµ¤·¤¤Ê¬ÎàÀè¤òÁªÂò¤·¤Æ¡ÖºÆʬÎà¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¡Ë¤³¤È¤Ë¤è¤Ã¤Æ¥È¥ì¡¼¥Ë¥ó¥°¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¤Þ¤¿¡¢POPFile ¤¬¹Ô¤Ã¤¿Ê¬Îà¤Ë¤¢¤ï¤»¤Æ¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤¹¤ë¤Ê¤É¡¢¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://popfile.sourceforge.net/cgi-bin/wiki.pl?JP_FrequentlyAskedQuestions/EmailSorting">POPFile ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ Help_Bucket_Setup POPFile ¤Ç¤Ï¡¢¤â¤È¤â¤È¤¢¤ë unclassified ¤È¤¤¤¦²¾ÁÛŪ¤Ê¥Ð¥±¥Ä°Ê³°¤Ë¡¢ºÇÄã¤Ç¤â£²¤Ä¤Î¥Ð¥±¥Ä¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£POPFile ¤ÎÆÃħ¤Ï¡¢¡Ê¥á¡¼¥ë¤ò spam ¤È¤½¤ì°Ê³°¤ËʬÎह¤ë¤È¤¤¤¦¤À¤±¤Ç¤Ï¤Ê¤¯¡Ë¤¤¤¯¤Ä¤Ç¤â¥Ð¥±¥Ä¤òºîÀ®¤·¡¢¤½¤ì¤é¤Ë¥á¡¼¥ë¤òʬÎह¤ë¤³¤È¤¬¤Ç¤¤ë¤³¤È¤Ç¤¹¡£´Êñ¤ÊÀßÄê¤Ç¤Ï¡¢"spam"¡¢"personal"¡¢"work" ¤È¤¤¤Ã¤¿¥Ð¥±¥Ä¤òÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ Help_No_More ¼¡²ó¤«¤éɽ¼¨¤·¤Ê¤¤¡£ |
|
From: naoki i. <am...@us...> - 2007-02-09 14:26:13
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22718/languages Modified Files: Tag: b0_22_2 Nihongo.msg Log Message: update translation Index: Nihongo.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Nihongo.msg,v retrieving revision 1.11.6.8 retrieving revision 1.11.6.9 diff -C2 -d -r1.11.6.8 -r1.11.6.9 *** Nihongo.msg 31 Jan 2007 13:32:26 -0000 1.11.6.8 --- Nihongo.msg 9 Feb 2007 14:26:07 -0000 1.11.6.9 *************** *** 375,379 **** Shutdown_Message POPFile ¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£ ! Help_Training POPFile ¤ò¤³¤ì¤«¤é»È¤¤»Ï¤á¤ë¾ì¹ç¡¢¤¢¤ëÄøÅ٤Υȥ졼¥Ë¥ó¥°¤¬É¬ÍפȤʤê¤Þ¤¹¡£¤½¤ì¤Ï¡¢POPFile ¤Ï¤É¤Î¥á¡¼¥ë¤¬É¬Íפʥ᡼¥ë¤Ç¤É¤Î¥á¡¼¥ë¤¬ÉÔÍפʥ᡼¥ë¤«¤Ë¤Ä¤¤¤Æ¤Ê¤Ë¤âÃΤé¤Ê¤¤¤«¤é¤Ç¤¹¡£¥È¥ì¡¼¥Ë¥ó¥°¤Ï¤½¤ì¤¾¤ì¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¹Ô¤¦É¬Íפ¬¤¢¤ê¡ÊºÇÄã¤Ç¤â£±¤Ä¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¡¢£±¤Ä°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤òºÆʬÎह¤ë¡Ë¡¢POPFile ¤¬Ê¬Îà¤ò´Ö°ã¤¨¤¿¥á¥Ã¥»¡¼¥¸¤òÀµ¤·¤¤¥Ð¥±¥Ä¤ËºÆʬÎह¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥È¥ì¡¼¥Ë¥ó¥°¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¤Þ¤¿¡¢POPFile ¤¬¹Ô¤Ã¤¿Ê¬Îà¤Ë¤¢¤ï¤»¤Æ¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤¹¤ë¤Ê¤É¡¢¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://getpopfile.org/wiki/JP:FAQ:EmailSorting">POPFile ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ Help_Bucket_Setup POPFile ¤Ç¤Ï¡¢¤â¤È¤â¤È¤¢¤ë "unclassified" ¤È¤¤¤¦²¾ÁÛŪ¤Ê¥Ð¥±¥Ä°Ê³°¤Ë¡¢ºÇÄã¤Ç¤â£²¤Ä¤Î¥Ð¥±¥Ä¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£POPFile ¤ÎÆÃħ¤Ï¡¢¡Ê¥á¡¼¥ë¤ò spam ¤È¤½¤ì°Ê³°¤ËʬÎह¤ë¤È¤¤¤¦¤À¤±¤Ç¤Ï¤Ê¤¯¡Ë¤¤¤¯¤Ä¤Ç¤â¥Ð¥±¥Ä¤òºîÀ®¤·¡¢¤½¤ì¤é¤Ë¥á¡¼¥ë¤òʬÎह¤ë¤³¤È¤¬¤Ç¤¤ë¤³¤È¤Ç¤¹¡£´Êñ¤ÊÀßÄê¤Ç¤Ï¡¢"spam"¡¢"personal"¡¢"work" ¤È¤¤¤Ã¤¿¥Ð¥±¥Ä¤òÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ Help_No_More ¼¡²ó¤«¤éɽ¼¨¤·¤Ê¤¤¡£ --- 375,379 ---- Shutdown_Message POPFile ¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£ ! Help_Training POPFile ¤ò¤³¤ì¤«¤é»È¤¤»Ï¤á¤ë¾ì¹ç¡¢¤¢¤ëÄøÅ٤Υȥ졼¥Ë¥ó¥°¤¬É¬ÍפȤʤê¤Þ¤¹¡£¤½¤ì¤Ï¡¢POPFile ¤Ï¤É¤Î¥á¡¼¥ë¤¬É¬Íפʥ᡼¥ë¤Ç¤É¤Î¥á¡¼¥ë¤¬ÉÔÍפʥ᡼¥ë¤«¤Ë¤Ä¤¤¤Æ¤Ê¤Ë¤âÃΤé¤Ê¤¤¤«¤é¤Ç¤¹¡£¥È¥ì¡¼¥Ë¥ó¥°¤Ï¤½¤ì¤¾¤ì¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¹Ô¤¦É¬Íפ¬¤¢¤ê¡ÊºÇÄã¤Ç¤â£±¤Ä¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¡¢£±¤Ä°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤òºÆʬÎह¤ë¡Ë¡¢POPFile ¤¬Ê¬Îà¤ò´Ö°ã¤¨¤¿¥á¥Ã¥»¡¼¥¸¤òÀµ¤·¤¤¥Ð¥±¥Ä¤ËºÆʬÎह¤ë¡ÊÍúÎò¤Î±¦Â¦¤Ë¤¢¤ë¥á¥Ë¥å¡¼¤«¤éÀµ¤·¤¤Ê¬ÎàÀè¤òÁªÂò¤·¤Æ¡ÖºÆʬÎà¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¡Ë¤³¤È¤Ë¤è¤Ã¤Æ¥È¥ì¡¼¥Ë¥ó¥°¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¤Þ¤¿¡¢POPFile ¤¬¹Ô¤Ã¤¿Ê¬Îà¤Ë¤¢¤ï¤»¤Æ¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤¹¤ë¤Ê¤É¡¢¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://getpopfile.org/wiki/JP:FAQ:EmailSorting">POPFile ¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ Help_Bucket_Setup POPFile ¤Ç¤Ï¡¢¤â¤È¤â¤È¤¢¤ë "unclassified" ¤È¤¤¤¦²¾ÁÛŪ¤Ê¥Ð¥±¥Ä°Ê³°¤Ë¡¢ºÇÄã¤Ç¤â£²¤Ä¤Î¥Ð¥±¥Ä¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£POPFile ¤ÎÆÃħ¤Ï¡¢¡Ê¥á¡¼¥ë¤ò spam ¤È¤½¤ì°Ê³°¤ËʬÎह¤ë¤È¤¤¤¦¤À¤±¤Ç¤Ï¤Ê¤¯¡Ë¤¤¤¯¤Ä¤Ç¤â¥Ð¥±¥Ä¤òºîÀ®¤·¡¢¤½¤ì¤é¤Ë¥á¡¼¥ë¤òʬÎह¤ë¤³¤È¤¬¤Ç¤¤ë¤³¤È¤Ç¤¹¡£´Êñ¤ÊÀßÄê¤Ç¤Ï¡¢"spam"¡¢"personal"¡¢"work" ¤È¤¤¤Ã¤¿¥Ð¥±¥Ä¤òÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ Help_No_More ¼¡²ó¤«¤éɽ¼¨¤·¤Ê¤¤¡£ |
|
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 |
|
From: Brian S. <xue...@us...> - 2007-02-08 19:26:30
|
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 |
|
From: Brian S. <xue...@us...> - 2007-02-08 19:26:30
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21588/add-ons Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Explicitly set the execution privilege which Vista expects to find in the manifest. Also customise the embedded manifest. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.8 retrieving revision 1.3.4.9 diff -C2 -d -r1.3.4.8 -r1.3.4.9 *** addssl.nsi 28 Jan 2007 21:14:36 -0000 1.3.4.8 --- addssl.nsi 8 Feb 2007 19:26:21 -0000 1.3.4.9 *************** *** 265,269 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.7" ; Mention the wizard's version number in the window title --- 265,269 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.8" ; Mention the wizard's version number in the window title *************** *** 275,278 **** --- 275,291 ---- !define C_OUTFILE "addssl.exe" + ;-------------------------------------------------------------------------- + ; Windows Vista expects to find a manifest specifying the execution level + ;-------------------------------------------------------------------------- + + RequestExecutionLevel admin + + !tempfile EXE_HDR + !packhdr "${EXE_HDR}" \ + '"..\toolkit\pfi-manifest.exe" \ + /FILE="${EXE_HDR}" \ + /NAME="POPFile.wizard" \ + /DESCRIPTION="Add SSL Support to POPFile"' + #-------------------------------------------------------------------------- # User Registers (Global) *************** *** 345,348 **** --- 358,362 ---- !endif + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION |
|
From: Brian S. <xue...@us...> - 2007-02-08 19:21:24
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20804 Modified Files: Tag: b0_22_2 installer.nsi Log Message: Explicitly set the execution privilege which Vista expects to find in the manifest. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.8 retrieving revision 1.242.4.9 diff -C2 -d -r1.242.4.8 -r1.242.4.9 *** installer.nsi 28 Jan 2007 21:18:46 -0000 1.242.4.8 --- installer.nsi 8 Feb 2007 19:21:14 -0000 1.242.4.9 *************** *** 228,231 **** --- 228,237 ---- !define C_RELEASE_NOTES "..\engine\${C_README}" + ;-------------------------------------------------------------------------- + ; Windows Vista expects to find a manifest specifying the execution level + ;-------------------------------------------------------------------------- + + RequestExecutionLevel admin + ;---------------------------------------------------------------------- ; Root directory for the Perl files (used when building the installer) *************** *** 384,387 **** --- 390,394 ---- !endif + VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION |
|
From: Brian S. <xue...@us...> - 2007-02-08 19:19:43
|
Update of /cvsroot/popfile/windows/toolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20388 Added Files: Tag: b0_22_2 pfi-manifest.nsi Log Message: This script builds a utility which is used by other NSIS scripts at compile-time to adjust the manifest used by Vista. --- NEW FILE: pfi-manifest.nsi --- #------------------------------------------------------------------------------------------- # # pfi-manifest.nsi --- A simple utility used at compile-time to adjust the manifest created # by the NSIS compiler. Windows Vista uses this manifest to determine # the privileges required by a program. This manifest also identifies # programs as being built using NSIS which may result in Windows Vista # wrongly identifying the NSIS-based POPFile utilities as "installers". # This utility changes the two 'NSIS' references in the manifest. # # Copyright (c) 2007 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #------------------------------------------------------------------------------------------- #------------------------------------------------------------------------------------------- # Usage: # # PFI_MANIFEST /FILE="filename" /NAME="new 'name' text" /DESCRIPTION="new 'description' text" # # where # # "filename" is the fullpathname to the file to be modified (normally the 'exehead' header) # # "new 'name' text" is the text used to replace the default "Nullsoft.NSIS.exehead" string # in the manifest # # "new 'description' text" is the text used to replace the default description string # in the manifest (the NSIS 2.22 compiler inserts the string "Nullsoft Install System v2.22") # # ('/FILE', '/NAME' and '/DESCRIPTION' can be in uppercase or lowercase) # # Normally this utility will be used at compile time via the '!packhdr' command, e.g. # # ;-------------------------------------------------------------------------- # ; 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"' # #------------------------------------------------------------------------------------------- # # 'Resource Hacker (TM)', a freeware utility, is used to extract (save) the manifest resource # created by the NSIS compiler and to replace it with our modified version. 'Resource Hacker' # can be used interactively or, as here, via the command-line. The home page, with download # links, for 'Resource Hacker' is at http://www.angusj.com/resourcehacker/ # #------------------------------------------------------------------------------------------- ;------------------------------------------------ ; This script requires the 'XML' NSIS plugin ;------------------------------------------------ ; The manifest is stored as an XML document therefore this script uses a special NSIS plugin ; (XML) to modify the manifest after it has been extracted from the header. ; ; The 'NSIS Wiki' page for the 'XML' plugin (description and download links): ; http://nsis.sourceforge.net/XML_plug-in ; ; Unlike most plugins, this one requires _two_ files to be installed before it can be used. ; ; To compile this script, copy the 'xml.dll' file to the standard NSIS plugins folder ; (${NSISDIR}\Plugins\) and the 'XML.nsh' header file to the standard NSIS 'Include' folder ; (${NSISDIR}\Include\). The 'XML' documentation, example & source files can be unzipped ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ; Tested with Version 1.8 of the XML plugin ;------------------------------------------------ ; This version of the script has been tested with the "NSIS v2.22" compiler, ; released 27 November 2006. This particular compiler can be downloaded from ; http://prdownloads.sourceforge.net/nsis/nsis-2.22-setup.exe?download !define ${NSIS_VERSION}_found !ifndef v2.22_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ $\r$\n*** This script has only been tested using the NSIS v2.22 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ $\r$\n*** The resulting 'installer' program should be tested carefully!\ $\r$\n$\r$\n" !endif !undef ${NSIS_VERSION}_found ;-------------------------------------------------------------------------- ; Symbol used to avoid confusion over where the line breaks occur. ; ; ${MB_NL} is used for MessageBox-style 'new line' sequences. ; ; (this constant does not follow the 'C_' naming convention described below) ;-------------------------------------------------------------------------- !define MB_NL "$\r$\n" ;-------------------------------------------------------------------------- ; POPFile constants have been given names beginning with 'C_' (eg C_README) ;-------------------------------------------------------------------------- !define C_VERSION "0.0.1" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfi-manifest.exe" ; The default NSIS caption is "Name Setup" so we override it here Name "POPFile Manifest Updater ${C_VERSION}" Caption "$(^Name)" ; Specify EXE filename and icon for the 'installer' OutFile "${C_OUTFILE}" Icon "..\POPFileIcon\popfile.ico" ; Selecting 'silent' mode makes the installer behave like a command-line utility SilentInstall silent ;-------------------------------------------------------------------------- ; Windows Vista expects to find a manifest specifying the execution level ;-------------------------------------------------------------------------- RequestExecutionLevel user ; Define the temporary file used when modifying the manifest !define C_MANIFEST_OLD "$PLUGINSDIR\manifest" !define C_MANIFEST_XML "$PLUGINSDIR\manifest.xml" !define C_MANIFEST_NEW "$PLUGINSDIR\manifest.new" #-------------------------------------------------------------------------- # Include library functions and macro definitions #-------------------------------------------------------------------------- !include "XML.nsh" !include "FileFunc.nsh" !insertmacro GetParameters !insertmacro GetOptions #-------------------------------------------------------------------------- ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ; representing the following values: Major.Minor.Release.Build VIProductVersion "${C_VERSION}.0" !define /date C_BUILD_YEAR "%Y" VIAddVersionKey "ProductName" "This utility changes some NSIS references \ in the manifest used by Vista" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of \ John Graham-Cumming" VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Vista manifest updater for POPFile" VIAddVersionKey "FileVersion" "${C_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" VIAddVersionKey "Build Compiler" "NSIS ${NSIS_VERSION}" VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" !ifdef C_PFI_LIBRARY_VERSION VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" !endif VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #---------------------------------------------------------------------------------------- #-------------------------------------------------------------------------- # User Variables (Global) #-------------------------------------------------------------------------- ; This script uses 'User Variables' (with names starting with 'G_') to hold GLOBAL data. Var G_DESC ; the text string to be used for the "description" in the manifest Var G_FILE ; full pathname of the file to be modified Var G_NAME ; the text string to be used for the "name" in the manifest ;-------------------------------------- ; Initialisation ;-------------------------------------- Function .onInit !define L_ERRORMSG $R9 ; used to customise the error message !define L_OPTIONS $R8 ; command-line options supplied at run-time !define L_UTILNAME $R7 ; utility's name (for use in error message) Push ${L_ERRORMSG} Push ${L_OPTIONS} Push ${L_UTILNAME} ${GetParameters} ${L_OPTIONS} ${GetOptions} "${L_OPTIONS}" "/FILE=" $G_FILE IfErrors file_error ${GetOptions} "${L_OPTIONS}" "/NAME=" $G_NAME IfErrors name_error ${GetOptions} "${L_OPTIONS}" "/DESCRIPTION=" $G_DESC IfErrors description_error Goto exit file_error: StrCpy ${L_ERRORMSG} '"File name" parameter is missing!' Goto error_msg name_error: StrCpy ${L_ERRORMSG} '"New name text" parameter is missing!' Goto error_msg description_error: StrCpy ${L_ERRORMSG} '"New description text" parameter is missing!' error_msg: Push $R0 Push $R1 ; The first system call gets the full pathname (returned in $R0) and the second call ; extracts the filename (and possibly the extension) part (returned in $R1) System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)' System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)' StrCpy ${L_UTILNAME} $R1 Pop $R1 Pop $R0 MessageBox MB_OK|MB_ICONSTOP '${L_ERRORMSG}\ ${MB_NL}${MB_NL}\ Usage: \ ${L_UTILNAME} /FILE="file name" /NAME="new name text" /DESCRIPTION="new description text"' Quit exit: InitPluginsDir Pop ${L_UTILNAME} Pop ${L_OPTIONS} Pop ${L_ERRORMSG} !undef L_ERRORMSG !undef L_OPTIONS !undef L_UTILNAME FunctionEnd ;-------------------------------------- ; Extract, Update and Replace the manifest ;-------------------------------------- Section "UpdateManifest" ; First extract the manifest created by NSIS ExecWait '"$EXEDIR\reshacker\reshacker.exe" -extract "$G_FILE", "${C_MANIFEST_OLD}", 24, 1,' ; Now replace the two references to "NSIS" in the manifest with references to POPFile Call AdjustManifest ; Ensure the modified manifest is in same format as the NSIS-created one ; (i.e. one line with no extra whitespace) Push "${C_MANIFEST_XML}" Push "${C_MANIFEST_NEW}" Call CleanupXML ; Overwrite the existing NSIS-created manifest with the modified manifest ExecWait '"$EXEDIR\reshacker\reshacker.exe" \ -addoverwrite "$G_FILE", "$G_FILE", "${C_MANIFEST_NEW}", 24, 1,' SectionEnd ;-------------------------------------- ; Function: Change the two NSIS entries in the manifest ;-------------------------------------- Function AdjustManifest !define L_ERRORMSG $R9 ; used to customise the error messages !define L_RESULT $R8 ; result code returned by the XML plugin !define L_STRING $R7 ; text string read from the manifest Push ${L_ERRORMSG} Push ${L_RESULT} Push ${L_STRING} ${xml::LoadFile} "${C_MANIFEST_OLD}" ${L_RESULT} StrCmp ${L_RESULT} "-1" load_error ${xml::GotoPath} "/assembly/assemblyIdentity" ${L_RESULT} StrCmp ${L_RESULT} "-1" identity_path_error ${xml::GetAttribute} "name" ${L_STRING} ${L_RESULT} StrCmp ${L_RESULT} "-1" get_name_error StrCmp ${L_STRING} "Nullsoft.NSIS.exehead" change_name MessageBox MB_OK|MB_ICONINFORMATION "Unexpected value found for 'name' attribute\ ${MB_NL}\ (${L_STRING})" change_name: ${xml::SetAttribute} "name" "$G_NAME" ${L_RESULT} StrCmp ${L_RESULT} "-1" set_name_error ${xml::GotoPath} "/assembly/description" ${L_RESULT} StrCmp ${L_RESULT} "-1" description_path_error ${xml::GetText} ${L_STRING} ${L_RESULT} StrCmp ${L_RESULT} "-1" get_description_error StrCpy ${L_RESULT} ${L_STRING} 23 StrCmp ${L_RESULT} "Nullsoft Install System" change_description MessageBox MB_OK|MB_ICONINFORMATION "Unexpected value found for 'description' text\ ${MB_NL}\ (${L_STRING})" change_description: ${xml::SetText} "$G_DESC" ${L_RESULT} StrCmp ${L_RESULT} "-1" set_description_error ${xml::SetCondenseWhiteSpace} "1" ${xml::SaveFile} "${C_MANIFEST_XML}" ${L_RESULT} StrCmp ${L_RESULT} "0" exit ;save_error: StrCpy ${L_ERRORMSG} "Unable to save the modified manifest XML file (${C_MANIFEST_XML})" Goto error_exit load_error: StrCpy ${L_ERRORMSG} "Unable to load the manifest XML file (${C_MANIFEST_OLD})" Goto error_exit identity_path_error: StrCpy ${L_ERRORMSG} "Unable to find '/assembly/assemblyIdentity' path" Goto error_exit get_name_error: StrCpy ${L_ERRORMSG} "Unable to read the 'name' attribute" Goto error_exit set_name_error: StrCpy ${L_ERRORMSG} "Unable to set the 'name' attribute" Goto error_exit description_path_error: StrCpy ${L_ERRORMSG} "Unable to find '/assembly/description' path" Goto error_exit get_description_error: StrCpy ${L_ERRORMSG} "Unable to read the 'description' text" Goto error_exit set_description_error: StrCpy ${L_ERRORMSG} "Unable to set the 'description' text" Goto error_exit error_exit: MessageBox MB_OK|MB_ICONEXCLAMATION "${L_ERRORMSG}\ ${MB_NL}${MB_NL}\ Manifest has _not_ been updated" exit: ${xml::Unload} Pop ${L_STRING} Pop ${L_RESULT} Pop ${L_ERRORMSG} !undef L_ERRORMSG !undef L_RESULT !undef L_STRING FunctionEnd #-------------------------------------- # Function: Remove the formatting inserted by the XML plugin # # Inputs: # (top of stack) - full pathname of output file # (top of stack - 1) - full pathname of input file # # Outputs: # (none) # # Usage: # Push "C:\TEMP\input_file.xml" # Push "C:\TEMP\output_file.xml" # Call CleanupXML # #-------------------------------------- Function CleanupXML !define L_FILENAME_IN $R9 ; fullpathname of the input file !define L_FILENAME_OUT $R8 ; fullpathname of the output file !define L_INPUT $R7 ; handle used to access input file !define L_OUTPUT $R6 ; handle used to access the output file !define L_STRING $R5 ; line of data read from/written to a file Exch ${L_FILENAME_OUT} Exch Exch ${L_FILENAME_IN} Exch Push ${L_INPUT} Push ${L_OUTPUT} Push ${L_STRING} StrCmp "${L_FILENAME_IN}" "${L_FILENAME_OUT}" 0 continue MessageBox MB_OK|MB_ICONSTOP "Error: 'CleanupXML' input file = output file!\ ${MB_NL}${MB_NL}\ input = ${L_FILENAME_IN}\ ${MB_NL}\ output = ${L_FILENAME_OUT}" Goto exit continue: FileOpen ${L_INPUT} "${L_FILENAME_IN}" "r" FileOpen ${L_OUTPUT} "${L_FILENAME_OUT}" "w" loop: FileRead ${L_INPUT} ${L_STRING} StrCmp ${L_STRING} "" done Push ${L_STRING} Call TrimNewlines Call StrStripLS Pop ${L_STRING} FileWrite ${L_OUTPUT} ${L_STRING} Goto loop done: FileClose ${L_INPUT} FileClose ${L_OUTPUT} exit: Pop ${L_STRING} Pop ${L_OUTPUT} Pop ${L_INPUT} Pop ${L_FILENAME_OUT} Pop ${L_FILENAME_IN} !undef L_FILENAME_IN !undef L_FILENAME_OUT !undef L_INPUT !undef L_OUTPUT !undef L_STRING FunctionEnd ;-------------------------------------- ; Function: Strip any end-of-line sequences from a string ;-------------------------------------- Function TrimNewlines Exch $R0 Push $R1 Push $R2 StrCpy $R1 0 loop: IntOp $R1 $R1 - 1 StrCpy $R2 $R0 1 $R1 StrCmp $R2 "$\r" loop StrCmp $R2 "$\n" loop IntOp $R1 $R1 + 1 IntCmp $R1 0 no_trim_needed StrCpy $R0 $R0 $R1 no_trim_needed: Pop $R2 Pop $R1 Exch $R0 FunctionEnd #-------------------------------------------------------------------------- # Installer Function: StrStripLS # # Strips leading spaces from a string. # # Inputs: # (top of stack) - string to be processed # Outputs: # (top of stack) - processed string (with no leading spaces) # # Usage: # Push " 123" # Call StrStripLS # Pop $R0 # # ($R0 at this point is "123") # #-------------------------------------------------------------------------- Function StrStripLS !define L_CHAR $R9 !define L_STRING $R8 Exch ${L_STRING} Push ${L_CHAR} loop: StrCpy ${L_CHAR} ${L_STRING} 1 StrCmp ${L_CHAR} "" done StrCmp ${L_CHAR} " " strip_char Goto done strip_char: StrCpy ${L_STRING} ${L_STRING} "" 1 Goto loop done: Pop ${L_CHAR} Exch ${L_STRING} !undef L_CHAR !undef L_STRING FunctionEnd ;-------------------------------------- ; end-of-file ;-------------------------------------- |
11 messages has been excluded from this view by a project administrator.
