Kill the Update Dependencies project
Move downloading the ICU data file to the ICU project, since that's the only thing that was left.
This commit is contained in:
parent
5d38a9c585
commit
1d69efc35e
4 changed files with 14 additions and 53 deletions
13
Aegisub.sln
13
Aegisub.sln
|
@ -53,11 +53,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "aegisub\build\ffm
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "aegisub\build\zlib\zlib.vcxproj", "{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "aegisub\build\zlib\zlib.vcxproj", "{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "! Update Dependencies", "aegisub\build\deps\deps.vcxproj", "{472212DF-99E8-4B73-9736-8500616D8A80}"
|
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
|
||||||
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEAEFCB9-3759-4D03-8D51-7287D7B7E7DF}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEAEFCB9-3759-4D03-8D51-7287D7B7E7DF}"
|
||||||
ProjectSection(SolutionItems) = preProject
|
ProjectSection(SolutionItems) = preProject
|
||||||
.nuget\NuGet.Config = .nuget\NuGet.Config
|
.nuget\NuGet.Config = .nuget\NuGet.Config
|
||||||
|
@ -298,14 +293,6 @@ Global
|
||||||
{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}.Release|Win32.Build.0 = Release|Win32
|
{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}.Release|Win32.Build.0 = Release|Win32
|
||||||
{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}.Release|x64.ActiveCfg = Release|x64
|
{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}.Release|x64.ActiveCfg = Release|x64
|
||||||
{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}.Release|x64.Build.0 = Release|x64
|
{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}.Release|x64.Build.0 = Release|x64
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Debug-MinDep|x64.ActiveCfg = Debug|Win32
|
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Debug-Tests|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Debug-Tests|x64.ActiveCfg = Debug|x64
|
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Release|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{472212DF-99E8-4B73-9736-8500616D8A80}.Release|x64.ActiveCfg = Debug|x64
|
|
||||||
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}.Debug|Win32.ActiveCfg = Debug|Win32
|
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}.Debug|Win32.Build.0 = Debug|Win32
|
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}.Debug|x64.ActiveCfg = Debug|x64
|
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
|
@ -29,8 +29,8 @@ Building:
|
||||||
|
|
||||||
1. Clone Aegisub's repository recursively to fetch it and all submodules: `git clone --recursive git@github.com:Aegisub/Aegisub.git`
|
1. Clone Aegisub's repository recursively to fetch it and all submodules: `git clone --recursive git@github.com:Aegisub/Aegisub.git`
|
||||||
2. Disable autocrlf for ffmpeg, as its build system manages to not support Windows newlines: `cd aegisub/deps/ffmpeg && git config --local core.autocrlf && git rm --cached -r . && git reset --hard`
|
2. Disable autocrlf for ffmpeg, as its build system manages to not support Windows newlines: `cd aegisub/deps/ffmpeg && git config --local core.autocrlf && git rm --cached -r . && git reset --hard`
|
||||||
3. Open Aegisub.sln
|
3. Open Visual Studio from the VS2013 Native Tools Command Promp using devenv.exe /useenv (required for the build system to be able to find nmake.exe for building wxWidgets)
|
||||||
4. Build the "! Update Dependencies" project
|
4. Open Aegisub.sln
|
||||||
5. Open the properties for the Aegisub project and set the location of MSYS in Configuration Properties > Aegisub > Library paths
|
5. Open the properties for the Aegisub project and set the location of MSYS in Configuration Properties > Aegisub > Library paths
|
||||||
6. Build Aegisub
|
6. Build Aegisub
|
||||||
7. Copy the contents of an existing Aegisub install into the aegisub/aegisub/bin directory (not strictly required, but you'll be missing a lot of functionality otherwise).
|
7. Copy the contents of an existing Aegisub install into the aegisub/aegisub/bin directory (not strictly required, but you'll be missing a lot of functionality otherwise).
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (c) 2012, Thomas Goyne <plorkyeran@aegisub.org>
|
|
||||||
|
|
||||||
Permission to use, copy, modify, and distribute this software for any purpose
|
|
||||||
with or without fee is hereby granted, provided that the above copyright notice
|
|
||||||
and this permission notice appear in all copies.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
|
||||||
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
||||||
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
|
||||||
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
|
||||||
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
|
|
||||||
Aegisub Project http://www.aegisub.org/
|
|
||||||
-->
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{472212DF-99E8-4B73-9736-8500616D8A80}</ProjectGuid>
|
|
||||||
<ProjectName>! Update Dependencies</ProjectName>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Import Project="$(MSBuildThisFileDirectory)\..\aegisub.props" />
|
|
||||||
<UsingTask TaskName="DownloadTgzFile" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
|
|
||||||
|
|
||||||
<Target Name="Build">
|
|
||||||
<!-- Generated with http://apps.icu-project.org/datacustom/ -->
|
|
||||||
<!-- Includes Break Iterator and Collator data only -->
|
|
||||||
<DownloadTgzFile
|
|
||||||
Url="http://www.aegisub.org/~plorkyeran/icudt51l.dat.tgz"
|
|
||||||
Destination="$(MSBuildThisFileDirectory)..\..\..\deps\icu\source\data\in"
|
|
||||||
OutputFile="$(MSBuildThisFileDirectory)..\..\..\deps\icu\source\data\in\icudt51l.dat"
|
|
||||||
Hash="0885a647fdd48645a6bba48a7f8957131882db02"
|
|
||||||
/>
|
|
||||||
</Target>
|
|
||||||
</Project>
|
|
|
@ -11,6 +11,8 @@
|
||||||
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
|
||||||
|
<UsingTask TaskName="DownloadTgzFile" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
|
||||||
|
|
||||||
<PropertyGroup Label="ConfigArgs">
|
<PropertyGroup Label="ConfigArgs">
|
||||||
<CfgDebug Condition="'$(Configuration)' == 'Debug'">--enable-debug --disable-release CFLAGS=-MDd CXXFLAGS=-MDd</CfgDebug>
|
<CfgDebug Condition="'$(Configuration)' == 'Debug'">--enable-debug --disable-release CFLAGS=-MDd CXXFLAGS=-MDd</CfgDebug>
|
||||||
<CfgDebug Condition="'$(Configuration)' == 'Release'">--disable-debug --enable-release CFLAGS="-MD -Gw" CXXFLAGS="-MD -Gw"</CfgDebug>
|
<CfgDebug Condition="'$(Configuration)' == 'Release'">--disable-debug --enable-release CFLAGS="-MD -Gw" CXXFLAGS="-MD -Gw"</CfgDebug>
|
||||||
|
@ -78,6 +80,16 @@
|
||||||
Inputs="$(IcuSrcDir)"
|
Inputs="$(IcuSrcDir)"
|
||||||
Outputs="$(AegisubObjectDir)build.timestamp"
|
Outputs="$(AegisubObjectDir)build.timestamp"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
<!-- Generated with http://apps.icu-project.org/datacustom/ -->
|
||||||
|
<!-- Includes Break Iterator and Collator data only -->
|
||||||
|
<DownloadTgzFile
|
||||||
|
Url="http://www.aegisub.org/~plorkyeran/icudt51l.dat.tgz"
|
||||||
|
Destination="$(MSBuildThisFileDirectory)..\..\..\deps\icu\source\data\in"
|
||||||
|
OutputFile="$(MSBuildThisFileDirectory)..\..\..\deps\icu\source\data\in\icudt51l.dat"
|
||||||
|
Hash="0885a647fdd48645a6bba48a7f8957131882db02"
|
||||||
|
/>
|
||||||
|
|
||||||
<ExecShellScript
|
<ExecShellScript
|
||||||
Command="make"
|
Command="make"
|
||||||
Arguments="-j$(NUMBER_OF_PROCESSORS)"
|
Arguments="-j$(NUMBER_OF_PROCESSORS)"
|
||||||
|
|
Loading…
Reference in a new issue