Commita531123

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 parent56c7140 commita531123Copy full SHA for a531123

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -479,15 +479,17 @@ sub CopyIncludeFiles`
`479`	`479`	`my$D;`
`480`	`480`	`opendir($D,'src/include') \|\| croak"Could not opendir on src/include!\n";`
`481`	`481`
	`482`	`+# some xcopy progs don't like mixed slash style paths`
	`483`	`+(my$ctarget =$target) =~s!/!\\!g;`
`482`	`484`	`while (my$d =readdir($D))`
`483`	`485`	`{`
`484`	`486`	`nextif ($d =~/^\./);`
`485`	`487`	`nextif ($deq'.git');`
`486`	`488`	`nextif ($deq'CVS');`
`487`		`-nextunless (-d'src/include/' .$d);`
	`489`	`+nextunless (-d"src/include/$d");`
`488`	`490`
`489`		`- EnsureDirectories($target .'/include/server',$d);`
`490`		`-system("xcopy /s /i /q /r /y src\\include\\$d\\*.h\"$target\\include\\server\\$d\\\"")`
	`491`	`+ EnsureDirectories("$target/include/server/$d");`
	`492`	`+system(qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h"$ctarget\\include\\server\\$d\\"})`
`491`	`493`	`&& croak("Failed to copy include directory$d\n");`
`492`	`494`	`}`
`493`	`495`	`closedir($D);`

Comments

(0)