From 855902edb8f71f333da7fd8836f0541aec4fe434 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 28 Jan 2013 08:54:18 -0800 Subject: [PATCH] Add ICU to the libraries downloaded by the dependencies fetcher --- aegisub/build/BuildTasks/DependencyFetchers.fs | 7 +++---- aegisub/build/deps/deps.vcxproj | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/aegisub/build/BuildTasks/DependencyFetchers.fs b/aegisub/build/BuildTasks/DependencyFetchers.fs index 63b449f2c..f5a360327 100644 --- a/aegisub/build/BuildTasks/DependencyFetchers.fs +++ b/aegisub/build/BuildTasks/DependencyFetchers.fs @@ -108,9 +108,6 @@ type TarballProject() = with | :? IO.IOException -> true let update directory (project : ITaskItem) version = - let dirname url = - Uri(url).Segments.Last().Replace(".tar.gz", "") - try IO.Directory.Delete(directory, true) with | :? IO.IOException -> () this.Log.LogMessage ("Downloading {0} {1} from {2}", project.ItemSpec, version, project.GetMetadata "Url") @@ -121,7 +118,9 @@ type TarballProject() = use tarArchive = ICSharpCode.SharpZipLib.Tar.TarArchive.CreateInputTarArchive tarStream sprintf @"%s\.." directory |> tarArchive.ExtractContents - IO.Directory.Move(project.GetMetadata "Url" |> dirname |> sprintf @"%s\..\%s" directory, directory) + let dirname = project.GetMetadata "DirName" + if not <| String.IsNullOrWhiteSpace dirname + then IO.Directory.Move(dirname |> sprintf @"%s\..\%s" directory, directory) IO.File.WriteAllText(sprintf @"%s\version.aegisub" directory, version) diff --git a/aegisub/build/deps/deps.vcxproj b/aegisub/build/deps/deps.vcxproj index 3f8a8fed6..bedebd91a 100644 --- a/aegisub/build/deps/deps.vcxproj +++ b/aegisub/build/deps/deps.vcxproj @@ -47,10 +47,16 @@ Aegisub Project http://www.aegisub.org/ 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.1 + http://download.icu-project.org/files/icu4c/50.1.1/icu4c-50_1_1-src.tgz