From 652a8c7806bd060f6989812fa8b52b4491839cdd Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sun, 16 Jan 2011 23:01:26 +0000
Subject: [PATCH] Lump all the custom targets etc. for Aegisub into a single
 file, instead of using many. Also, no custom project items needed anyway.

Originally committed to SVN as r5223.
---
 .../Aegisub/Aegisub.SubWCRev.ProjectItems.xml | 45 -------------------
 ...gisub.SubWCRev.targets => Aegisub.targets} |  3 +-
 aegisub/build/msbuild/Aegisub/Aegisub.vcxproj |  2 +-
 .../{Aegisub.SubWCRev.xml => Aegisub.xml}     |  6 ++-
 4 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.ProjectItems.xml
 rename aegisub/build/msbuild/Aegisub/{Aegisub.SubWCRev.targets => Aegisub.targets} (96%)
 rename aegisub/build/msbuild/Aegisub/{Aegisub.SubWCRev.xml => Aegisub.xml} (97%)

diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.ProjectItems.xml b/aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.ProjectItems.xml
deleted file mode 100644
index d3af2bd14..000000000
--- a/aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.ProjectItems.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-	Copyright (c) 2011 Niels Martin Hansen
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	  * Redistributions of source code must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
-	  * Redistributions in binary form must reproduce the above copyright notice,
-		this list of conditions and the following disclaimer in the documentation
-		and/or other materials provided with the distribution.
-	  * Neither the name of the Aegisub Group nor the names of its contributors
-		may be used to endorse or promote products derived from this software
-		without specific prior written permission.
-
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-
-	Aegisub Project http://www.aegisub.org/
-
-	$Id$
--->
-<ProjectSchemaDefinitions
-    xmlns="http://schemas.microsoft.com/build/2009/properties">
-
-    <ContentType
-        Name="SUBWCRevTemplate"
-        DisplayName="SUBWCRev template"
-        ItemType="SubWCRev">
-    </ContentType>
-
-    <ItemType Name="SubWCRev" DisplayName="TortoiseSVN SubWCRev" />
-	
-</ProjectSchemaDefinitions>
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.targets b/aegisub/build/msbuild/Aegisub/Aegisub.targets
similarity index 96%
rename from aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.targets
rename to aegisub/build/msbuild/Aegisub/Aegisub.targets
index e23b10d78..217439d5a 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.targets
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.targets
@@ -64,8 +64,7 @@
   </Target>
 
   <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Aegisub.SubWCRev.ProjectItems.xml" />
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Aegisub.SubWCRev.xml" />
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Aegisub.xml" />
     <ProjectTools Include="SubWCRev" />
     <AvailableItemName Include="SubWCRev">
       <Targets>SubWCRev</Targets>
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
index 11cf9f5c7..6bdfcd091 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
@@ -35,7 +35,7 @@
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
   <!-- Project specific configuration -->
-  <Import Project="$(MSBuildThisFileDirectory)Aegisub.SubWCRev.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)Aegisub.targets" />
   <PropertyGroup>
 	<TargetName>aegisub$(AegisubPlatformSuffix)</TargetName>
   </PropertyGroup>
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.xml b/aegisub/build/msbuild/Aegisub/Aegisub.xml
similarity index 97%
rename from aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.xml
rename to aegisub/build/msbuild/Aegisub/Aegisub.xml
index 85c164f38..57a15ca1c 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.SubWCRev.xml
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.xml
@@ -48,10 +48,11 @@
 
   <StringProperty
     Name="SubWCRevExe"
+	Subtype="file"
     Category="General"
     DisplayName="SubWCRev.exe"
     Description="Location of the SubWCRev.exe file used to process SVN working copies. Changes to this setting are stored in user settings, not in the main project file."
-    Default="$(SubWCRevExe)"
+    Default="SubWCRev.exe"
     >
     <StringProperty.DataSource>
       <DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="false" />
@@ -60,18 +61,21 @@
   
   <StringProperty
     Name="InputFile"
+	Subtype="file"
     Category="General"
     DisplayName="Input file"
     Description="Template file to insert data to."
     />
   <StringProperty
     Name="OutputFile"
+	Subtype="file"
     Category="General"
     DisplayName="Output file"
     Description="File to generate from the template file."
     />
   <StringProperty
     Name="Repository"
+	Subtype="folder"
     Category="General"
     DisplayName="Working copy location"
     Description="Location of SVN working copy to extract data from."