From 8ca862fa934aa06c395e2e4353ccf55493dfe43f Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 16 Nov 2012 15:34:08 -0800 Subject: [PATCH] Force autocrlf to input for ffmpeg since it barfs on Windows newlines --- aegisub/build/BuildTasks/DependencyFetchers.fs | 9 ++++++++- aegisub/build/deps/deps.vcxproj | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/aegisub/build/BuildTasks/DependencyFetchers.fs b/aegisub/build/BuildTasks/DependencyFetchers.fs index 1cadfe83f..bffa73a01 100644 --- a/aegisub/build/BuildTasks/DependencyFetchers.fs +++ b/aegisub/build/BuildTasks/DependencyFetchers.fs @@ -69,9 +69,16 @@ type GitProject() = ignore <| IO.Directory.CreateDirectory root callGit root (sprintf "clone %s" url.ItemSpec) + + let dir = (sprintf "%s\\%s" root projectName) let branch = url.GetMetadata("Branch") if branch.Length > 0 - then callGit (sprintf "%s\\%s" root projectName) (sprintf "checkout %s" branch) + then callGit dir (sprintf "checkout %s" branch) + + let autocrlf = url.GetMetadata "AutoCrlf" + if autocrlf.Length > 0 + then callGit dir (sprintf "config --local core.autocrlf %s" autocrlf) + callGit dir "reset --hard" let updateGit (url : ITaskItem) = let projectName = Uri(url.ItemSpec).Segments.Last().Replace(".git", "") diff --git a/aegisub/build/deps/deps.vcxproj b/aegisub/build/deps/deps.vcxproj index 0729970f7..4fb676cf7 100644 --- a/aegisub/build/deps/deps.vcxproj +++ b/aegisub/build/deps/deps.vcxproj @@ -32,7 +32,11 @@ Aegisub Project http://www.aegisub.org/ - + + + input + trunk