Handle chrome.dll.pdb properly when incremental_chrome_dll is set.

tools/win/copy-installer.bat

 ECHO OFF
 
 REM Copyright (c) 2012 The Chromium Authors. All rights reserved.
 REM Use of this source code is governed by a BSD-style license that can be
 REM found in the LICENSE file.
 
 REM Copies an installer and symbols from a build directory on a network share
 REM into the directory \[out|build]\[Debug|Release] on the current drive.
 REM
 REM Usage:
@@ skipping 39 matching lines @@
 
 REM Figure out what files to copy based on the component type (shared/static).
 IF EXIST "%FROM%\base.dll" (
 SET TOCOPY=*.pdb setup.exe setup.exe.manifest chrome.packed.7z *.dll
 SET INSTALLER=setup.exe
 ) ELSE (
 SET TOCOPY=*.pdb mini_installer.exe
 SET INSTALLER=mini_installer.exe
 )
 
-REM Branch to handle copying via robocopy (fast) or xcopy (slow).
-robocopy /? 1> nul 2> nul
-IF "%ERRORLEVEL%"=="9009" GOTO _xcopy else GOTO _robocopy
+CALL :_copyfiles
 
-REM robocopy is rsync, basically.
-:_robocopy
-robocopy "%FROM%" "%TO%" %TOCOPY% /J /MT
-GOTO _copydone
+REM incremental_chrome_dll=1 puts chrome_dll.pdb into the "initial" dir.
+IF EXIST "%FROM%\initial" (
+SET FROM=%FROM%\initial
+SET TOCOPY=*.pdb
+CALL :_copyfiles
+)
 
-REM xcopy is not.
-:_xcopy
-IF NOT exist "%TO%" mkdir "%TO%"
-call :_xcopy_hack %TOCOPY%
-GOTO _copydone
-
-:_copydone
 ECHO Ready to run/debug %TO%\%INSTALLER%.
 GOTO :EOF
 
 REM All labels henceforth are subroutines intended to be invoked by CALL.
 
+REM Canonicalize the first argument, returning it in RET.
+:_canonicalize
+SET RET=%~f1
+GOTO :EOF
+
 REM Search for a mini_installer.exe in the candidate build outputs.
 :_find_build
 IF "%OUTPUT%"=="" (
 SET OUTPUTS=out build
 ) ELSE (
 SET OUTPUTS=%OUTPUT%
 SET OUTPUT=
 )
 
 IF "%BUILDTYPE%"=="" (
 SET BUILDTYPES=Debug Release
 ) ELSE (
 SET BUILDTYPES=%BUILDTYPE%
 SET BUILDTYPE=
 )
 
 FOR %%o IN (%OUTPUTS%) DO (
 FOR %%f IN (%BUILDTYPES%) DO (
 IF EXIST "%FROM%\%%o\%%f\mini_installer.exe" (
 SET OUTPUT=%%o
 SET BUILDTYPE=%%f
 GOTO :EOF
 )
 )
 )
 GOTO :EOF
 
+REM Branch to handle copying via robocopy (fast) or xcopy (slow).
+:_copyfiles
+robocopy /? 1> nul 2> nul
+IF NOT "%ERRORLEVEL%"=="9009" (
+robocopy "%FROM%" "%TO%" %TOCOPY% /J /MT /XX

[gab, 2012/08/03 18:16:49]

I'm not clear on what /XX does, from http://ss64.org/viewtopic.php?id=1370 it
doesn't seem to do much... (and the actual documentation is even more vague).

+) ELSE (
+IF NOT EXIST "%TO%" mkdir "%TO%"
+call :_xcopy_hack %TOCOPY%
+)
+GOTO :EOF
+
 REM We can't use a for..in..do loop since we have wildcards, so we make a call
 REM to this with the files to copy.
 :_xcopy_hack
 SHIFT
 IF "%0"=="" GOTO :EOF
-xcopy "%FROM%\%0" "%TO%" /y
+xcopy "%FROM%\%0" "%TO%" /d /y
 GOTO _xcopy_hack
-
-REM Canonicalize the first argument, returning it in RET.
-:_canonicalize
-SET RET=%~f1
-GOTO :EOF