[clutter/clutter-1.10] Visual C++ support: Fix "install" process

[Chun-wei Fan <fanchunwei src gnome org>]

commit f9cad0fdaf184d29ac0cc6e6a508b4f0b8e3b644
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jul 3 17:07:14 2012 +0800

    Visual C++ support: Fix "install" process
    
    Apparently the update for supporting building the GDK backend broke the
    "installation" process of the compiled binaries, so fix that up by grouping
    the binaries as either Release or Debug.

 build/win32/vs10/clutter.props   |   30 ++++++++++++++++++++++++++++++
 build/win32/vs10/install.vcxproj |   16 ++++++++--------
 build/win32/vs9/clutter.vsprops  |   24 ++++++++++++++++++++++++
 build/win32/vs9/install.vcproj   |   16 ++++++++--------
 4 files changed, 70 insertions(+), 16 deletions(-)
---
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index cec3175..e478f4e 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -372,6 +372,30 @@ mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
 
 copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
 </ClutterDoInstallGDK>
+<ClutterDoInstallReleaseBin>
+mkdir $(CopyDir)\bin
+
+copy $(SolutionDir)Release\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+copy $(SolutionDir)Release\$(Platform)\bin\*.exe $(CopyDir)\bin
+
+
+mkdir $(CopyDir)\lib
+
+copy $(SolutionDir)Release\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
+</ClutterDoInstallReleaseBin>
+<ClutterDoInstallDebugBin>
+mkdir $(CopyDir)\bin
+
+copy $(SolutionDir)Debug\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+copy $(SolutionDir)Debug\$(Platform)\bin\*.exe $(CopyDir)\bin
+
+
+mkdir $(CopyDir)\lib
+
+copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
+</ClutterDoInstallDebugBin>
     <GenerateClutterDef>
          echo EXPORTS &gt; ..\..\..\clutter\clutter.def
 
@@ -466,6 +490,12 @@ copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiV
     <BuildMacro Include="ClutterDoInstallGDK">
       <Value>$(ClutterDoInstallGDK)</Value>
     </BuildMacro>
+    <BuildMacro Include="ClutterDoInstallReleaseBin">
+      <Value>$(ClutterDoInstallReleaseBin)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDoInstallDebugBin">
+      <Value>$(ClutterDoInstallDebugBin)</Value>
+    </BuildMacro>
     <BuildMacro Include="GenerateClutterDef">
       <Value>$(GenerateClutterDef)</Value>
     </BuildMacro>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 1b1fd25..30a906c 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -127,42 +127,42 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PostBuildEvent>
-      <Command>$(ClutterDoInstall)</Command>
+      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">
     <PostBuildEvent>
-      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>$(ClutterDoInstall)</Command>
+      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall)</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">
     <PreBuildEvent>
-      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PostBuildEvent>
-      <Command>$(ClutterDoInstall)</Command>
+      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
     <PostBuildEvent>
-      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>$(ClutterDoInstall)</Command>
+      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">
     <PreBuildEvent>
-      <Command>$(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index ebc7b6d..b0f2a8a 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -280,6 +280,30 @@ copy ..\..\..\clutter\gdk\clutter-gdk.h $(OutDir)\include\clutter-$(ClutterApiVe
 			  "
 	/>
 	<UserMacro
+		Name="ClutterDoInstallReleaseBin"
+		Value="
+mkdir $(OutDir)\bin&#x0D;&#x0A;
+copy $(SolutionDir)Release\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
+
+copy $(SolutionDir)Release\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
+
+mkdir $(OutDir)\lib&#x0D;&#x0A;
+copy $(SolutionDir)Release\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+			  "
+	/>
+		<UserMacro
+		Name="ClutterDoInstallDebugBin"
+		Value="
+mkdir $(OutDir)\bin&#x0D;&#x0A;
+copy $(SolutionDir)Debug\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
+
+copy $(SolutionDir)Debug\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
+
+mkdir $(OutDir)\lib&#x0D;&#x0A;
+copy $(SolutionDir)Debug\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
 		Name="GenerateClutterDef"
 		Value="
 		       echo EXPORTS &gt; ..\..\..\clutter\clutter.def&#x0D;&#x0A;
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 69fc130..713a2b5 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -27,7 +27,7 @@
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstall)"
+				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -39,7 +39,7 @@
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
 			/>
 		</Configuration>
 		<Configuration
@@ -52,7 +52,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstall)"
+				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -65,7 +65,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
 			/>
 		</Configuration>
 		<Configuration
@@ -78,7 +78,7 @@
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstall)"
+				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -91,7 +91,7 @@
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
 			/>
 		</Configuration>
 		<Configuration
@@ -105,7 +105,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstall)"
+				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -119,7 +119,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
 			/>
 		</Configuration>
 	</Configurations>