From 238f2dedb68e87e0cafb7ae48ee97477b3939c63 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Fri, 14 Jan 2011 07:40:06 +0000
Subject: [PATCH] Custom property page for the respack tool, how cool! Also
 include the standard targets later to make the projects stop spewing build
 status files into wrong dirs.

Originally committed to SVN as r5187.
---
 aegisub/build/msbuild/aegisub.props           |  4 +-
 .../msbuild/libresrc/libresrc.vcxproj.filters |  8 +++
 .../respack/Aegisub.ResPack.ProjectItems.xml  | 49 +++++++++++++
 .../msbuild/respack/Aegisub.ResPack.targets   | 69 ++++++++++---------
 .../build/msbuild/respack/Aegisub.ResPack.xml | 69 +++++++++++++++++++
 5 files changed, 164 insertions(+), 35 deletions(-)
 create mode 100644 aegisub/build/msbuild/respack/Aegisub.ResPack.ProjectItems.xml
 create mode 100644 aegisub/build/msbuild/respack/Aegisub.ResPack.xml

diff --git a/aegisub/build/msbuild/aegisub.props b/aegisub/build/msbuild/aegisub.props
index 70a290155..a0490c8f3 100644
--- a/aegisub/build/msbuild/aegisub.props
+++ b/aegisub/build/msbuild/aegisub.props
@@ -16,7 +16,6 @@
 		<CharacterSet                                                       >Unicode</CharacterSet>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 	
 	<ImportGroup Label="PropertySheets">
 		<Import Project="$(MSBuildThisFileDirectory)userconfig\*.props" />
@@ -27,4 +26,7 @@
 		<Import Project="$(MSBuildThisFileDirectory)wx.props" Condition="'$(AegisubUseWxWidgets)' == 'true'" />
 		<Import Project="$(MSBuildThisFileDirectory)directx.props" Condition="'$(AegisubUseDSound)' == 'true'" />
 	</ImportGroup>
+
+	<!-- The standard targets need to go last for all paths to be proper -->
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/aegisub/build/msbuild/libresrc/libresrc.vcxproj.filters b/aegisub/build/msbuild/libresrc/libresrc.vcxproj.filters
index 9c3a5cb56..e2d7edefd 100644
--- a/aegisub/build/msbuild/libresrc/libresrc.vcxproj.filters
+++ b/aegisub/build/msbuild/libresrc/libresrc.vcxproj.filters
@@ -14,6 +14,14 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+	<ResPack Include="..\..\..\src\libresrc\manifest.respack">
+      <Filter>Resource Files</Filter>
+	</ResPack>
+	<ResPack Include="..\..\..\src\bitmaps\manifest.respack">
+      <Filter>Resource Files</Filter>
+	</ResPack>
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\libresrc\bitmap.cpp">
       <Filter>Source Files</Filter>
diff --git a/aegisub/build/msbuild/respack/Aegisub.ResPack.ProjectItems.xml b/aegisub/build/msbuild/respack/Aegisub.ResPack.ProjectItems.xml
new file mode 100644
index 000000000..890ad639a
--- /dev/null
+++ b/aegisub/build/msbuild/respack/Aegisub.ResPack.ProjectItems.xml
@@ -0,0 +1,49 @@
+<?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: Aegisub.ResPack.targets 5185 2011-01-14 03:47:57Z nielsm $
+-->
+<ProjectSchemaDefinitions
+    xmlns="http://schemas.microsoft.com/build/2009/properties">
+
+	
+    <ContentType
+        Name="ResPackManifest"
+        DisplayName="ResPack manifest"
+        ItemType="ResPack">
+    </ContentType>
+
+    <ItemType Name="ResPack" DisplayName="Aegisub resource packer"/>
+	
+    <FileExtension Name=".respack" ContentType="Text"/>
+
+	
+</ProjectSchemaDefinitions>
diff --git a/aegisub/build/msbuild/respack/Aegisub.ResPack.targets b/aegisub/build/msbuild/respack/Aegisub.ResPack.targets
index 9026c1bed..44e29de0f 100644
--- a/aegisub/build/msbuild/respack/Aegisub.ResPack.targets
+++ b/aegisub/build/msbuild/respack/Aegisub.ResPack.targets
@@ -1,38 +1,37 @@
 <?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$
+-->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<!--
-		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$
-	-->
-	
 	<PropertyGroup>
 		<ResPackExe Condition="'$(ResPackExe)' == ''">$(MSBuildThisFileDirectory)respack.exe</ResPackExe>
 	</PropertyGroup>
@@ -70,7 +69,9 @@
 	</Target>
 
 	<ItemGroup>
-		<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
+		<PropertyPageSchema Include="$(MSBuildThisFileDirectory)Aegisub.ResPack.ProjectItems.xml" />
+		<PropertyPageSchema Include="$(MSBuildThisFileDirectory)Aegisub.ResPack.xml" />
+		<ProjectTools Include="ResPack" />
 		<AvailableItemName Include="ResPack">
 			<Targets>ResPack</Targets>
 		</AvailableItemName>
diff --git a/aegisub/build/msbuild/respack/Aegisub.ResPack.xml b/aegisub/build/msbuild/respack/Aegisub.ResPack.xml
new file mode 100644
index 000000000..49b445206
--- /dev/null
+++ b/aegisub/build/msbuild/respack/Aegisub.ResPack.xml
@@ -0,0 +1,69 @@
+<?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: Aegisub.ResPack.targets 5185 2011-01-14 03:47:57Z nielsm $
+-->
+<Rule Name="ResPack" 
+		DisplayName="Aegisub resource packer" 
+		Order="15" 
+		PageTemplate="tool"
+		xmlns="http://schemas.microsoft.com/build/2009/properties">
+
+
+	<Rule.Categories>
+		<Category Name="General" DisplayName="General" Description="General" />
+	</Rule.Categories>
+
+	<Rule.DataSource>
+		<DataSource Persistence="ProjectFile" ItemType="ResPack" HasConfigurationCondition="false" />
+	</Rule.DataSource>
+	
+	<StringProperty
+		Name="OutputDir"
+		Category="General"
+		DisplayName="Output directory"
+		Description="Directory the source and header files will be output to."
+		/>
+	<StringProperty
+		Name="OutputName"
+		Category="General"
+		DisplayName="Output source file"
+		Description="Name (without path) of source file produced from the resource manufest."
+		/>
+	<StringProperty
+		Name="OutputHeader"
+		Category="General"
+		DisplayName="Output header file"
+		Description="Name (without path) of header file produced from the resource manifest."
+		/>
+
+
+</Rule>