diff --git a/.gitmodules b/.gitmodules index 2dc8ef170..780c5cfca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,8 +38,8 @@ branch = master [submodule "icu"] path = vendor/icu - url = git://github.com/sillsdev/icu4c.git - branch = trunk + url = git://github.com/svn2github/icu4c.git + branch = master ignore = dirty [submodule "boost"] path = vendor/boost diff --git a/build/BuildTasks/DownloadTgzFile.cs b/build/BuildTasks/DownloadTgzFile.cs index f829018bf..aee359034 100644 --- a/build/BuildTasks/DownloadTgzFile.cs +++ b/build/BuildTasks/DownloadTgzFile.cs @@ -17,16 +17,15 @@ namespace BuildTasks { public class DownloadTgzFile : Microsoft.Build.Utilities.Task { public string Url { get; set; } - public string Destination { get; set; } public string OutputFile { get; set; } public string Hash { get; set; } private void DownloadArchive(string url, string unpackDest) { var downloadStream = new System.Net.WebClient().OpenRead(url); var gzStream = new ICSharpCode.SharpZipLib.GZip.GZipInputStream(downloadStream); - var tarStream = new ICSharpCode.SharpZipLib.Tar.TarInputStream(gzStream); - var tarArchive = ICSharpCode.SharpZipLib.Tar.TarArchive.CreateInputTarArchive(tarStream); - tarArchive.ExtractContents(unpackDest); + using (var file = System.IO.File.Create(unpackDest)) { + gzStream.CopyTo(file); + } } public override bool Execute() { @@ -42,7 +41,7 @@ namespace BuildTasks { } try { - DownloadArchive(this.Url, this.Destination); + DownloadArchive(this.Url, this.OutputFile); } catch (System.Exception e) { this.Log.LogErrorFromException(e); diff --git a/build/icu/icu.vcxproj b/build/icu/icu.vcxproj index f41c3569a..4f589b953 100644 --- a/build/icu/icu.vcxproj +++ b/build/icu/icu.vcxproj @@ -82,12 +82,11 @@ > - +