Move fftw3 to a git submodule and update to 3.3.3

This commit is contained in:
Thomas Goyne 2014-01-01 07:32:25 -08:00
parent 11581ccd28
commit 75ecb0c2a8
5 changed files with 5 additions and 51 deletions

1
.gitignore vendored
View File

@ -80,4 +80,3 @@ aegisub/tests/*.json
/packages /packages
.nuget .nuget
/aegisub/include /aegisub/include
/deps/fftw

4
.gitmodules vendored
View File

@ -50,3 +50,7 @@
url = git://github.com/ittner/Lua-experimentation.git url = git://github.com/ittner/Lua-experimentation.git
branch = lua51 branch = lua51
ignore = dirty ignore = dirty
[submodule "deps/fftw"]
path = deps/fftw
url = https://github.com/Aegisub/fftw3.git
ignore = dirty

View File

@ -31,45 +31,6 @@ let downloadArchive (url : String) unpackDest =
use tarArchive = ICSharpCode.SharpZipLib.Tar.TarArchive.CreateInputTarArchive tarStream use tarArchive = ICSharpCode.SharpZipLib.Tar.TarArchive.CreateInputTarArchive tarStream
tarArchive.ExtractContents unpackDest tarArchive.ExtractContents unpackDest
type TarballProject() =
inherit Task()
member val Projects : ITaskItem[] = null with get, set
member val Root = "" with get, set
override this.Execute() =
let needsUpdate directory version =
try
not <| String.Equals(sprintf "%s\\version.aegisub" directory |> IO.File.ReadAllText, version)
with | :? IO.IOException -> true
let update directory (project : ITaskItem) version =
try IO.Directory.Delete(directory, true) with | :? IO.IOException -> ()
this.Log.LogMessage ("Downloading {0} {1} from {2}", project.ItemSpec, version, project.GetMetadata "Url")
downloadArchive (project.GetMetadata "Url") (sprintf @"%s\.." 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)
let check (project : ITaskItem) =
let directory = sprintf "%s\\%s" this.Root project.ItemSpec
let version = project.GetMetadata "Version"
if needsUpdate directory <| version
then update directory project version
else this.Log.LogMessage <| sprintf "%s is up to date" project.ItemSpec
try
this.Projects |> Array.map check |> ignore
true
with e ->
this.Log.LogErrorFromException e
false
type DownloadTgzFile() = type DownloadTgzFile() =
inherit Task() inherit Task()

View File

@ -22,21 +22,10 @@ Aegisub Project http://www.aegisub.org/
<ProjectName>! Update Dependencies</ProjectName> <ProjectName>! Update Dependencies</ProjectName>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="tarball">
<TarballProject Include="fftw">
<Version>3.3.2</Version>
<Url>http://www.fftw.org/fftw-3.3.2.tar.gz</Url>
<DirName>fftw-3.3.2</DirName>
</TarballProject>
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)\..\aegisub.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\aegisub.props" />
<UsingTask TaskName="TarballProject" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
<UsingTask TaskName="DownloadTgzFile" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" /> <UsingTask TaskName="DownloadTgzFile" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
<Target Name="Build"> <Target Name="Build">
<TarballProject Projects="@(TarballProject)" Root="$(MSBuildThisFileDirectory)..\..\..\deps" />
<!-- Generated with http://apps.icu-project.org/datacustom/ --> <!-- Generated with http://apps.icu-project.org/datacustom/ -->
<!-- Includes Break Iterator and Collator data only --> <!-- Includes Break Iterator and Collator data only -->
<DownloadTgzFile <DownloadTgzFile

1
deps/fftw vendored Submodule

@ -0,0 +1 @@
Subproject commit d68ca6315cafa5b8ff9367d9375314f32b7dbd81