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: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:43
|
Update of /cvsroot/popfile/engine/skins/orange In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/orange Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/orange/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:32 -0000 1.3 --- style.css 14 Sep 2005 19:24:30 -0000 1.3.6.1 *************** *** 216,217 **** --- 216,222 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:43
|
Update of /cvsroot/popfile/engine/skins/smallgrey In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/smallgrey Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/smallgrey/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:42 -0000 1.3 --- style.css 14 Sep 2005 19:24:30 -0000 1.3.6.1 *************** *** 393,394 **** --- 393,399 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/lrclaptop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/lrclaptop Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/lrclaptop/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:32 -0000 1.3 --- style.css 14 Sep 2005 19:24:29 -0000 1.3.6.1 *************** *** 253,254 **** --- 253,259 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/tinydefault In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/tinydefault Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/tinydefault/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:43 -0000 1.3 --- style.css 14 Sep 2005 19:24:31 -0000 1.3.6.1 *************** *** 315,316 **** --- 315,321 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/orangecream In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/orangecream Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/orangecream/style.css,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** style.css 10 Aug 2004 02:18:31 -0000 1.4 --- style.css 14 Sep 2005 19:24:30 -0000 1.4.6.1 *************** *** 523,524 **** --- 523,529 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/simplyblue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/simplyblue Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/simplyblue/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:41 -0000 1.3 --- style.css 14 Sep 2005 19:24:30 -0000 1.3.6.1 *************** *** 268,269 **** --- 268,273 ---- } + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/coolgreen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/coolgreen Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/coolgreen/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:30 -0000 1.3 --- style.css 14 Sep 2005 19:24:29 -0000 1.3.6.1 *************** *** 297,299 **** --- 297,304 ---- padding: 0.3em; padding-bottom: 0; + } + + .menuLink { + display: block; + width: 100%; } \ No newline at end of file |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/coolyellow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/coolyellow Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/coolyellow/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:30 -0000 1.3 --- style.css 14 Sep 2005 19:24:29 -0000 1.3.6.1 *************** *** 298,299 **** --- 298,304 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/default Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -C2 -d -r1.5 -r1.5.6.1 *** style.css 31 Jul 2004 18:04:31 -0000 1.5 --- style.css 14 Sep 2005 19:24:29 -0000 1.5.6.1 *************** *** 70,73 **** --- 70,78 ---- } + .menuLink { + display: block; + width: 100%; + } + /*********************************************************/ /* Table Settings */ |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/tinygrey In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/tinygrey Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/tinygrey/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:43 -0000 1.3 --- style.css 14 Sep 2005 19:24:31 -0000 1.3.6.1 *************** *** 533,534 **** --- 533,539 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/coolorange In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/coolorange Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/coolorange/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:30 -0000 1.3 --- style.css 14 Sep 2005 19:24:29 -0000 1.3.6.1 *************** *** 297,299 **** --- 297,304 ---- padding: 0.3em; padding-bottom: 0; + } + + .menuLink { + display: block; + width: 100%; } \ No newline at end of file |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/outlook In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/outlook Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/outlook/style.css,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** style.css 10 Aug 2004 02:18:32 -0000 1.4 --- style.css 14 Sep 2005 19:24:30 -0000 1.4.6.1 *************** *** 298,299 **** --- 298,304 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/smalldefault In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/smalldefault Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/smalldefault/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:42 -0000 1.3 --- style.css 14 Sep 2005 19:24:30 -0000 1.3.6.1 *************** *** 317,319 **** --- 317,324 ---- padding: 0.4em; padding-bottom: 0; + } + + .menuLink { + display: block; + width: 100%; } \ No newline at end of file |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/white In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/white Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/white/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:43 -0000 1.3 --- style.css 14 Sep 2005 19:24:31 -0000 1.3.6.1 *************** *** 210,211 **** --- 210,216 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/coolbrown In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/coolbrown Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/coolbrown/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:30 -0000 1.3 --- style.css 14 Sep 2005 19:24:29 -0000 1.3.6.1 *************** *** 298,299 **** --- 298,304 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:42
|
Update of /cvsroot/popfile/engine/skins/osx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/osx Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/osx/style.css,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** style.css 10 Aug 2004 03:19:37 -0000 1.2 --- style.css 14 Sep 2005 19:24:30 -0000 1.2.6.1 *************** *** 279,280 **** --- 279,285 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:41
|
Update of /cvsroot/popfile/engine/skins/glassblue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/glassblue Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/glassblue/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:31 -0000 1.3 --- style.css 14 Sep 2005 19:24:29 -0000 1.3.6.1 *************** *** 266,267 **** --- 266,272 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-14 19:24:41
|
Update of /cvsroot/popfile/engine/skins/green In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11049/green Modified Files: Tag: b0_22_2 style.css Log Message: Merge Joseph's updated skins to this branch Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/green/style.css,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** style.css 31 Jul 2004 18:04:31 -0000 1.3 --- style.css 14 Sep 2005 19:24:29 -0000 1.3.6.1 *************** *** 261,262 **** --- 261,267 ---- padding-bottom: 0; } + + .menuLink { + display: block; + width: 100%; + } |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 20:36:01
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29852 Modified Files: Tag: b0_22_2 Makefile Log Message: addssl.zip not needed Index: Makefile =================================================================== RCS file: /cvsroot/popfile/windows/Makefile,v retrieving revision 1.22.4.1 retrieving revision 1.22.4.2 diff -C2 -d -r1.22.4.1 -r1.22.4.2 *** Makefile 13 Sep 2005 19:05:32 -0000 1.22.4.1 --- Makefile 13 Sep 2005 20:35:49 -0000 1.22.4.2 *************** *** 25,29 **** MAKENSIS_VERSION_STRING:=/DC_POPFILE_MAJOR_VERSION=$(POPFILE_MAJOR_VERSION) /DC_POPFILE_MINOR_VERSION=$(POPFILE_MINOR_VERSION) /DC_POPFILE_REVISION=$(POPFILE_REVISION) /DC_POPFILE_RC=$(RC) ! MAKENSIS=echo Making $@ ; makensis.exe $(MAKENSIS_VERSION_STRING) /V2 /O$(patsubst %.exe,%.log,$@) $< BUILD_ZIP=wzzip -P $(POPFILE_WINDOWS_ZIP) -a $^ --- 25,29 ---- MAKENSIS_VERSION_STRING:=/DC_POPFILE_MAJOR_VERSION=$(POPFILE_MAJOR_VERSION) /DC_POPFILE_MINOR_VERSION=$(POPFILE_MINOR_VERSION) /DC_POPFILE_REVISION=$(POPFILE_REVISION) /DC_POPFILE_RC=$(RC) ! MAKENSIS=echo Making $@ ; makensis.exe $(MAKENSIS_VERSION_STRING) /V4 /O$(patsubst %.exe,%.log,$@) $< BUILD_ZIP=wzzip -P $(POPFILE_WINDOWS_ZIP) -a $^ *************** *** 42,46 **** all: build build: $(POPFILE_WINDOWS_ZIP) ! $(POPFILE_WINDOWS_ZIP): $(SETUP) addssl.zip rm -f $@ $(BUILD_ZIP) --- 42,46 ---- all: build build: $(POPFILE_WINDOWS_ZIP) ! $(POPFILE_WINDOWS_ZIP): $(SETUP) rm -f $@ $(BUILD_ZIP) |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 20:28:55
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28450 Added Files: Tag: b0_22_2 zerobyte.file Log Message: Add missing file --- NEW FILE: zerobyte.file --- |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 20:25:55
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27478 Added Files: Tag: b0_22_2 getssl.nsh Log Message: Add missing file --- NEW FILE: getssl.nsh --- #-------------------------------------------------------------------------- # # getssl.nsh --- This NSIS 'include' file is used by the POPFile installer (installer.nsi) # and by the 'SSL Setup' wizard (add-ons\addssl.nsi) to download and install # SSL support for POPFile. If the optional SSL support is required, the # installer will download the necessary files during the installation. The # 'SSL Setup' wizard can be used to add SSL support to an existing POPFile # 0.22 (or later) installation. This 'include' file ensures that these two # programs download and install the same SSL files. # # Copyright (c) 2005 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 the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # 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 product downloads software developed by the OpenSSL Project for use # in the OpenSSL Toolkit (http://www.openssl.org/) #-------------------------------------------------------------------------- ; This version of the script has been tested with the "NSIS 2" compiler (final), ; released 7 February 2004, with no "official" NSIS patches applied. ;------------------------------------------------ ; This script requires the 'untgz' NSIS plugin ;------------------------------------------------ ; This script uses a special NSIS plugin (untgz) to extract files from the *.tar.gz archives. ; ; The 'NSIS Wiki' page for the 'untgz' plugin (description, example and download links): ; http://nsis.sourceforge.net/wiki/UnTGZ ; ; Alternative download links can be found at the 'untgz' author's site: ; http://www.darklogic.org/win32/nsis/plugins/ ; ; To compile this script, copy the 'untgz.dll' file to the standard NSIS plugins folder ; (${NSISDIR}\Plugins\). The 'untgz' source and example files can be unzipped to the ; ${NSISDIR}\Contrib\untgz\ folder if you wish, but this step is entirely optional. ; ; Tested with versions 1.0.5, 1.0.6, 1.0.7 and 1.0.8 of the 'untgz' plugin. #-------------------------------------------------------------------------- # URLs used to download the necessary SSL support archives and files # (all from the University of Winnipeg Repository) #-------------------------------------------------------------------------- ; To check if the target computer is connected to the Internet, we ping this address: !define C_UWR_URL_TO_PING "http://theoryx5.uwinnipeg.ca/" ; In addition to some extra Perl modules, POPFile's SSL support needs two OpenSSL DLLs. !define C_UWR_IO_SOCKET_SSL "http://theoryx5.uwinnipeg.ca/ppms/x86/IO-Socket-SSL.tar.gz" !define C_UWR_NET_SSLEAY "http://theoryx5.uwinnipeg.ca/ppms/x86/Net_SSLeay.pm.tar.gz" !define C_UWR_DLL_SSLEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/ssleay32.dll" !define C_UWR_DLL_LIBEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/libeay32.dll" #-------------------------------------------------------------------------- # User Registers (Global) #-------------------------------------------------------------------------- Var G_SSL_FILEURL ; full URL used to download SSL file Var G_PLS_FIELD_2 ; used to customise translated text strings #-------------------------------------------------------------------------- # Installer Section: POPFile SSL Support #-------------------------------------------------------------------------- !ifdef INSTALLER Section /o "SSL Support" SecSSL !insertmacro SECTIONLOG_ENTER "SSL Support" ; The main installer does not contain the SSL support files so we provide an estimate ; which includes a slack space allowance (based upon the development system's statistics) AddSize 2560 !else Section "SSL Support" SecSSL ; The stand-alone utility includes a compressed set of POPFile 0.22.x compatible SSL ; support files so we increase the size estimate to take the necessary unpacking into ; account (and assume that there will not be a significant difference in the space ; required if the wizard decides to download the SSL support files instead). AddSize 1450 !endif !define L_RESULT $R0 ; used by the 'untgz' plugin to return the result Push ${L_RESULT} !ifdef ADDSSL !define L_VER_X $R1 ; We check only the first three fields in the version number !define L_VER_Y $R2 ; but the code could be further simplified by merely testing !define L_VER_Z $R3 ; the 'build number' field (the field we currently ignore) Push ${L_VER_X} Push ${L_VER_Y} Push ${L_VER_Z} ; The stand-alone utility may be used to add SSL support to an 0.22.x installation ; which is not compatible with the files in the University of Winnipeg repository, ; so we check the minimal Perl's version number to see if we should use the built-in ; SSL files instead of downloading the most up-to-date ones. IfFileExists "$G_ROOTDIR\perl58.dll" check_Perl_version DetailPrint "Assume 0.22.x installation (perl58.dll not found in '$G_ROOTDIR' folder)" Goto assume_0_22_x check_Perl_version: GetDllVersion "$G_ROOTDIR\perl58.dll" ${L_VER_Y} ${L_VER_Z} IntOp ${L_VER_X} ${L_VER_Y} / 0x00010000 IntOp ${L_VER_Y} ${L_VER_Y} & 0x0000FFFF IntOp ${L_VER_Z} ${L_VER_Z} / 0x00010000 DetailPrint "Minimal Perl version ${L_VER_X}.${L_VER_Y}.${L_VER_Z} detected in '$G_ROOTDIR' folder" ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher StrCpy ${L_RESULT} "built-in" IntCmp ${L_VER_X} 5 0 restore_vars set_download_flag IntCmp ${L_VER_Y} 8 0 restore_vars set_download_flag IntCmp ${L_VER_Z} 7 0 restore_vars set_download_flag set_download_flag: StrCpy ${L_RESULT} "download" restore_vars: Pop ${L_VER_Z} Pop ${L_VER_Y} Pop ${L_VER_X} !undef L_VER_X !undef L_VER_Y !undef L_VER_Z StrCmp ${L_RESULT} "download" download_ssl assume_0_22_x: ; Pretend we've just downloaded these files from the repository DetailPrint "therefore built-in SSL files used instead of downloading the latest versions" DetailPrint "" SetOutPath "$PLUGINSDIR" File "ssl-0.22.x\IO-Socket-SSL.tar.gz" File "ssl-0.22.x\Net_SSLeay.pm.tar.gz" File "ssl-0.22.x\ssleay32.dll" File "ssl-0.22.x\libeay32.dll" Goto install_SSL_support download_ssl: DetailPrint "therefore the latest versions of the SSL files will be downloaded" DetailPrint "" !endif SetDetailsPrint textonly DetailPrint "$(PFI_LANG_PROG_CHECKINTERNET) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" SetDetailsPrint listonly !define FLAG_ICC_FORCE_CONNECTION 0x00000001 ; The system call result is returned in 'r10' (i.e. in $R0) System::Call "wininet::InternetCheckConnection( \ t '${C_UWR_URL_TO_PING}', \ i ${FLAG_ICC_FORCE_CONNECTION}, i 0) i .r10" StrCmp ${L_RESULT} "error" no_ie3 StrCmp ${L_RESULT} "0" no_connection DetailPrint "InternetCheckConnection: online (${L_RESULT})" Goto download no_ie3: DetailPrint "InternetCheckConnection: no IE3" Goto manual_connect no_connection: DetailPrint "InternetCheckConnection: offline" manual_connect: DetailPrint "InternetCheckConnection: manual connect requested" MessageBox MB_OKCANCEL|MB_ICONINFORMATION "$(PFI_LANG_MB_INTERNETCONNECT)" IDOK download DetailPrint "InternetCheckConnection: cancelled by user" !ifdef INSTALLER Goto installer_error_exit !else Goto error_exit !endif download: ; Download the archives and OpenSSL DLLs Push "${C_UWR_IO_SOCKET_SSL}" Call GetSSLFile Push "${C_UWR_NET_SSLEAY}" Call GetSSLFile Push "${C_UWR_DLL_SSLEAY32}" Call GetSSLFile Push "${C_UWR_DLL_LIBEAY32}" Call GetSSLFile !ifdef INSTALLER IfFileExists "$PLUGINSDIR\IO-Socket-SSL.tar.gz" 0 installer_error_exit IfFileExists "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" 0 installer_error_exit IfFileExists "$PLUGINSDIR\ssleay32.dll" 0 installer_error_exit IfFileExists "$PLUGINSDIR\libeay32.dll" 0 installer_error_exit !endif !ifdef ADDSSL install_SSL_support: !endif ; Now install the files required for SSL support StrCpy $G_MPLIBDIR "$G_ROOTDIR\lib" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\IO\Socket" DetailPrint "" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "IO-Socket-SSL.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\IO-Socket-SSL.tar.gz" "SSL.pm" StrCmp ${L_RESULT} "success" label_a error_exit label_a: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "SSLeay.pm" StrCmp ${L_RESULT} "success" label_b error_exit label_b: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net\SSLeay" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "Handle.pm" StrCmp ${L_RESULT} "success" label_c error_exit label_c: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\auto\Net\SSLeay" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "OpenSSL DLL" DetailPrint "$(PFI_LANG_PROG_FILECOPY)" SetDetailsPrint listonly CopyFiles /SILENT "$PLUGINSDIR\ssleay32.dll" "$G_PLS_FIELD_1\ssleay32.dll" CopyFiles /SILENT "$PLUGINSDIR\libeay32.dll" "$G_PLS_FIELD_1\libeay32.dll" DetailPrint "" SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractV -j -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" -x ".exists" "*.html" "*.pl" "*.pm" -- StrCmp ${L_RESULT} "success" check_bs_file error_exit: SetDetailsPrint listonly DetailPrint "" SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_UNPACKFAIL)" SetDetailsPrint listonly DetailPrint "" MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_MB_UNPACKFAIL)" !ifdef INSTALLER installer_error_exit: Push $R1 ; No need to preserve $R0 here as it is known as ${L_RESULT} in this 'Section' ; 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 $G_PLS_FIELD_1 $R1 MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_REPEATSSL)" Pop $R1 Goto exit !else Call PFI_GetDateTimeStamp Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------------" DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" DetailPrint "----------------------------------------------------" Abort !endif check_bs_file: ; 'untgz' versions earlier than 1.0.6 (released 28 November 2004) are unable to extract ; empty files so this script creates the empty 'SSLeay.bs' file if necessary ; (to ensure all of the $G_MPLIBDIR\auto\Net\SSLeay\SSLeay.* files exist) IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" done: DetailPrint "" !ifdef INSTALLER exit: SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly !insertmacro SECTIONLOG_EXIT "SSL Support" !endif Pop ${L_RESULT} !undef L_RESULT SectionEnd #-------------------------------------------------------------------------- # Installer Function: GetSSLFile # # Inputs: # (top of stack) - full URL used to download the SSL file # Outputs: # none #-------------------------------------------------------------------------- !define C_NSISDL_TRANSLATIONS "/TRANSLATE '$(PFI_LANG_NSISDL_DOWNLOADING)' '$(PFI_LANG_NSISDL_CONNECTING)' '$(PFI_LANG_NSISDL_SECOND)' '$(PFI_LANG_NSISDL_MINUTE)' '$(PFI_LANG_NSISDL_HOUR)' '$(PFI_LANG_NSISDL_PLURAL)' '$(PFI_LANG_NSISDL_PROGRESS)' '$(PFI_LANG_NSISDL_REMAINING)'" Function GetSSLFile Pop $G_SSL_FILEURL StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL Push $G_PLS_FIELD_1 Call PFI_StrBackSlash Call PFI_GetParent Pop $G_PLS_FIELD_2 StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2 IntOp $G_PLS_FIELD_2 $G_PLS_FIELD_2 + 1 StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1" "" $G_PLS_FIELD_2 StrCpy $G_PLS_FIELD_2 "$G_SSL_FILEURL" $G_PLS_FIELD_2 DetailPrint "" DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" NSISdl::download ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" Pop $G_PLS_FIELD_2 StrCmp $G_PLS_FIELD_2 "success" file_received SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_1)" SetDetailsPrint listonly DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_NSISDLFAIL_1)${MB_NL}$(PFI_LANG_MB_NSISDLFAIL_2)" SetDetailsPrint listonly DetailPrint "" !ifdef ADDSSL Call PFI_GetDateTimeStamp Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------------" DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" DetailPrint "----------------------------------------------------" Abort !endif file_received: FunctionEnd #-------------------------------------------------------------------------- # End of 'getssl.nsh' #-------------------------------------------------------------------------- |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 19:38:40
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16413 Modified Files: Tag: b0_22_2 Makefile vars.mak Log Message: Update copyright and version number Index: vars.mak =================================================================== RCS file: /cvsroot/popfile/engine/vars.mak,v retrieving revision 1.11 retrieving revision 1.11.4.1 diff -C2 -d -r1.11 -r1.11.4.1 *** vars.mak 19 Dec 2004 01:07:36 -0000 1.11 --- vars.mak 13 Sep 2005 19:38:31 -0000 1.11.4.1 *************** *** 8,12 **** export POPFILE_MAJOR_VERSION=0 export POPFILE_MINOR_VERSION=22 ! export POPFILE_REVISION=2 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=3 export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION) POPFILE_VERSION_FILE=POPFile/popfile_version Index: Makefile =================================================================== RCS file: /cvsroot/popfile/engine/Makefile,v retrieving revision 1.41 retrieving revision 1.41.4.1 diff -C2 -d -r1.41 -r1.41.4.1 *** Makefile 19 Dec 2004 01:07:36 -0000 1.41 --- Makefile 13 Sep 2005 19:38:31 -0000 1.41.4.1 *************** *** 63,67 **** winexe: popfile.exe popfileb.exe popfilef.exe popfileib.exe popfileif.exe trayicon.ico ../windows/POPFileIcon/popfile.ico popfile-service.exe ! COMMON_EXE_OPTIONS = --exe $@ --force --clean --dependent --xclude --icon ../windows/POPFileIcon/popfile.ico --icon trayicon.ico --script $< --info CompanyName="The POPFile Project" --info LegalCopyright="Copyright (c) 2003 John Graham-Cumming" --info ProductName=POPFile --info ProductVersion=$(POPFILE_VERSION).0 --info FileDescription=POPFile --info FileVersion=$(POPFILE_VERSION).0 ifeq ($(EXE_DEBUG),1) COMMON_EXE_OPTIONS += --debug --- 63,67 ---- winexe: popfile.exe popfileb.exe popfilef.exe popfileib.exe popfileif.exe trayicon.ico ../windows/POPFileIcon/popfile.ico popfile-service.exe ! COMMON_EXE_OPTIONS = --exe $@ --force --clean --dependent --xclude --icon ../windows/POPFileIcon/popfile.ico --icon trayicon.ico --script $< --info CompanyName="The POPFile Project" --info LegalCopyright="Copyright (c) 2003-2005 John Graham-Cumming" --info ProductName=POPFile --info ProductVersion=$(POPFILE_VERSION).0 --info FileDescription=POPFile --info FileVersion=$(POPFILE_VERSION).0 ifeq ($(EXE_DEBUG),1) COMMON_EXE_OPTIONS += --debug |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 19:06:56
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8380 Modified Files: Tag: b0_22_2 adduser.nsi installer.nsi adduser-Version.nsh installer-SecPOPFile-body.nsh installer-Uninstall.nsh Log Message: Commit Brian's two patches to the v0.22.3 installer Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** installer-SecPOPFile-body.nsh 13 Sep 2005 19:01:55 -0000 1.3.2.2 --- installer-SecPOPFile-body.nsh 13 Sep 2005 19:06:48 -0000 1.3.2.3 *************** *** 253,256 **** --- 253,259 ---- File "..\engine\favicon.ico" + File "..\engine\pix.gif" + File "..\engine\otto.png" + SetOutPath "$G_ROOTDIR\Classifier" File "..\engine\Classifier\Bayes.pm" Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.1 retrieving revision 1.242.4.2 diff -C2 -d -r1.242.4.1 -r1.242.4.2 *** installer.nsi 13 Sep 2005 19:01:55 -0000 1.242.4.1 --- installer.nsi 13 Sep 2005 19:06:48 -0000 1.242.4.2 *************** *** 468,475 **** ;---------------------------------------------------------------- ! ; Same "Language selection" dialog is used for the installer and the uninstaller ! ; so we override the standard "Installer Language" title to avoid confusion. ! !define MUI_LANGDLL_WINDOWTITLE "Language Selection" ; Always show the language selection dialog, even if a language has been stored in the --- 468,474 ---- ;---------------------------------------------------------------- ! ; Override the standard "Installer Language" title for the language selection dialogue ! !define MUI_LANGDLL_WINDOWTITLE "POPFile Installer Language Selection" ; Always show the language selection dialog, even if a language has been stored in the Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.1 retrieving revision 1.59.4.2 diff -C2 -d -r1.59.4.1 -r1.59.4.2 *** adduser.nsi 13 Sep 2005 18:56:55 -0000 1.59.4.1 --- adduser.nsi 13 Sep 2005 19:06:48 -0000 1.59.4.2 *************** *** 1810,1814 **** FileWrite ${L_FILEHANDLE} "REM Debug command: Start POPFile in foreground using 'popfile.pl'${MB_NL}" FileWrite ${L_FILEHANDLE} "${MB_NL}" ! FileWrite ${L_FILEHANDLE} "$\"%POPFILE_ROOT%\perl.exe$\" $\"%POPFILE_ROOT%\popfile.pl$\" --verbose${MB_NL}" FileWrite ${L_FILEHANDLE} "goto exit${MB_NL}" FileWrite ${L_FILEHANDLE} "${MB_NL}" --- 1810,1814 ---- FileWrite ${L_FILEHANDLE} "REM Debug command: Start POPFile in foreground using 'popfile.pl'${MB_NL}" FileWrite ${L_FILEHANDLE} "${MB_NL}" ! FileWrite ${L_FILEHANDLE} "$\"%POPFILE_ROOT%\perl.exe$\" $\"%POPFILE_ROOT%\popfile.pl$\"${MB_NL}" FileWrite ${L_FILEHANDLE} "goto exit${MB_NL}" FileWrite ${L_FILEHANDLE} "${MB_NL}" *************** *** 3352,3356 **** SetOutPath $G_ROOTDIR ClearErrors ! Exec '"$G_ROOTDIR\popfile.exe" --verbose' IfErrors 0 startup_ok StrCmp ${L_CONSOLE} "f" error_msg --- 3352,3356 ---- SetOutPath $G_ROOTDIR ClearErrors ! Exec '"$G_ROOTDIR\popfile.exe"' IfErrors 0 startup_ok StrCmp ${L_CONSOLE} "f" error_msg Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** adduser-Version.nsh 13 Sep 2005 19:01:55 -0000 1.6.2.2 --- adduser-Version.nsh 13 Sep 2005 19:06:48 -0000 1.6.2.3 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.72.6" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.73" #-------------------------------------------------------------------------- Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** installer-Uninstall.nsh 13 Sep 2005 19:01:55 -0000 1.4.2.2 --- installer-Uninstall.nsh 13 Sep 2005 19:06:48 -0000 1.4.2.3 *************** *** 61,64 **** --- 61,69 ---- ; (if the language entry is not found in the registry, a 'language selection' dialog is shown) + ; Use a different "Language selection" dialog title for the uninstaller + + !undef MUI_LANGDLL_WINDOWTITLE + !define MUI_LANGDLL_WINDOWTITLE "POPFile Uninstaller Language Selection" + !insertmacro MUI_UNGETLANGUAGE |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 19:05:43
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8196/test Added Files: Tag: b0_22_2 pfidbstatus.nsi Log Message: Add new module and update Makefile to build it --- NEW FILE: pfidbstatus.nsi --- #------------------------------------------------------------------------------------------- # # pfidbstatus.nsi --- A simple utility to check the status and integrity of POPFile's SQLite # database using the SQLite command-line utility. # # SQLite 2.x and 3.x database files are not compatible therefore separate # command-line utilities have to be used: sqlite.exe for 2.x format files # and sqlite3.exe for 3.x format files. # # NOTE: sqlite.exe v2.8.12 causes GPFs when called by the 'nsExec' plug-in # to execute SQL from the command-line so this utility checks the # sqlite.exe version number before trying to execute any SQL. # # Copyright (c) 2005 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 the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # 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 #------------------------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Compile-time command-line switches (used by 'makensis.exe') #-------------------------------------------------------------------------- # # /DCTS_INTEGRATED # # This script can build either an 'integrated' version of the utility which will be included # in the main POPFile installer or a 'stand-alone' version of the utility which can be used # with POPFile 0.21.0 or a later version. # # Since the 'integrated' version will be installed at the same time as a compatible version # of the SQLite utility there is no need to include a compatible SQLite utility. When the # '/DCTS_INTEGRATED' compile-time switch is supplied, the SQLite utility will not be included # so the resulting executable file will be smaller (typically 79 KB instead of 208 KB). # # By default the SQLite utility is included when this utility is built. # #-------------------------------------------------------------------------- #------------------------------------------------------------------------------------------- # Usage (one optional parameter): # # pfidbstatus # or pfidbstatus database_filename # # Normally 'database_filename' will simply be the default SQLite database filename, popfile.db. # # If this utility is used via a Start Menu shortcut created by the 'POPFile User Data' wizard # (setupuser.exe) then the parameter will be '/REGISTRY' which forces the utility to use the # registry data to find the database file (if the registry data does not exist, it exits). # # If no parameter is given the utility makes several attempts to find the database file: # # (1) If the default SQLite database file (popfile.db) is found in the current folder then # it is assumed that this is the database to be checked. # # (2) If the default SQLite database file (popfile.db) is found in the same folder as the # utility then it is assumed that this is the database to be checked. # # (3) If the POPFILE_USER environment variable has been defined and the POPFile configuration # file (popfile.cfg) is found in the specified folder then the name and location of the # SQLite database file is extracted. # # (4) If the POPFILE_USER environment variable has been defined and the specified folder exists # but the name and location of the SQLite database file cannot be determined, the utility # looks for the default SQLite database file (popfile.db) in that folder. # # (5) If the 'User Data' folder location is specified in the Registry, the folder exists and # the POPFile configuration file (popfile.cfg) is found there then the name and location # of the SQLite database file is extracted. # # (6) If the 'User Data' folder location is specified in the Registry and the folder exists # but the name and location of the SQLite database file cannot be determined, the utility # looks for the default SQLite database file (popfile.db) in that folder. # # (7) The search is abandoned if the above steps fail to find the database (the utility exits). # # NOTE: Priority is given to the current folder and the folder containing the utility to make # it easy to use the utility (e.g. just put it in the same folder as the popfile.db file) # #------------------------------------------------------------------------------------------- ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download !define ${NSIS_VERSION}_found !ifndef v2.0_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ $\r$\n*** This script has only been tested using the NSIS 2.0 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 ;-------------------------------------------------------------------------- ; 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) ;-------------------------------------------------------------------------- !define C_VERSION "0.0.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" ; The default NSIS caption is "Name Setup" so we override it here !ifdef CTS_INTEGRATED Name "POPFile SQLite Database Status Check (integrated)" Caption "POPFile SQLite Database Status Check ${C_VERSION} (integrated)" !else Name "POPFile SQLite Database Status Check (stand-alone)" Caption "POPFile SQLite Database Status Check ${C_VERSION} (stand-alone)" !endif ; Specify EXE filename and icon for the 'installer' OutFile "${C_OUTFILE}" Icon "..\POPFileIcon\popfile.ico" #-------------------------------------------------------------------------- # Use the "Modern User Interface" #-------------------------------------------------------------------------- !include "MUI.nsh" #-------------------------------------------------------------------------- # Include private library functions and macro definitions #-------------------------------------------------------------------------- ; Avoid compiler warnings by disabling the functions and definitions we do not use !define DBSTATUS !include "..\pfi-library.nsh" #-------------------------------------------------------------------------- ; '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" !ifdef CTS_INTEGRATED VIAddVersionKey "ProductName" "POPFile SQLite Database Status Check (integrated version)" !else VIAddVersionKey "ProductName" "POPFile SQLite Database Status Check (stand-alone version)" !endif VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" VIAddVersionKey "FileDescription" "Check the status of POPFile's SQLite database" VIAddVersionKey "FileVersion" "${C_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" 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_WINUSERNAME ; current Windows user login name Var G_DATADIR ; folder path where we expect to find the SQLite database file Var G_DATABASE ; holds name (and possibly path) to the SQLite database Var G_SQLITEUTIL ; name of the appropriate SQLite command-line utility Var G_DBFORMAT ; SQLite database format ('2.x', '3.x' or an error string) Var G_DBSCHEMA ; SQLite database schema ( a number like '12' or an error string) Var G_PLS_FIELD_1 ; used to customize language strings Var G_PLS_FIELD_2 ; used to customize language strings #-------------------------------------------------------------------------- # Configure the MUI pages #-------------------------------------------------------------------------- ;---------------------------------------------------------------- ; Interface Settings - General Interface Settings ;---------------------------------------------------------------- ; The icon file for the utility !define MUI_ICON "..\POPFileIcon\popfile.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "..\hdr-common.bmp" !define MUI_HEADERIMAGE_RIGHT ;---------------------------------------------------------------- ; Interface Settings - Interface Resource Settings ;---------------------------------------------------------------- ; The banner provided by the default 'modern.exe' UI does not provide much room for the ; two lines of text, e.g. the German version is truncated, so we use a custom UI which ; provides slightly wider text areas. Each area is still limited to a single line of text. !define MUI_UI "..\UI\pfi_modern.exe" ; The 'hdr-common.bmp' logo is only 90 x 57 pixels, much smaller than the 150 x 57 pixel ; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which ; leaves more room for the TITLE and SUBTITLE text. !define MUI_UI_HEADERIMAGE_RIGHT "..\UI\pfi_headerbmpr.exe" ;---------------------------------------------------------------- ; Interface Settings - Installer Finish Page Interface Settings ;---------------------------------------------------------------- ; Show the installation log and leave the window open when utility has completed its work ShowInstDetails show !define MUI_FINISHPAGE_NOAUTOCLOSE #-------------------------------------------------------------------------- # Define the Page order for the utility #-------------------------------------------------------------------------- ;--------------------------------------------------- ; Installer Page - Install files ;--------------------------------------------------- ; Override standard "Installing..." page header !define MUI_PAGE_HEADER_TEXT "$(DBS_LANG_STD_HDR)" !define MUI_PAGE_HEADER_SUBTEXT "$(DBS_LANG_STD_SUBHDR)" ; Override the standard "Installation complete..." page header !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "$(DBS_LANG_END_HDR)" !define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "$(DBS_LANG_END_SUBHDR)" ; Override the standard "Installation Aborted..." page header !define MUI_INSTFILESPAGE_ABORTHEADER_TEXT "$(DBS_LANG_ABORT_HDR)" !define MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT "$(DBS_LANG_ABORT_SUBHDR)" !insertmacro MUI_PAGE_INSTFILES #-------------------------------------------------------------------------- # Language Support for the utility #-------------------------------------------------------------------------- !insertmacro MUI_LANGUAGE "English" ;-------------------------------------------------------------------------- ; Current build only supports English and uses local strings ; instead of language strings from languages\*-pfi.nsh files ;-------------------------------------------------------------------------- !macro DBS_TEXT NAME VALUE LangString ${NAME} ${LANG_ENGLISH} "${VALUE}" !macroend !insertmacro DBS_TEXT DBS_LANG_STD_HDR "POPFile SQLite Database Status Check" !insertmacro DBS_TEXT DBS_LANG_STD_SUBHDR "Please wait while the database status is checked" !insertmacro DBS_TEXT DBS_LANG_END_HDR "POPFile SQLite Database Status Check" !insertmacro DBS_TEXT DBS_LANG_END_SUBHDR "To save the report, use right-click in the message window,${MB_NL}copy to the clipboard then paste the report into a text file" !insertmacro DBS_TEXT DBS_LANG_ABORT_HDR "POPFile SQLite Database Status Check Failed" !insertmacro DBS_TEXT DBS_LANG_ABORT_SUBHDR "Problem detected - see error report in window below" !insertmacro DBS_TEXT DBS_LANG_RIGHTCLICK "Right-click in the window below to copy the report to the clipboard" !insertmacro DBS_TEXT DBS_LANG_NOCONFIGDATA "POPFile is not configured for the '$G_WINUSERNAME' user" !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND_1 "Unable to find the '$G_DATABASE' file (the SQLite database)" !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND_2 "(looked in '$G_PLS_FIELD_1' folder)" !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND "$(DBS_LANG_DBNOTFOUND_1)${MB_NL}${MB_NL}$(DBS_LANG_DBNOTFOUND_2)" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_1 "No SQLite database filename specified." !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_2 "Usage: $G_PLS_FIELD_1 <database>" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_3 " e.g. $G_PLS_FIELD_1 popfile.db" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_4 " e.g. $G_PLS_FIELD_1 C:\Program Files\POPFile\popfile.db" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_5 " e.g. $G_PLS_FIELD_1 /REGISTRY" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM "$(DBS_LANG_NODBPARAM_1)${MB_NL}${MB_NL}$(DBS_LANG_NODBPARAM_2)${MB_NL}$(DBS_LANG_NODBPARAM_3)${MB_NL}$(DBS_LANG_NODBPARAM_4)${MB_NL}$(DBS_LANG_NODBPARAM_5)" !insertmacro DBS_TEXT DBS_LANG_OPENERR "unable to open file" !insertmacro DBS_TEXT DBS_LANG_DBIDENTIFIED "The '$G_DATABASE' file is a SQLite $G_DBFORMAT database" !insertmacro DBS_TEXT DBS_LANG_UTILNOTFOUND_1 "Unable to find the '$G_SQLITEUTIL' file (the SQLite $G_DBFORMAT utility)" !insertmacro DBS_TEXT DBS_LANG_UTILNOTFOUND_2 "(looked in '$G_PLS_FIELD_1' folder, 'POPFILE_ROOT' and Registry)" !insertmacro DBS_TEXT DBS_LANG_UTILNOTFOUND "$(DBS_LANG_UTILNOTFOUND_1)${MB_NL}${MB_NL}$(DBS_LANG_UTILNOTFOUND_2)" !insertmacro DBS_TEXT DBS_LANG_STARTERROR "Unable to start the '$G_SQLITEUTIL' utility" !insertmacro DBS_TEXT DBS_LANG_VERSIONERROR "Error: Unable to determine the '$G_SQLITEUTIL' utility's version number" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFMT_1 "Unable to tell if '$G_DATABASE' is a SQLite database file" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFMT_2 "File format not known $G_DBFORMAT" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFMT_3 "Please shutdown POPFile before using this utility" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFORMAT "$(DBS_LANG_UNKNOWNFMT_1)${MB_NL}${MB_NL}$(DBS_LANG_UNKNOWNFMT_2)${MB_NL}${MB_NL}$(DBS_LANG_UNKNOWNFMT_3)" !insertmacro DBS_TEXT DBS_LANG_NOSQLITE_1 "Error: POPFile not configured to use SQLite" !insertmacro DBS_TEXT DBS_LANG_NOSQLITE_2 "(see the configuration data in '$G_DATADIR')" !insertmacro DBS_TEXT DBS_LANG_NOSQLITE "$(DBS_LANG_NOSQLITE_1)${MB_NL}${MB_NL}$(DBS_LANG_NOSQLITE_2))" !insertmacro DBS_TEXT DBS_LANG_CURRENT_USER "Current user : $G_WINUSERNAME" !insertmacro DBS_TEXT DBS_LANG_CURRENT_DIR "Current folder: $INSTDIR" !insertmacro DBS_TEXT DBS_LANG_UTILITY_DIR "Utility folder: $EXEDIR" !insertmacro DBS_TEXT DBS_LANG_COMMANDLINE "Command line : $G_DATABASE" !insertmacro DBS_TEXT DBS_LANG_NOCOMMANDLINE "Searching for database because no command-line parameter supplied" !insertmacro DBS_TEXT DBS_LANG_TRY_ENV_VAR "Trying to find database using POPFILE_USER environment variable" !insertmacro DBS_TEXT DBS_LANG_ENV_VAR_VAL "'User Data' folder (from POPFILE_USER) = $G_DATADIR" !insertmacro DBS_TEXT DBS_LANG_NOT_ENV_VAR "Unable to find database using POPFILE_USER environment variable" !insertmacro DBS_TEXT DBS_LANG_TRY_HKCU_REG "Trying to find database using registry data (HKCU)" !insertmacro DBS_TEXT DBS_LANG_HKCU_REG_VAL "'User Data' folder (from HKCU entry) = $G_DATADIR" !insertmacro DBS_TEXT DBS_LANG_NOT_HKCU_REG "Unable to find database using registry data (HKCU)" !insertmacro DBS_TEXT DBS_LANG_HKCU_INVALID "Error: No POPFile registry data found for '$G_WINUSERNAME' user" !insertmacro DBS_TEXT DBS_LANG_TRY_CURRENT "Trying to find database (popfile.db) in current folder" !insertmacro DBS_TEXT DBS_LANG_NOT_CURRENT "Unable to find database (popfile.db) in current folder" !insertmacro DBS_TEXT DBS_LANG_TRY_EXEDIR "Trying to find database (popfile.db) in same folder as utility" !insertmacro DBS_TEXT DBS_LANG_NOT_EXEDIR "Unable to find database (popfile.db) in same folder as utility" !insertmacro DBS_TEXT DBS_LANG_SEARCHING "..." !insertmacro DBS_TEXT DBS_LANG_FOUNDIT "... found it!" !insertmacro DBS_TEXT DBS_LANG_DIRNOTFILE "Error: '$G_DATABASE' is a folder, not a database file" !insertmacro DBS_TEXT DBS_LANG_CHECKTHISONE "POPFile database found ($G_DATABASE)" !insertmacro DBS_TEXT DBS_LANG_DBFORMAT "Database is in SQLite $G_DBFORMAT format" !insertmacro DBS_TEXT DBS_LANG_DBFORMATSCHEMA "$(DBS_LANG_DBFORMAT) and uses POPFile schema version $G_DBSCHEMA" !insertmacro DBS_TEXT DBS_LANG_DBSCHEMAERROR "SQLite error detected when extracting POPFile schema version:" !insertmacro DBS_TEXT DBS_LANG_SQLITEUTIL "SQLite $G_PLS_FIELD_2 utility found in $G_PLS_FIELD_1" !ifdef CTS_INTEGRATED !insertmacro DBS_TEXT DBS_LANG_BUILTINUTIL "not compatible with this 'integrated' version (use 'stand-alone' version or newer sqlite.exe)" !else !insertmacro DBS_TEXT DBS_LANG_BUILTINUTIL "not compatible with this utility (using 'built-in' SQLite $G_PLS_FIELD_2 instead)" !endif !insertmacro DBS_TEXT DBS_LANG_SQLITECOMMAND "Result of running the 'pragma integrity_check;' command:" !insertmacro DBS_TEXT DBS_LANG_SQLITEDBISOK "The POPFile database has passed the SQLite integrity check!" !insertmacro DBS_TEXT DBS_LANG_SQLITEFAIL "Error: The SQLite utility returned error code $G_PLS_FIELD_1" ;------------------------------------------------------------------------ ; Macro to make it easy to delete the last row in the details window ;------------------------------------------------------------------------ !macro DELETE_LAST_ENTRY Push $0 Call GetDetailViewItemCount Pop $0 IntOp $0 $0 - 1 ; decrement to get the right index of last entry Push $0 Call DeleteDetailViewItem Pop $0 !macroend ;-------------------------------------------------------------------------- ;------------------------------ ; Section: CheckSQLiteDatabase ;------------------------------ Section CheckSQLiteDatabase !define L_TEMP $R9 SetDetailsPrint textonly DetailPrint "$(DBS_LANG_RIGHTCLICK)" SetDetailsPrint listonly DetailPrint "------------------------------------------------------------" DetailPrint "$(^Name) v${C_VERSION}" DetailPrint "------------------------------------------------------------" DetailPrint "" ClearErrors UserInfo::GetName IfErrors default_name Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 check_input default_name: StrCpy $G_WINUSERNAME "UnknownUser" check_input: ; Set OutPath to the working directory (to cope with cases where no database path is supplied) GetFullPathName $INSTDIR ".\" SetDetailsPrint none SetOutPath "$INSTDIR" SetDetailsPrint listonly DetailPrint "$(DBS_LANG_CURRENT_USER)" DetailPrint "$(DBS_LANG_CURRENT_DIR)" StrCmp "$INSTDIR" "$EXEDIR" check_command_line DetailPrint "$(DBS_LANG_UTILITY_DIR)" check_command_line: ; The command-line can be used to supply the name of a database file in the current folder ; (e.g. mydata.db), a relative filename for the database file (e.g. ..\data\mydata.db) or ; the full pathname for the database file (D:\Application Data\POPFile\popfile.db). Call PFI_GetParameters Pop $G_DATABASE StrCmp $G_DATABASE "" check_currentdir DetailPrint "$(DBS_LANG_COMMANDLINE)" StrCmp $G_DATABASE "/REGISTRY" 0 lookforfile DetailPrint "" Goto use_registry check_currentdir: DetailPrint "" DetailPrint "$(DBS_LANG_NOCOMMANDLINE)" DetailPrint "" DetailPrint "$(DBS_LANG_TRY_CURRENT)$(DBS_LANG_SEARCHING)" StrCpy $G_DATABASE "popfile.db" IfFileExists "$INSTDIR\$G_DATABASE" found_in_current !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_CURRENT)" StrCmp "$INSTDIR" "$EXEDIR" try_env_var DetailPrint "$(DBS_LANG_TRY_EXEDIR)$(DBS_LANG_SEARCHING)" IfFileExists "$EXEDIR\$G_DATABASE" found_in_exedir !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_EXEDIR)" try_env_var: DetailPrint "$(DBS_LANG_TRY_ENV_VAR)$(DBS_LANG_SEARCHING)" ReadEnvStr $G_DATADIR "POPFILE_USER" StrCmp $G_DATADIR "" try_registry Push $G_DATADIR Call PFI_GetCompleteFPN Pop $G_DATADIR !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_ENV_VAR_VAL)" IfFileExists "$G_DATADIR\*.*" 0 try_registry Push $G_DATADIR Call PFI_GetSQLdbPathName Pop $G_DATABASE StrCmp $G_DATABASE "Not SQLite" sqlite_not_used StrCmp $G_DATABASE "" 0 check_env_file_exists StrCpy $G_DATABASE "$G_DATADIR\popfile.db" check_env_file_exists: IfFileExists "$G_DATABASE" 0 try_registry !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_ENV_VAR)$(DBS_LANG_FOUNDIT)" Goto split_path try_registry: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_ENV_VAR)" use_registry: DetailPrint "$(DBS_LANG_TRY_HKCU_REG)$(DBS_LANG_SEARCHING)" ReadRegStr $G_DATADIR HKCU "Software\POPFile Project\POPFile\MRI" "Owner" StrCmp $G_DATADIR $G_WINUSERNAME same_owner !insertmacro DELETE_LAST_ENTRY StrCmp $G_DATABASE "/REGISTRY" no_reg_data DetailPrint "" no_reg_data: DetailPrint "$(DBS_LANG_HKCU_INVALID)" Goto usage_msg same_owner: ReadRegStr $G_DATADIR HKCU "Software\POPFile Project\POPFile\MRI" "UserDir_LFN" StrCmp $G_DATADIR "" abandon_search !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_HKCU_REG_VAL)" IfFileExists "$G_DATADIR\*.*" 0 abandon_search Push $G_DATADIR Call PFI_GetSQLdbPathName Pop $G_DATABASE StrCmp $G_DATABASE "Not SQLite" sqlite_not_used StrCmp $G_DATABASE "" 0 check_reg_file_exists StrCpy $G_DATABASE "$G_DATADIR\popfile.db" check_reg_file_exists: IfFileExists "$G_DATABASE" 0 abandon_search !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_HKCU_REG)$(DBS_LANG_FOUNDIT)" Goto split_path sqlite_not_used: DetailPrint "" DetailPrint "$(DBS_LANG_NOSQLITE_1)" DetailPrint "$(DBS_LANG_NOSQLITE_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_NOSQLITE)" Goto error_exit abandon_search: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_HKCU_REG)" StrCpy $G_PLS_FIELD_1 "$INSTDIR" Goto give_up found_in_current: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_CURRENT)$(DBS_LANG_FOUNDIT)" Goto lookforfile found_in_exedir: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_EXEDIR)$(DBS_LANG_FOUNDIT)" StrCpy $INSTDIR $EXEDIR lookforfile: Push $INSTDIR Push $G_DATABASE Call PFI_GetDataPath Pop $G_DATABASE split_path: Push $G_DATABASE Call PFI_GetParent Pop $G_PLS_FIELD_1 StrLen ${L_TEMP} $G_PLS_FIELD_1 IntOp ${L_TEMP} ${L_TEMP} + 1 StrCpy $G_DATABASE $G_DATABASE "" ${L_TEMP} IfFileExists "$G_PLS_FIELD_1\$G_DATABASE" continue give_up: DetailPrint "" DetailPrint "$(DBS_LANG_DBNOTFOUND_1)" DetailPrint "$(DBS_LANG_DBNOTFOUND_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_DBNOTFOUND)" usage_msg: ; Ensure the correct program name appears in the 'usage' message added to the log. ; The first system call gets the full pathname (returned in $R0) and the second call ; extracts the filename (and possibly the extension) part (result returned in $R1) Push $R0 Push $R1 System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)' System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)' StrCpy $G_PLS_FIELD_1 $R1 Pop $R1 Pop $R0 DetailPrint "" DetailPrint "$(DBS_LANG_NODBPARAM_2)" DetailPrint "" DetailPrint "$(DBS_LANG_NODBPARAM_3)" DetailPrint "$(DBS_LANG_NODBPARAM_4)" DetailPrint "$(DBS_LANG_NODBPARAM_5)" Goto error_exit continue: StrCpy $G_DATABASE "$G_PLS_FIELD_1\$G_DATABASE" IfFileExists "$G_DATABASE\*.*" dir_not_file DetailPrint "" DetailPrint "$(DBS_LANG_CHECKTHISONE)" Push $G_DATABASE Call PFI_GetSQLiteFormat Pop $G_DBFORMAT StrCpy $G_SQLITEUTIL "sqlite.exe" StrCmp $G_DBFORMAT "2.x" look_for_util StrCpy $G_SQLITEUTIL "sqlite3.exe" StrCmp $G_DBFORMAT "3.x" look_for_util Push $G_DATABASE Call PFI_GetParent Pop $G_PLS_FIELD_1 StrLen ${L_TEMP} $G_PLS_FIELD_1 IntOp ${L_TEMP} ${L_TEMP} + 1 StrCpy $G_DATABASE $G_DATABASE "" ${L_TEMP} DetailPrint "" DetailPrint "$(DBS_LANG_UNKNOWNFMT_1)" DetailPrint "" DetailPrint "$(DBS_LANG_UNKNOWNFMT_2)" DetailPrint "" DetailPrint "$(DBS_LANG_UNKNOWNFMT_3)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_UNKNOWNFORMAT)" Goto error_exit look_for_util: StrCpy ${L_TEMP} "$EXEDIR" StrCpy $G_PLS_FIELD_1 "$EXEDIR" IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it ; It is not in "our" folder so try looking in the usual places ReadEnvStr ${L_TEMP} "POPFILE_ROOT" StrCmp ${L_TEMP} "" try_HKCU Push ${L_TEMP} Call PFI_GetCompleteFPN Pop ${L_TEMP} StrCmp ${L_TEMP} "" try_HKCU IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it try_HKCU: ReadRegStr ${L_TEMP} HKCU "Software\POPFile Project\POPFile\MRI" "RootDir_LFN" StrCmp ${L_TEMP} "" try_HKLM IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it try_HKLM: ReadRegStr ${L_TEMP} HKLM "Software\POPFile Project\POPFile\MRI" "RootDir_LFN" StrCmp ${L_TEMP} "" no_util IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it no_util: DetailPrint "" DetailPrint "$(DBS_LANG_DBIDENTIFIED)" DetailPrint "" DetailPrint "$(DBS_LANG_UTILNOTFOUND_1)" DetailPrint "$(DBS_LANG_UTILNOTFOUND_2)" MessageBox MB_OK|MB_ICONEXCLAMATION \ "$(DBS_LANG_DBIDENTIFIED)\ ${MB_NL}${MB_NL}${MB_NL}\ $(DBS_LANG_UTILNOTFOUND)" Goto error_exit run_it: StrCpy $G_PLS_FIELD_1 ${L_TEMP} nsExec::ExecToStack '"$G_PLS_FIELD_1\$G_SQLITEUTIL" -version' Pop ${L_TEMP} StrCmp ${L_TEMP} "error" start_error StrCmp ${L_TEMP} "timeout" start_error IntCmp ${L_TEMP} 1 0 version_error version_error Call PFI_TrimNewlines Pop $G_PLS_FIELD_2 StrCpy $G_PLS_FIELD_2 "v$G_PLS_FIELD_2" DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEUTIL)" StrCmp $G_PLS_FIELD_2 "v2.8.12" 0 use_it !ifdef CTS_INTEGRATED DetailPrint "$(DBS_LANG_BUILTINUTIL)" Goto error_exit !else ; sqlite.exe 2.8.12 causes a GPF when the 'nsExec' plugin uses it to execute a SQL command ; from the command-line so we have to use a more recent sqlite.exe utility if we detect the ; target system uses sqlite.exe 2.8.12 (sqlite.exe 2.8.13, 2.8.15 & 2.8.16 (the most recent ; version available as of 12 July 2005) are all safe to use here) SetDetailsPrint none File "/oname=$PLUGINSDIR\sqlite.exe" "sqlite_clu\sqlite.exe" StrCpy $G_PLS_FIELD_1 "$PLUGINSDIR" SetDetailsPrint listonly nsExec::ExecToStack '"$G_PLS_FIELD_1\sqlite.exe" -version' Pop ${L_TEMP} StrCmp ${L_TEMP} "error" start_error StrCmp ${L_TEMP} "timeout" start_error IntCmp ${L_TEMP} 1 0 version_error version_error Call PFI_TrimNewlines Pop $G_PLS_FIELD_2 StrCpy $G_PLS_FIELD_2 "v$G_PLS_FIELD_2" DetailPrint "$(DBS_LANG_BUILTINUTIL)" !endif use_it: nsExec::ExecToStack '"$G_PLS_FIELD_1\$G_SQLITEUTIL" "$G_DATABASE" "select version from popfile;"' Pop ${L_TEMP} Call PFI_TrimNewlines Pop $G_DBSCHEMA StrCmp ${L_TEMP} "0" schema_ok StrCpy $G_DBSCHEMA "($G_DBSCHEMA)" DetailPrint "" DetailPrint "$(DBS_LANG_DBFORMAT)" DetailPrint "" DetailPrint "$(DBS_LANG_DBSCHEMAERROR)" DetailPrint "$G_DBSCHEMA" Goto check_integrity schema_ok: DetailPrint "" DetailPrint "$(DBS_LANG_DBFORMATSCHEMA)" check_integrity: DetailPrint "" DetailPrint "$(DBS_LANG_SQLITECOMMAND)" nsExec::ExecToLog '"$G_PLS_FIELD_1\$G_SQLITEUTIL" "$G_DATABASE" "pragma integrity_check;"' Pop ${L_TEMP} StrCmp ${L_TEMP} "error" start_error StrCmp ${L_TEMP} "timeout" start_error IntCmp ${L_TEMP} 0 exit StrCpy $G_PLS_FIELD_1 ${L_TEMP} DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEFAIL)" Goto error_exit dir_not_file: DetailPrint "" DetailPrint "$(DBS_LANG_DIRNOTFILE)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_DIRNOTFILE)" Goto error_exit version_error: StrCpy $G_PLS_FIELD_2 "" DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEUTIL)" DetailPrint "" DetailPrint "$(DBS_LANG_VERSIONERROR)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_VERSIONERROR)" Goto error_exit start_error: DetailPrint "" DetailPrint "$(DBS_LANG_STARTERROR)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_STARTERROR)" error_exit: Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "(status check failed ${L_TEMP})" DetailPrint "------------------------------------------------------------" SetDetailsPrint none Abort exit: DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEDBISOK)" Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "(report finished ${L_TEMP})" DetailPrint "------------------------------------------------------------" SetDetailsPrint none ; Provide an instant snapshot summary by scrolling up to display the name and location ; of the POPFile SQLite database file we have just checked (the "report finished" block ; makes the database information scroll off the top of the list). Call HideFinalTimestamp !undef L_TEMP SectionEnd #-------------------------------------------------------------------------- # Functions used to manipulate the contents of the details view #-------------------------------------------------------------------------- ;------------------------------------------------------------------------ ; Constants used when accessing the details view ;------------------------------------------------------------------------ !define C_LVM_GETITEMCOUNT 0x1004 !define C_LVM_DELETEITEM 0x1008 !define C_LVM_ENSUREVISIBLE 0x1013 !define C_LVM_GETTOPINDEX 0x1027 #-------------------------------------------------------------------------- # Installer Function: GetDetailViewItemCount # # Returns the number of rows in the details view (on the INSTFILES page) # # Inputs: # none # # Outputs: # (top of stack) - number of rows in the details view window # # Usage: # # Call GetDetailViewItemCount # Pop $R9 # #-------------------------------------------------------------------------- Function GetDetailViewItemCount Push $1 FindWindow $1 "#32770" "" $HWNDPARENT GetDlgItem $1 $1 0x3F8 ; This is the Control ID of the details view SendMessage $1 ${C_LVM_GETITEMCOUNT} 0 0 $1 Exch $1 FunctionEnd #-------------------------------------------------------------------------- # Installer Function: DeleteDetailViewItem # # Deletes one row from the details view (on the INSTFILES page) # # Inputs: # (top of stack) - index number of the row to be deleted # # Outputs: # none # # Usage: # # Push $R9 # Call DeleteDetailViewItem # #-------------------------------------------------------------------------- Function DeleteDetailViewItem Exch $0 Push $1 FindWindow $1 "#32770" "" $HWNDPARENT GetDlgItem $1 $1 0x3F8 ; This is the Control ID of the details view SendMessage $1 ${C_LVM_DELETEITEM} $0 0 Pop $1 Pop $0 FunctionEnd #-------------------------------------------------------------------------- # Installer Function: HideFinalTimestamp # # Scrolls the details view up a little to provide an 'instant' summary. # # After a successful integrity check, the "report finished" timestamp causes the # location of the POPFile database file to scroll off the top of the details list # so we in effect scroll up a few lines to bring it back into view. # # The "report finished" timestamp can still be seen by scrolling down or saving # the entire report to a file via the clipboard. # # Inputs: # none # # Outputs: # none # # Usage: # Call HideFinalTimestamp # #-------------------------------------------------------------------------- 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 FunctionEnd ;-------------------------- ; End of 'pfidbstatus.nsi' ;-------------------------- |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 19:05:40
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8196 Modified Files: Tag: b0_22_2 Makefile Log Message: Add new module and update Makefile to build it Index: Makefile =================================================================== RCS file: /cvsroot/popfile/windows/Makefile,v retrieving revision 1.22 retrieving revision 1.22.4.1 diff -C2 -d -r1.22 -r1.22.4.1 *** Makefile 19 Dec 2004 01:07:59 -0000 1.22 --- Makefile 13 Sep 2005 19:05:32 -0000 1.22.4.1 *************** *** 60,63 **** --- 60,69 ---- @cd $(dir $@) ; makensis /v2 $(notdir $<) + test/pfidbstatus.exe: test/pfidbstatus.nsi test/pfinfo.ico + test/pfidbstatus.exe: hdr-common.bmp UI/pfi_headerbmpr.exe + test/pfidbstatus.exe: UI/pfi_modern.exe + test/pfidbstatus.exe: + @cd $(dir $@) ; makensis /v2 /DCTS_INTEGRATED $(notdir $<) + $(SETUP): installer.nsi ; @$(MAKENSIS) $(SETUP): $(ENGINE)/*.pl $(ENGINE)/POPFile/*.pm $(ENGINE)/Classifier/*.pm $(ENGINE)/Proxy/*.pm $(ENGINE)/UI/*.pm $(ENGINE)/Platform/MSWin32.pm $(ENGINE)/skins/*/*.css $(ENGINE)/skins/*/*.gif $(ENGINE)/skins/*/*.thtml $(ENGINE)/v$(POPFILE_VERSION).change *************** *** 67,71 **** $(SETUP): languages/*-pfi.nsh hdr-common.bmp special.bmp remove.ico $(SETUP): UI/pfi_headerbmpr.exe UI/pfi_modern.exe ! $(SETUP): test/pfidiag.exe $(RUNSQLITE) $(RUNPOPFILE): $(patsubst %.exe,%.nsi,$(RUNPOPFILE)) --- 73,77 ---- $(SETUP): languages/*-pfi.nsh hdr-common.bmp special.bmp remove.ico $(SETUP): UI/pfi_headerbmpr.exe UI/pfi_modern.exe ! $(SETUP): test/pfidbstatus.exe test/pfidiag.exe $(RUNSQLITE) $(RUNPOPFILE): $(patsubst %.exe,%.nsi,$(RUNPOPFILE)) |
11 messages has been excluded from this view by a project administrator.
