From a08e582de1242991a68f8d50fac89186a2ba1f1b Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed, 1 Jan 2014 14:22:28 -0800
Subject: [PATCH] Kill the Update Dependencies project
Move downloading the ICU data file to the ICU project, since that's the
only thing that was left.
---
Aegisub.sln | 13 -----------
README.md | 4 ++--
aegisub/build/deps/deps.vcxproj | 38 ---------------------------------
aegisub/build/icu/icu.vcxproj | 12 +++++++++++
4 files changed, 14 insertions(+), 53 deletions(-)
delete mode 100644 aegisub/build/deps/deps.vcxproj
diff --git a/Aegisub.sln b/Aegisub.sln
index 29f175cd7..51bdfa0db 100644
--- a/Aegisub.sln
+++ b/Aegisub.sln
@@ -53,11 +53,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "aegisub\build\ffm
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "aegisub\build\zlib\zlib.vcxproj", "{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}"
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}"
ProjectSection(SolutionItems) = preProject
.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|x64.ActiveCfg = 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.Build.0 = Debug|Win32
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/README.md b/README.md
index 199a6096f..9533aa7bf 100644
--- a/README.md
+++ b/README.md
@@ -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`
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
-4. Build the "! Update Dependencies" project
+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. Open Aegisub.sln
5. Open the properties for the Aegisub project and set the location of MSYS in Configuration Properties > Aegisub > Library paths
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).
diff --git a/aegisub/build/deps/deps.vcxproj b/aegisub/build/deps/deps.vcxproj
deleted file mode 100644
index e0d16a4e9..000000000
--- a/aegisub/build/deps/deps.vcxproj
+++ /dev/null
@@ -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>
diff --git a/aegisub/build/icu/icu.vcxproj b/aegisub/build/icu/icu.vcxproj
index 76f5fdb00..73832abb1 100644
--- a/aegisub/build/icu/icu.vcxproj
+++ b/aegisub/build/icu/icu.vcxproj
@@ -11,6 +11,8 @@
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
+ <UsingTask TaskName="DownloadTgzFile" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
+
<PropertyGroup Label="ConfigArgs">
<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>
@@ -78,6 +80,16 @@
Inputs="$(IcuSrcDir)"
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
Command="make"
Arguments="-j$(NUMBER_OF_PROCESSORS)"
--
GitLab