[gtk+] MSVC builds: Enhance Binary Installation

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

commit d83294b2ac4594a065aa845260e9e251fcdf56cd
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Aug 2 18:47:12 2013 +0800

    MSVC builds: Enhance Binary Installation
    
    Update the gtk-install-bin property sheets so that it does not "install"
    the wrong GDK DLL/LIB when building a broadway-enabled GDK
    when the non-Broadway GDK had been previously built.

 build/win32/vs10/gtk-install-bin.props  |   20 ++++++++++++++------
 build/win32/vs9/gtk-install-bin.vsprops |   16 ++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/build/win32/vs10/gtk-install-bin.props b/build/win32/vs10/gtk-install-bin.props
index 54fe562..b1602d3 100644
--- a/build/win32/vs10/gtk-install-bin.props
+++ b/build/win32/vs10/gtk-install-bin.props
@@ -10,9 +10,9 @@ mkdir $(CopyDir)\bin
 mkdir $(CopyDir)\lib
 
 
-if exist ..\..\..\MSVC_Release_Broadway goto DO_BROADWAY_BIN
+if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 
-if exist ..\..\..\MSVC_Debug_Broadway goto DO_BROADWAY_BIN
+if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
 
 
 copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
@@ -33,16 +33,24 @@ copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
 copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin
 
 
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.dll $(CopyDir)\bin
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin
 
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin
+
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib 
$(CopyDir)\lib
+
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib 
$(CopyDir)\lib
 
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin
 
 
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.dll $(CopyDir)\bin
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin
+
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin
+
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
 
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib 
$(CopyDir)\lib
 
 if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.exe $(CopyDir)\bin
 
diff --git a/build/win32/vs9/gtk-install-bin.vsprops b/build/win32/vs9/gtk-install-bin.vsprops
index 08ede66..47e79e8 100644
--- a/build/win32/vs9/gtk-install-bin.vsprops
+++ b/build/win32/vs9/gtk-install-bin.vsprops
@@ -11,8 +11,8 @@
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
 mkdir $(CopyDir)\lib&#x0D;&#x0A;
 
-if exist ..\..\..\MSVC_Release_Broadway goto DO_BROADWAY_BIN&#x0D;&#x0A;
-if exist ..\..\..\MSVC_Debug_Broadway goto DO_BROADWAY_BIN&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; goto DO_BROADWAY_BIN&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; goto DO_BROADWAY_BIN&#x0D;&#x0A;
 
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
@@ -24,12 +24,16 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gdk-3-vs*.dll $(CopyDir)\bin&#x0D;
 copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin&#x0D;&#x0A;
 
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy .\Release\$(PlatformName)\bin\*.dll 
$(CopyDir)\bin&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy 
.\Release\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy 
.\Release\$(PlatformName)\bin\gtk-3-*.dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy 
.\Release\$(PlatformName)\bin\gailutil-3-*.dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy 
.\Release\$(PlatformName)\bin\gtk*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy 
.\Release\$(PlatformName)\bin\gailutil*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
 if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy .\Release\$(PlatformName)\bin\*.exe 
$(CopyDir)\bin&#x0D;&#x0A;
 
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$(PlatformName)\bin\*.dll 
$(CopyDir)\bin&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy 
.\Debug\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy 
.\Debug\$(PlatformName)\bin\gtk-3-.dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy 
.\Debug\$(PlatformName)\bin\gailutil-3-.dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy 
.\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy 
.\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
 if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$(PlatformName)\bin\*.exe 
$(CopyDir)\bin&#x0D;&#x0A;
 :DONE_BIN&#x0D;&#x0A;
                                     "