[glib-networking/wip/openssl: 18/19] Visual Studio builds: Refine "installation" process

[Ignacio Casal Quinteiro <icq src gnome org>]

commit d6fb8e06ba68acfba0bef86dab0bc0bf3d6bd02f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue May 10 15:00:45 2016 +0800

    Visual Studio builds: Refine "installation" process
    
    Split out the part where we generate the GIO module cache after copying
    the built DLLs, so that it is easier to ensure all the things needed are
    in place when CopyDir != GlibEtcInstallRoot.

 build/win32/vs10/glib-networking-install.props   |    8 +++++---
 build/win32/vs10/glib-networking-install.vcxproj |    8 ++++----
 build/win32/vs9/glib-networking-install.vcproj   |    8 ++++----
 build/win32/vs9/glib-networking-install.vsprops  |    6 ++++--
 4 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/build/win32/vs10/glib-networking-install.props b/build/win32/vs10/glib-networking-install.props
index d374e2d..5ea8d9e 100644
--- a/build/win32/vs10/glib-networking-install.props
+++ b/build/win32/vs10/glib-networking-install.props
@@ -12,9 +12,8 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libgiognomeproxy.dll $(CopyD
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libgiognomeproxy.pdb $(CopyDir)\bin\gio\modules
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libgioopenssl.dll $(CopyDir)\bin\gio\modules
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libgioopenssl.pdb $(CopyDir)\bin\gio\modules
-
-$(GlibEtcInstallRoot)\bin\gio-querymodules $(CopyDir)\bin\gio\modules
-</GlibNetworkingDoInstall>
+    </GlibNetworkingDoInstall>
+    <GlibNetworkingPostInstall>$(GlibEtcInstallRoot)\bin\gio-querymodules 
$(CopyDir)\bin\gio\modules</GlibNetworkingPostInstall>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>glibnetworkinginstallprops</_PropertySheetDisplayName>
@@ -24,5 +23,8 @@ $(GlibEtcInstallRoot)\bin\gio-querymodules $(CopyDir)\bin\gio\modules
     <BuildMacro Include="GlibNetworkingDoInstall">
       <Value>$(GlibNetworkingDoInstall)</Value>
     </BuildMacro>
+    <BuildMacro Include="GlibNetworkingPostInstall">
+      <Value>$(GlibNetworkingPostInstall)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/glib-networking-install.vcxproj 
b/build/win32/vs10/glib-networking-install.vcxproj
index ea6c449..992b8fb 100644
--- a/build/win32/vs10/glib-networking-install.vcxproj
+++ b/build/win32/vs10/glib-networking-install.vcxproj
@@ -76,16 +76,16 @@
   <ItemGroup>
     <CustomBuild Include="..\..\..\random_file">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibNetworkingDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\random_file_a;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibNetworkingDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\random_file_a;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying Build Results...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibNetworkingDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\random_file_a;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibNetworkingDoInstall)</Command>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)</Command>
       <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\random_file_a;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
diff --git a/build/win32/vs9/glib-networking-install.vcproj b/build/win32/vs9/glib-networking-install.vcproj
index 724c562..6f83b27 100644
--- a/build/win32/vs9/glib-networking-install.vcproj
+++ b/build/win32/vs9/glib-networking-install.vcproj
@@ -26,7 +26,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GlibNetworkingDoInstall)"
+                               CommandLine="$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -37,7 +37,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GlibNetworkingDoInstall)"
+                               CommandLine="$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -49,7 +49,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GlibNetworkingDoInstall)"
+                               CommandLine="$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -61,7 +61,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GlibNetworkingDoInstall)"
+                               CommandLine="$(GlibNetworkingDoInstall)$(GlibNetworkingPostInstall)"
                        />
                </Configuration>
        </Configurations>
diff --git a/build/win32/vs9/glib-networking-install.vsprops b/build/win32/vs9/glib-networking-install.vsprops
index 2294c09..9083cfe 100644
--- a/build/win32/vs9/glib-networking-install.vsprops
+++ b/build/win32/vs9/glib-networking-install.vsprops
@@ -14,8 +14,10 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\libgiognomeproxy.dll
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\libgiognomeproxy.pdb 
$(CopyDir)\bin\gio\modules&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\libgioopenssl.dll 
$(CopyDir)\bin\gio\modules&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\libgioopenssl.pdb 
$(CopyDir)\bin\gio\modules&#x0D;&#x0A;
-
-$(GlibEtcInstallRoot)\bin\gio-querymodules $(CopyDir)\bin\gio\modules&#x0D;&#x0A;
 "
        />
+       <UserMacro
+               Name="GlibNetworkingPostInstall"
+               Value="$(GlibEtcInstallRoot)\bin\gio-querymodules $(CopyDir)\bin\gio\modules"
+       />
 </VisualStudioPropertySheet>