[librsvg] Visual Studio builds: Refine "installation" process

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

commit 5183f46532be3b3782341e4132ca8b0416f50704
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue May 10 15:11:54 2016 +0800

    Visual Studio builds: Refine "installation" process
    
    Split out the part where we generate the cache for GDK-Pixbuf, so that
    it is easier to ensure the needed parts are in place when Copydir !=
    GlibEtcInstallDir.

 build/win32/vs10/rsvg-install.propsin  |    8 +++++---
 build/win32/vs10/rsvg-install.vcxproj  |    8 ++++----
 build/win32/vs9/rsvg-install.vcproj    |    8 ++++----
 build/win32/vs9/rsvg-install.vspropsin |   26 ++++++++++++++------------
 4 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/build/win32/vs10/rsvg-install.propsin b/build/win32/vs10/rsvg-install.propsin
index a59b84e..4ffeedc 100644
--- a/build/win32/vs10/rsvg-install.propsin
+++ b/build/win32/vs10/rsvg-install.propsin
@@ -22,9 +22,8 @@ mkdir $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-$(ApiVersion).lib $(CopyDir)\lib
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libpixbufloader-svg.dll 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libpixbufloader-svg.pdb 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders
-
-$(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe &gt; 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
-</RsvgDoInstall>
+    </RsvgDoInstall>
+    <RsvgPostInstall>$(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe &gt; 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache</RsvgPostInstall>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>rsvginstallprops</_PropertySheetDisplayName>
@@ -34,5 +33,8 @@ $(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe &gt; $(CopyDir)\lib\gdk-p
     <BuildMacro Include="RsvgDoInstall">
       <Value>$(RsvgDoInstall)</Value>
     </BuildMacro>
+    <BuildMacro Include="RsvgPostInstall">
+      <Value>$(RsvgPostInstall)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/rsvg-install.vcxproj b/build/win32/vs10/rsvg-install.vcxproj
index ea4ecb5..b077233 100644
--- a/build/win32/vs10/rsvg-install.vcxproj
+++ b/build/win32/vs10/rsvg-install.vcxproj
@@ -76,16 +76,16 @@
   <ItemGroup>
     <CustomBuild Include="placeholder">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(RsvgDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(RsvgDoInstall)$(RsvgPostInstall)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">placeholder;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(RsvgDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(RsvgDoInstall)$(RsvgPostInstall)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">placeholder;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(RsvgDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(RsvgDoInstall)$(RsvgPostInstall)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">placeholder;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(RsvgDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(RsvgDoInstall)$(RsvgPostInstall)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">placeholder;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
diff --git a/build/win32/vs9/rsvg-install.vcproj b/build/win32/vs9/rsvg-install.vcproj
index e2f5356..d64e2e9 100644
--- a/build/win32/vs9/rsvg-install.vcproj
+++ b/build/win32/vs9/rsvg-install.vcproj
@@ -26,7 +26,7 @@
                        >
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="$(RsvgDoInstall)"
+                               CommandLine="$(RsvgDoInstall)$(RsvgPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -38,7 +38,7 @@
                        >
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="$(RsvgDoInstall)"
+                               CommandLine="$(RsvgDoInstall)$(RsvgPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -49,7 +49,7 @@
                        >
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="$(RsvgDoInstall)"
+                               CommandLine="$(RsvgDoInstall)$(RsvgPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -61,7 +61,7 @@
                        >
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="$(RsvgDoInstall)"
+                               CommandLine="$(RsvgDoInstall)$(RsvgPostInstall)"
                        />
                </Configuration>
        </Configurations>
diff --git a/build/win32/vs9/rsvg-install.vspropsin b/build/win32/vs9/rsvg-install.vspropsin
index 85721d8..41e7d25 100644
--- a/build/win32/vs9/rsvg-install.vspropsin
+++ b/build/win32/vs9/rsvg-install.vspropsin
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="rsvginstallprops"
- InheritedPropertySheets=".\rsvg-build-defines.vsprops"
- >
- <UserMacro
-  Name="RsvgDoInstall"
-  Value="
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="rsvginstallprops"
+       InheritedPropertySheets=".\rsvg-build-defines.vsprops"
+       >
+       <UserMacro
+               Name="RsvgDoInstall"
+               Value="
 mkdir $(CopyDir)&#x0D;&#x0A;
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
 
@@ -25,8 +25,10 @@ mkdir $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\rsvg-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\libpixbufloader-svg.dll 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\libpixbufloader-svg.pdb 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders&#x0D;&#x0A;
-
-$(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe &gt; 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache&#x0D;&#x0A;
-"
- />
+                     "
+       />
+       <UserMacro
+               Name="RsvgPostInstall"
+               Value="$(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe &gt; 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"
+       />
 </VisualStudioPropertySheet>