Better project files.

- Output directly to rel\ instead of to bin\ and then copying files over.
- Deduped Win32 vs x64 configs
- Moved some common properties to hexchat.props
- All build intermediates (except htm's intermediates) are no longer emitted in the source directory

win32/copy/copy.vcxproj

@@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v120</PlatformToolset>
+    <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
@@ -18,73 +19,63 @@
     <RootNamespace>copy</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\hexchat.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\hexchat.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PreBuildEvent>
-      <Command>$(HexChatCopy)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PreBuildEvent>
-      <Command>$(HexChatCopy)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="..\hexchat.props" />
   <ItemGroup>
+    <None Include="$(DepsRoot)\bin\cert.pem" />
+    <None Include="$(DepsRoot)\bin\atk-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\cairo.dll" />
+    <None Include="$(DepsRoot)\bin\fontconfig.dll" />
+    <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gdk-win32-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gio-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\glib-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gmodule-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gobject-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper.exe" />
+    <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" />
+    <None Include="$(DepsRoot)\bin\gthread-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\harfbuzz.dll" />
+    <None Include="$(DepsRoot)\bin\iconv.dll" />
+    <None Include="$(DepsRoot)\bin\libeay32.dll" />
+    <None Include="$(DepsRoot)\bin\libenchant.dll" />
+    <None Include="$(DepsRoot)\bin\libintl.dll" />
+    <None Include="$(DepsRoot)\bin\libpng16.dll" />
+    <None Include="$(DepsRoot)\bin\libxml2.dll" />
+    <None Include="$(DepsRoot)\bin\pango-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\pangocairo-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\pangoft2-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\pangowin32-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\pixman-1.dll" />
+    <None Include="$(DepsRoot)\bin\ssleay32.dll" />
+    <None Include="$(DepsRoot)\bin\zlib1.dll" />
+    <None Include="$(HexChatBin)thememan.exe" />
     <None Include="changelog.url" />
     <None Include="readme.url" />
-    <None Include="share\xml\iso-codes\iso_3166.xml" />
-    <None Include="share\xml\iso-codes\iso_639.xml" />
+
+    <Engines Include="$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines\**\*" />
+
+    <Share Include="share\**\*" />
+
+    <DepsRootDocs Include="$(DepsRoot)\share\doc\**\*" />
+
+    <Locale Include="$(HexChatBin)locale\**\*;$(DepsRoot)\share\locale\**\*" />
+
+    <MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+  <Target Name="Build">
+    <Copy SourceFiles="@(None)" DestinationFolder="$(HexChatRel)" />
+    <Copy SourceFiles="@(Engines)" DestinationFiles="@(Engines->'$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(HexChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(DepsRootDocs)" DestinationFiles="@(DepsRootDocs->'$(HexChatRel)\share\doc\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(HexChatRel)\share\doc\hexchat" />
+    <Copy SourceFiles="$(DepsRoot)\lib\enchant\libenchant_myspell.dll" DestinationFolder="$(HexChatRel)\lib\enchant" />
+    <Copy SourceFiles="@(Locale)" DestinationFiles="@(Locale->'$(HexChatRel)\share\locale\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(MSWindowsTheme)" DestinationFiles="@(MSWindowsTheme->'$(HexChatRel)\share\themes\MS-Windows\%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <WriteLinesToFile File="$(HexChatRel)portable-mode" Lines="2" Overwrite="true" />
+  </Target>
+</Project>

win32/copy/copy.vcxproj.filters

@@ -1,52 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{e02a8c67-767c-4c6e-a854-81fae08cf4da}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\etc">
-      <UniqueIdentifier>{503881c0-011d-443b-a373-4bfe125dcfa6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\share">
-      <UniqueIdentifier>{4316433a-2a8e-48f7-9020-e1f4de0d23d1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\etc\gtk-2.0">
-      <UniqueIdentifier>{832ebebc-ab71-4bf6-9f3a-02ec748f7c14}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\share\xml">
-      <UniqueIdentifier>{9a881586-aed2-4f80-ba84-e521e6785566}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\share\xml\iso-codes">
-      <UniqueIdentifier>{c825f724-0618-4160-97b7-12d6e0f2bc7b}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="etc\download.png">
-      <Filter>Resource Files\etc</Filter>
-    </None>
-    <None Include="etc\gtkpref.png">
-      <Filter>Resource Files\etc</Filter>
-    </None>
-    <None Include="etc\music.png">
-      <Filter>Resource Files\etc</Filter>
-    </None>
-    <None Include="etc\system.png">
-      <Filter>Resource Files\etc</Filter>
-    </None>
-    <None Include="etc\gtk-2.0\gtkrc">
-      <Filter>Resource Files\etc\gtk-2.0</Filter>
-    </None>
-    <None Include="share\xml\iso-codes\iso_639.xml">
-      <Filter>Resource Files\share\xml\iso-codes</Filter>
-    </None>
-    <None Include="share\xml\iso-codes\iso_3166.xml">
-      <Filter>Resource Files\share\xml\iso-codes</Filter>
-    </None>
-    <None Include="readme.url">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="changelog.url">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
 </Project>