Switch from solution dependencies to project-to-project dependencies.

Convert pre-build event to a custom build step.

Store intermediates for each project in their own subdirectory for tidyness,
to avoid overwriting, and to fix parallel builds.

Use automatic library dependencies from required projects.

These changes eliminate unnecessary rebuilds in MSVC 2010.

10 files changed, 53 insertions, 26 deletions

diff --git a/infrastructure/msvc/2010/bbackupctl.vcxproj b/infrastructure/msvc/2010/bbackupctl.vcxproj
index 294e33aa..0b6f76f3 100644
--- a/infrastructure/msvc/2010/bbackupctl.vcxproj
+++ b/infrastructure/msvc/2010/bbackupctl.vcxproj
@@ -40,7 +40,7 @@
   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

diff --git a/infrastructure/msvc/2010/bbackupd.vcxproj b/infrastructure/msvc/2010/bbackupd.vcxproj
index 395923ff..1a181be2 100644
--- a/infrastructure/msvc/2010/bbackupd.vcxproj
+++ b/infrastructure/msvc/2010/bbackupd.vcxproj
@@ -40,8 +40,8 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\$(Configuration)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

@@ -61,7 +61,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;$(ProjectDir)..\..\..\$(Configuration)\qdbm.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcreposix78.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcre78.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>VssApi.lib;Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcreposix78.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcre78.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)bbackupd.exe</OutputFile>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -121,6 +121,18 @@
     <ProjectReference Include="common.vcxproj">

       <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <Private>true</Private>

+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>

+      <LinkLibraryDependencies>true</LinkLibraryDependencies>

+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>

+    </ProjectReference>

+    <ProjectReference Include="qdbm.vcxproj">

+      <Project>{72af22a7-b339-4fdf-b6ae-ca6522d4bb8d}</Project>

+      <Private>true</Private>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>

+      <LinkLibraryDependencies>true</LinkLibraryDependencies>

+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>

     </ProjectReference>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/infrastructure/msvc/2010/bbstoreaccounts.vcxproj b/infrastructure/msvc/2010/bbstoreaccounts.vcxproj
index fa628a2d..feb3e350 100644
--- a/infrastructure/msvc/2010/bbstoreaccounts.vcxproj
+++ b/infrastructure/msvc/2010/bbstoreaccounts.vcxproj
@@ -37,10 +37,10 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\..\$(Configuration)\</OutDir>

+    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <IntDir>..\..\..\$(Configuration)\</IntDir>

+    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

@@ -52,7 +52,7 @@
     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\$(Configuration)\libbackupstore.lib;$(ProjectDir)..\..\..\$(Configuration)\common.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcreposix78.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcre78.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>Ws2_32.lib;Advapi32.lib;User32.lib;$(ProjectDir)..\..\..\..\zlib\lib\zdll.lib;$(ProjectDir)..\..\..\..\openssl\lib\libeay32.lib;$(ProjectDir)..\..\..\..\openssl\lib\ssleay32.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcreposix78.lib;$(ProjectDir)..\..\..\..\pcre\build\vc2008\debug\pcre78.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -71,6 +71,14 @@
   <ItemGroup>

     <ClCompile Include="..\..\..\bin\bbstoreaccounts\bbstoreaccounts.cpp" />

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="common.vcxproj">

+      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

+    </ProjectReference>

+    <ProjectReference Include="libbackupstore.vcxproj">

+      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>

+    </ProjectReference>

+  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/infrastructure/msvc/2010/bbstored.vcxproj b/infrastructure/msvc/2010/bbstored.vcxproj
index bedb19e7..6837e82e 100644
--- a/infrastructure/msvc/2010/bbstored.vcxproj
+++ b/infrastructure/msvc/2010/bbstored.vcxproj
@@ -37,10 +37,10 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\..\$(Configuration)\</OutDir>

+    <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <IntDir>..\..\..\$(Configuration)\</IntDir>

+    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

@@ -84,6 +84,14 @@
     <ClInclude Include="..\..\..\bin\bbstored\BackupStoreDaemon.h" />

     <ClInclude Include="..\..\..\bin\bbstored\HousekeepStoreAccount.h" />

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="common.vcxproj">

+      <Project>{a089cee6-ebf0-4232-a0c0-74850a8127a6}</Project>

+    </ProjectReference>

+    <ProjectReference Include="libbackupstore.vcxproj">

+      <Project>{97d89aef-2be4-4e34-8703-03ba67bf4494}</Project>

+    </ProjectReference>

+  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/infrastructure/msvc/2010/boxbackup.sln b/infrastructure/msvc/2010/boxbackup.sln
index a58742bd..643ae345 100644
--- a/infrastructure/msvc/2010/boxbackup.sln
+++ b/infrastructure/msvc/2010/boxbackup.sln
@@ -16,18 +16,10 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qdbm", "qdbm.vcxproj", "{72AF22A7-B339-4FDF-B6AE-CA6522D4BB8D}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstored", "bbstored.vcxproj", "{D8404314-73DD-4270-8205-BE677F8FDAC7}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbackupstore", "libbackupstore.vcxproj", "{97D89AEF-2BE4-4E34-8703-03BA67BF4494}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbstoreaccounts", "bbstoreaccounts.vcxproj", "{C8A1509C-F91B-4140-BD51-B87FF24FB95F}"

-	ProjectSection(ProjectDependencies) = postProject

-		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

-		{97D89AEF-2BE4-4E34-8703-03BA67BF4494} = {97D89AEF-2BE4-4E34-8703-03BA67BF4494}

-	EndProjectSection

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/infrastructure/msvc/2010/boxquery.vcxproj b/infrastructure/msvc/2010/boxquery.vcxproj
index 6db68c2e..fbe8b8d8 100644
--- a/infrastructure/msvc/2010/boxquery.vcxproj
+++ b/infrastructure/msvc/2010/boxquery.vcxproj
@@ -41,7 +41,7 @@
   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

diff --git a/infrastructure/msvc/2010/common.vcxproj b/infrastructure/msvc/2010/common.vcxproj
index 19adf4ce..5856391b 100644
--- a/infrastructure/msvc/2010/common.vcxproj
+++ b/infrastructure/msvc/2010/common.vcxproj
@@ -40,16 +40,14 @@
   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>

     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>

+    <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compile</CustomBuildBeforeTargets>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <PreBuildEvent>

-      <Message>Determining Version Number</Message>

-      <Command>perl $(ProjectDir)..\getversion.pl</Command>

-    </PreBuildEvent>

+    <PreBuildEvent />

     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\lib\backupclient;$(ProjectDir)..\..\..\lib\common;$(ProjectDir)..\..\..\lib\compress;$(ProjectDir)..\..\..\lib\crypto;$(ProjectDir)..\..\..\lib\server;$(ProjectDir)..\..\..\lib\raidfile;$(ProjectDir)..\..\..\lib\win32;$(ProjectDir)..\..\..\..\openssl\include;$(ProjectDir)..\..\..\..\zlib\include;$(ProjectDir)..\..\..\..\pcre</AdditionalIncludeDirectories>

@@ -66,6 +64,15 @@
     <Lib>

       <OutputFile>$(OutDir)common.lib</OutputFile>

     </Lib>

+    <CustomBuildStep>

+      <Command>perl $(ProjectDir)..\getversion.pl</Command>

+    </CustomBuildStep>

+    <CustomBuildStep>

+      <Message>Determining Version Number</Message>

+    </CustomBuildStep>

+    <CustomBuildStep>

+      <Outputs>$(ProjectDir)..\..\..\lib\common\BoxVersion.h;%(Outputs)</Outputs>

+    </CustomBuildStep>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

diff --git a/infrastructure/msvc/2010/libbackupstore.vcxproj b/infrastructure/msvc/2010/libbackupstore.vcxproj
index 4ee8242e..c009db83 100644
--- a/infrastructure/msvc/2010/libbackupstore.vcxproj
+++ b/infrastructure/msvc/2010/libbackupstore.vcxproj
@@ -41,7 +41,7 @@
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <TargetExt>.lib</TargetExt>

-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\</IntDir>

+    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

diff --git a/infrastructure/msvc/2010/qdbm.vcxproj b/infrastructure/msvc/2010/qdbm.vcxproj
index 21dc04c3..0bfb4f91 100644
--- a/infrastructure/msvc/2010/qdbm.vcxproj
+++ b/infrastructure/msvc/2010/qdbm.vcxproj
@@ -39,7 +39,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <TargetExt>.lib</TargetExt>

     <OutDir>$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\</IntDir>

+    <IntDir>$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

diff --git a/infrastructure/msvc/2010/win32test.vcxproj b/infrastructure/msvc/2010/win32test.vcxproj
index b605805b..02f196d2 100644
--- a/infrastructure/msvc/2010/win32test.vcxproj
+++ b/infrastructure/msvc/2010/win32test.vcxproj
@@ -40,7 +40,7 @@
   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\..\$(Configuration)\$(ProjectName)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\Release\</IntDir>