Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22794
Modified Files:
Tag: b0_22_2
getssl.nsh
Log Message:
If the built-in PCF data is to be used the log file now
includes some extra information identifying the PCF data.
Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.6.2.20
retrieving revision 1.6.2.21
diff -C2 -d -r1.6.2.20 -r1.6.2.21
*** getssl.nsh 8 Feb 2008 14:48:48 -0000 1.6.2.20
--- getssl.nsh 9 Feb 2008 15:32:41 -0000 1.6.2.21
***************
*** 580,586 ****
--- 580,602 ----
File /nonfatal "/oname=$PLUGINSDIR\SSL_pm.pat" "..\SSL_pm.pat"
!endif
+
+ ; Ensure the patch control file uses CRLF as the EOL marker
+ ; (the file is used as an INI file so it is best for it to use CRLF instead of LF)
+
Push "${C_PATCH_CTRL_FILE}"
Call ${UN}EOL2CRLF
SetDetailsPrint listonly
+
+ ; Record information about the built-in Patch Control File in the installer log
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $G_PLS_FIELD_1 "${C_PATCH_CTRL_FILE}" "Settings" "POPFileVersion"
+ !insertmacro MUI_INSTALLOPTIONS_READ $G_PLS_FIELD_2 "${C_PATCH_CTRL_FILE}" "Settings" "PatchIssue"
+ DetailPrint "POPFile $G_PLS_FIELD_1 Patch Control File (issue $G_PLS_FIELD_2) [*** Built-in version ***]"
+ !insertmacro MUI_INSTALLOPTIONS_READ $G_PLS_FIELD_1 "${C_PATCH_CTRL_FILE}" "Settings" "Comment"
+ StrCmp $G_PLS_FIELD_1 "" builtin_patch_count
+ DetailPrint "$G_PLS_FIELD_1"
+
+ builtin_patch_count:
+ DetailPrint ""
!insertmacro MUI_INSTALLOPTIONS_READ ${L_LISTSIZE} "${C_PATCH_CTRL_FILE}" "Settings" "NumberOfPatches"
StrCmp ${L_LISTSIZE} "0" 0 apply_patches
|
