Menu
▾
▴
[popfile-commit] windows adduser.nsi,1.59.4.1,1.59.4.2 installer.nsi,1.242.4.1,1.242.4.2 adduser-Version.nsh,1.6.2.2,1.6.2.3 installer-SecPOPFile-body.nsh,1.3.2.2,1.3.2.3 installer-Uninstall.nsh,1.4.2.2,1.4.2.3
|
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 |
