mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Force autocrlf to input for ffmpeg since it barfs on Windows newlines

Browse source
This commit is contained in:
Thomas Goyne 2012-11-16 15:34:08 -08:00
parent 497f23e22d
commit 8ca862fa93
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aegisub/build/BuildTasks/DependencyFetchers.fs
View file

@ -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", "")

6
aegisub/build/deps/deps.vcxproj
View file

@ -32,7 +32,11 @@ Aegisub Project http://www.aegisub.org/
<GitProject Include="git://anongit.freedesktop.org/fribidi/fribidi" />
<GitProject Include="git://git.sv.nongnu.org/freetype/freetype2.git" />
<GitProject Include="git://github.com/madler/zlib.git" />
<GitProject Include="git://source.ffmpeg.org/ffmpeg.git" />
<GitProject Include="git://source.ffmpeg.org/ffmpeg.git">
<!-- FFmpeg's build system manages to not work with Windows newlines, so
disable autocrlf even if the user has it enabled globally -->
<AutoCrlf>input</AutoCrlf>
</GitProject>
<GitProject Include="git://github.com/tgoyne/ffms2.git">
<Branch>trunk</Branch>
</GitProject>