[popfile-commit] windows CBP.nsh,1.17,1.18

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv21295

Modified Files:
	CBP.nsh 
Log Message:
New NSIS compiler removes the need for the UNC workaround.

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CBP.nsh	14 Jul 2003 09:45:43 -0000	1.17
--- CBP.nsh	21 Jul 2003 14:20:25 -0000	1.18
***************
*** 12,19 ****
  # WARNING:
  #
! # This script requires a version of NSIS 2.0b4 (CVS) which meets the following requirement:
  #
! #   '{NSIS}\makensis.exe' dated 8 July 2003 @ 18:44 (NSIS CVS version 1.203) or later
! #   This is required to ensure 'language' strings can be combined with other strings.
  #----------------------------------------------------------------------------------------------
  
--- 12,22 ----
  # WARNING:
  #
! # This script requires a version of NSIS 2.0b4 (CVS) which meets the following requirements:
  #
! # (1) '{NSIS}\makensis.exe' dated 8 July 2003 @ 18:44 (NSIS CVS version 1.203) or later
! #     This is required to ensure 'language' strings can be combined with other strings.
! #
! # (2) '{NSIS}\makensis.exe' dated 21 July 2003 @ 06:44 (NSIS CVS version 1.214) or later
! #     This is required to avoid spurious error messages when creating buckets with UNC paths.
  #----------------------------------------------------------------------------------------------
  
***************
*** 422,426 ****
    !define CBP_L_NAME          $R3    ; used when checking the corpus directory
    !define CBP_L_PTR           $R2    ; used to access the names in the bucket list
-   !define CBP_L_UNC           $R1    ; used to detect UNC-format 'corpus' paths
  
    Exch ${CBP_L_COUNT}         ; get number of buckets to be created
--- 425,428 ----
***************
*** 434,438 ****
    Push ${CBP_L_NAME}
    Push ${CBP_L_PTR}
-   Push ${CBP_L_UNC}
  
    ; Retrieve the corpus path (as determined by CBP_CheckCorpusStatus)
--- 436,439 ----
***************
*** 441,446 ****
        "CBP Data" "CorpusPath"
  
-   StrCpy ${CBP_L_UNC} ${CBP_L_CORPUS} 2   ; will be "\\" for UNC-format paths
- 
    ; Now we create the buckets selected by the user. At present this code is only executed
    ; for a "fresh" install, one where there are no corpus files, so we can simply create a
--- 442,445 ----
***************
*** 473,480 ****
    FileWrite ${CBP_L_FILE_HANDLE} "__CORPUS__ __VERSION__ 1$\r$\n"
    FileClose ${CBP_L_FILE_HANDLE}
-   StrCmp ${CBP_L_UNC} "\\" ignore_errors
    IfErrors  incrm_ptr
- 
- ignore_errors:
    IntOp ${CBP_L_COUNT} ${CBP_L_COUNT} - 1
  
--- 472,476 ----
***************
*** 484,488 ****
  
  finished_now:
-   Pop ${CBP_L_UNC}
    Pop ${CBP_L_PTR}
    Pop ${CBP_L_NAME}
--- 480,483 ----
***************
*** 503,507 ****
    !undef CBP_L_NAME
    !undef CBP_L_PTR
-   !undef CBP_L_UNC
  
  FunctionEnd
--- 498,501 ----