Commita5c629f

committed

Avoid use of mixed slash style paths in arguments to xcopy in MSVC builds.

Some versions of xcopy, notably on Windows 7 don't like it. Backpatchto 8.3, where we first used xcopy.

1 parentbb3051e commita5c629fCopy full SHA for a5c629f

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -437,15 +437,17 @@ sub CopyIncludeFiles`
`437`	`437`	`my$D;`
`438`	`438`	`opendir($D,'src/include') \|\| croak"Could not opendir on src/include!\n";`
`439`	`439`
	`440`	`+# some xcopy progs don't like mixed slash style paths`
	`441`	`+(my$ctarget =$target) =~s!/!\\!g;`
`440`	`442`	`while (my$d =readdir($D))`
`441`	`443`	`{`
`442`	`444`	`nextif ($d =~/^\./);`
`443`	`445`	`nextif ($deq'.git');`
`444`	`446`	`nextif ($deq'CVS');`
`445`		`-nextunless (-d'src/include/' .$d);`
	`447`	`+nextunless (-d"src/include/$d");`
`446`	`448`
`447`		`- EnsureDirectories($target .'/include/server',$d);`
`448`		`-system("xcopy /s /i /q /r /y src\\include\\$d\\*.h\"$target\\include\\server\\$d\\\"")`
	`449`	`+ EnsureDirectories("$target/include/server/$d");`
	`450`	`+system(qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h"$ctarget\\include\\server\\$d\\"})`
`449`	`451`	`&& croak("Failed to copy include directory$d\n");`
`450`	`452`	`}`
`451`	`453`	`closedir($D);`

Comments

(0)