From: Brian S. <xue...@us...> - 2005-07-12 12:13:20
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv727 Modified Files: pfi-library.nsh Log Message: Add support for the new "POPFile SQLite Database Status Check" utility and simplify some of the conditional compilation expressions. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** pfi-library.nsh 2 Mar 2005 19:57:09 -0000 1.62 --- pfi-library.nsh 12 Jul 2005 12:13:03 -0000 1.63 *************** *** 35,47 **** # (2) ADDUSER defined in adduser.nsi ('Add POPFile User' wizard) # (3) BACKUP defined in backup.nsi (POPFile 'User Data' Backup utility) ! # (4) INSTALLER defined in installer.nsi (the main installer program, setup.exe) ! # (5) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (6) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (7) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (8) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (9) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (10) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (11) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (12) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- --- 35,48 ---- # (2) ADDUSER defined in adduser.nsi ('Add POPFile User' wizard) # (3) BACKUP defined in backup.nsi (POPFile 'User Data' Backup utility) ! # (4) DBSTATUS defined in test\pfidbstatus.nsi (POPFile SQLite Database Status Check) ! # (5) INSTALLER defined in installer.nsi (the main installer program, setup.exe) ! # (6) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (7) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (8) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (9) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (10) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (11) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (12) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (13) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- *************** *** 57,61 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.7" #-------------------------------------------------------------------------- --- 58,62 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.8" #-------------------------------------------------------------------------- *************** *** 1527,1531 **** !macroend ! !ifdef ADDUSER | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN --- 1528,1532 ---- !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN *************** *** 1969,1973 **** !macroend ! !ifdef ADDUSER | BACKUP | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetDataPath --- 1970,1974 ---- !macroend ! !ifdef ADDUSER | BACKUP | DBSTATUS | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetDataPath *************** *** 2258,2262 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_GetDateTimeStamp --- 2259,2263 ---- !macroend ! !ifndef RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetDateTimeStamp *************** *** 2455,2459 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_GetLocalTime --- 2456,2460 ---- !macroend ! !ifndef RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetLocalTime *************** *** 2685,2689 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent --- 2686,2690 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent *************** *** 2986,2990 **** !macroend ! !ifdef ADDUSER #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLdbPathName --- 2987,2991 ---- !macroend ! !ifdef ADDUSER | DBSTATUS #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLdbPathName *************** *** 3108,3112 **** !macroend ! !ifdef ADDUSER | BACKUP | RUNSQLITE | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLiteFormat --- 3109,3113 ---- !macroend ! !ifdef ADDUSER | BACKUP | DBSTATUS | RUNSQLITE | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLiteFormat *************** *** 4045,4049 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_StrBackSlash --- 4046,4050 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_StrBackSlash *************** *** 4142,4146 **** !macroend ! !ifndef PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal --- 4143,4147 ---- !macroend ! !ifndef DBSTATUS & PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal *************** *** 4225,4229 **** !macroend ! !ifndef ADDSSL & MSGCAPTURE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr --- 4226,4230 ---- !macroend ! !ifndef ADDSSL & DBSTATUS & MSGCAPTURE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr *************** *** 4296,4300 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_TrimNewlines --- 4297,4301 ---- !macroend ! !ifndef MSGCAPTURE & PFIDIAG & RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_TrimNewlines |