Menu
▾
▴
[popfile-commit] windows adduser-EmailConfig.nsh,NONE,1.1 adduser-Uninstall.nsh,NONE,1.1 adduser-Version.nsh,NONE,1.1 adduser.nsi,1.72,1.73
|
From: Brian S. <xue...@us...> - 2005-03-02 19:50:29
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21184 Modified Files: adduser.nsi Added Files: adduser-EmailConfig.nsh adduser-Uninstall.nsh adduser-Version.nsh Log Message: Script now issues a warning if used with a compiler which has not been tested yet. Sometimes compilers fail to compile scripts developed with older versions and even if the script can be compiled the installer's behaviour may differ significantly. Replace the clumsy static "SFN Support" detection with improved dynamic detection based upon the destination selected by the user (no need to check the NTFS flag if the destination uses FAT). Better reporting of SFN problems (now using language strings). Improve the uninstaller's handling of the email settings. The Outlook and Outlook Express cases now check if the program is running (at last). Library items now use the "PFI_" prefix to help identify them. Divide the huge 'adduser.nsi' script into smaller files. (1) adduser.nsi - the master script for the 'Add POPFile User' wizard which uses the following 'include' files: (2) adduser-Version.nsh - the version number for the title bar of the 'Add POPFile User' wizard, the title bar of its uninstaller and the 'version information' for these two programs. (3) adduser-EmailConfig.nsh - source for all of the email client detection and account reconfiguration custom pages and associated functions. (4) adduser-Uninstall.nsh - source for all of the 'User Data' uninstaller. --- NEW FILE: adduser-Uninstall.nsh --- #-------------------------------------------------------------------------- # # adduser-Uninstall.nsh --- This 'include' file contains the 'Uninstall' part of the NSIS # script (adduser.nsi) used to build the 'Add POPFile User' wizard. # # 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. # [...1240 lines suppressed...] Exch ${L_MESSAGE} !undef L_INDEX !undef L_ININAME !undef L_PERSONA !undef L_POP_ACCOUNT !undef L_POP_LOGIN !undef L_POP_PORT !undef L_POP_SERVER !undef L_TEMP !undef L_UNDOFILE !undef L_USERNAME !undef L_USERTYPE !undef L_ERRORLOG FunctionEnd #-------------------------------------------------------------------------- # End of 'adduser-Uninstall.nsh' #-------------------------------------------------------------------------- --- NEW FILE: adduser-EmailConfig.nsh --- #-------------------------------------------------------------------------- # # adduser-EmailConfig.nsh --- This 'include' file contains all of the custom page and other # functions used by the 'Add POPFile User' wizard (adduser.nsi) # when offering to reconfigure email accounts. # # 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. [...2065 lines suppressed...] Abort exit: Pop ${L_USER} Pop ${L_SERVER} Pop ${L_PORT} Pop ${L_PERSONA} Pop ${L_EMAIL} !undef L_EMAIL !undef L_PERSONA !undef L_PORT !undef L_SERVER !undef L_USER FunctionEnd #-------------------------------------------------------------------------- # End of 'adduser-EmailConfig.nsh' #-------------------------------------------------------------------------- --- NEW FILE: adduser-Version.nsh --- #-------------------------------------------------------------------------- # # adduser-Version.nsh --- This 'include' file contains the version number which appears in # the title bar of the 'Add POPFile User' wizard (adduser.exe) and # its uninstaller (uninstalluser.exe). The same number also appears # in the 'Version Information' of these two executable files. #-------------------------------------------------------------------------- !define C_PFI_VERSION "0.2.69" #-------------------------------------------------------------------------- # End of 'adduser-Version.nsh' #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** adduser.nsi 18 Feb 2005 17:01:11 -0000 1.72 --- adduser.nsi 2 Mar 2005 19:50:18 -0000 1.73 *************** *** 27,34 **** # #-------------------------------------------------------------------------- - ; This version of the script has been tested with the "NSIS 2" compiler (final), - ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied. - ; ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date ; (if the default multi-language installer is compiled). --- 27,58 ---- # [...4184 lines suppressed...] *** 6766,6774 **** ; "English" text for the banner (otherwise the text would be unreadable garbage). ! !define L_RESULT $R9 ; The 'IsNT' function returns 0 if Win9x was detected Push ${L_RESULT} ! Call IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" show_banner --- 3611,3619 ---- ; "English" text for the banner (otherwise the text would be unreadable garbage). ! !define L_RESULT $R9 ; The 'PFI_IsNT' function returns 0 if Win9x was detected Push ${L_RESULT} ! Call PFI_IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" show_banner |
