diff --git a/aegisub/build/BuildTasks/DependencyFetchers.fs b/aegisub/build/BuildTasks/DependencyFetchers.fs index 626eb3a01..cafbc1213 100644 --- a/aegisub/build/BuildTasks/DependencyFetchers.fs +++ b/aegisub/build/BuildTasks/DependencyFetchers.fs @@ -23,78 +23,6 @@ open Microsoft.Build.Evaluation open Microsoft.Build.Framework open Microsoft.Build.Utilities -type GitWrapper(path : String) = - inherit ToolTask() - - member val Arguments = "" with get, set - member val WorkingDirectory = "" with get, set - - // ToolTask overrides - override val ToolName = "git.exe" with get - override this.GenerateFullPathToTool() = path - override this.GenerateCommandLineCommands() = this.Arguments - override this.GetWorkingDirectory() = this.WorkingDirectory - - override this.Execute() = - if this.GenerateFullPathToTool() |> IO.File.Exists |> not then - failwith "git.exe not found. Make sure the MSYS root is set to a correct location." - - this.UseCommandProcessor <- false - this.StandardOutputImportance <- "High" - base.Execute() - -type GitProject() = - inherit Task() - - member val Projects : ITaskItem[] = null with get, set - member val Root = "" with get, set - member val GitPath = "" with get, set - - override this.Execute() = - let callGit dir args = - let gw = GitWrapper(this.GitPath, - BuildEngine = this.BuildEngine, - HostObject = this.HostObject, - Arguments = args, - WorkingDirectory = dir) - if not <| gw.Execute() then failwith "git failed" - - let update (projectName : String) directory url = - this.Log.LogMessage ("Updating {0}", projectName) - callGit directory "pull --rebase" - callGit directory "clean -xfd" - - let fetch (projectName : String) root (url : ITaskItem) = - this.Log.LogMessage ("Fetching {0}", projectName) - ignore <| IO.Directory.CreateDirectory root - - callGit root (sprintf "clone %s --no-checkout" url.ItemSpec) - - let dir = (sprintf "%s\\%s" root projectName) - - let autocrlf = url.GetMetadata "AutoCrlf" - if autocrlf.Length > 0 - then callGit dir (sprintf "config --local core.autocrlf %s" autocrlf) - - let branch = match url.GetMetadata("Branch") with "" -> "master" | x -> x - callGit dir (sprintf "checkout %s" branch) - - let updateGit (url : ITaskItem) = - let projectName = Uri(url.ItemSpec).Segments.Last().Replace(".git", "") - let directory = sprintf "%s\\%s" this.Root projectName - - if IO.Directory.Exists directory - then update projectName directory url - else fetch projectName this.Root url - - this.Log.LogMessage ("Using git at {0}", this.GitPath) - try - this.Projects |> Array.map updateGit |> ignore - true - with e -> - this.Log.LogErrorFromException e - false - let downloadArchive (url : String) unpackDest = use wc = new Net.WebClient() use downloadStream = wc.OpenRead url diff --git a/aegisub/build/deps/deps.vcxproj b/aegisub/build/deps/deps.vcxproj index 613319787..328c59a0b 100644 --- a/aegisub/build/deps/deps.vcxproj +++ b/aegisub/build/deps/deps.vcxproj @@ -22,57 +22,19 @@ Aegisub Project http://www.aegisub.org/ ! Update Dependencies - - - - - - - - - input - - - trunk - - - msvc - - - msvc - - - 3.3.2 http://www.fftw.org/fftw-3.3.2.tar.gz fftw-3.3.2 - - 1.52.0 - http://downloads.sourceforge.net/project/boost/boost/1.52.0/boost_1_52_0.tar.gz - boost_1_52_0 - - - 50.1.2 - http://download.icu-project.org/files/icu4c/50.1.2/icu4c-50_1_2-src.tgz - - - -