[pango] Visual Studio builds: Have package version in the projects

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

commit 9549b7ad68bdbbf22e09940ea43735b9c5396547
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Apr 21 17:15:37 2016 +0800

    Visual Studio builds: Have package version in the projects
    
    This is used to generate the .pc files to make generating introspection
    files easier for packages that depend on Pango.

 ...on-paths.props => pango-version-paths.props.in} |   31 +++++++++++++++----
 ...aths.vsprops => pango-version-paths.vsprops.in} |   28 +++++++++++++++--
 configure.ac                                       |    2 +
 3 files changed, 50 insertions(+), 11 deletions(-)
---
diff --git a/build/win32/vs10/pango-version-paths.props b/build/win32/vs10/pango-version-paths.props.in
similarity index 72%
rename from build/win32/vs10/pango-version-paths.props
rename to build/win32/vs10/pango-version-paths.props.in
index 9780f39..4c4a9ff 100644
--- a/build/win32/vs10/pango-version-paths.props
+++ b/build/win32/vs10/pango-version-paths.props.in
@@ -2,15 +2,20 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup Label="UserMacros">
     <VSVer>10</VSVer>
+    <PangoMajorVersion>@PANGO_VERSION_MAJOR@</PangoMajorVersion>
+    <PangoMinorVersion>@PANGO_VERSION_MINOR@</PangoMinorVersion>
+    <PangoMicroVersion>@PANGO_VERSION_MICRO@</PangoMicroVersion>
+    <ApiVersion>1.0</ApiVersion>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <ApiVersion>1.0</ApiVersion>
     <PangoLibtoolCompatibleDllPrefix>lib</PangoLibtoolCompatibleDllPrefix>
     <PangoLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</PangoLibtoolCompatibleDllSuffix>
     <PangoSeparateVSDllPrefix />
     <PangoSeparateVSDllSuffix>-1-vs$(VSVer)</PangoSeparateVSDllSuffix>
     <PangoDllPrefix>$(PangoSeparateVSDllPrefix)</PangoDllPrefix>
     <PangoDllSuffix>$(PangoSeparateVSDllSuffix)</PangoDllSuffix>
+    <PythonPath>c:\python34</PythonPath>
+    <PythonPathX64>$(PythonPath).x64</PythonPathX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>pangoversionpathsprops</_PropertySheetDisplayName>
@@ -19,18 +24,24 @@
     <BuildMacro Include="VSVer">
       <Value>$(VSVer)</Value>
     </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
+    <BuildMacro Include="PangoMajorVersion">
+      <Value>$(PangoMajorVersion)</Value>
     </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
-      <Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
+    <BuildMacro Include="PangoMinorVersion">
+      <Value>$(PangoMinorVersion)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
+    <BuildMacro Include="PangoMicroVersion">
+      <Value>$(PangoMicroVersion)</Value>
     </BuildMacro>
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
     <BuildMacro Include="PangoLibtoolCompatibleDllPrefix">
       <Value>$(PangoLibtoolCompatibleDllPrefix)</Value>
     </BuildMacro>
@@ -49,5 +60,11 @@
     <BuildMacro Include="PangoDllSuffix">
       <Value>$(PangoDllSuffix)</Value>
     </BuildMacro>
+    <BuildMacro Include="PythonPath">
+      <Value>$(PythonPath)</Value>
+    </BuildMacro>
+    <BuildMacro Include="PythonPathX64">
+      <Value>$(PythonPathX64)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/win32/vs9/pango-version-paths.vsprops b/build/win32/vs9/pango-version-paths.vsprops.in
similarity index 72%
rename from build/win32/vs9/pango-version-paths.vsprops
rename to build/win32/vs9/pango-version-paths.vsprops.in
index a40f4a2..059527d 100644
--- a/build/win32/vs9/pango-version-paths.vsprops
+++ b/build/win32/vs9/pango-version-paths.vsprops.in
@@ -9,18 +9,30 @@
                Value="9"
        />
        <UserMacro
-               Name="GlibEtcInstallRoot"
-               Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+               Name="PangoMajorVersion"
+               Value="@PANGO_VERSION_MAJOR@"
        />
        <UserMacro
-               Name="CopyDir"
-               Value="$(GlibEtcInstallRoot)"
+               Name="PangoMinorVersion"
+               Value="@PANGO_VERSION_MINOR@"
+       />
+       <UserMacro
+               Name="PangoMicroVersion"
+               Value="@PANGO_VERSION_MICRO@"
        />
        <UserMacro
                Name="ApiVersion"
                Value="1.0"
        />
        <UserMacro
+               Name="GlibEtcInstallRoot"
+               Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+       />
+       <UserMacro
+               Name="CopyDir"
+               Value="$(GlibEtcInstallRoot)"
+       />
+       <UserMacro
                Name="PangoLibtoolCompatibleDllPrefix"
                Value="lib"
        />
@@ -46,4 +58,12 @@
                Name="PangoDllSuffix"
                Value="$(PangoSeparateVSDllSuffix)"
        />
+       <UserMacro
+               Name="PythonPath"
+               Value="c:\python27"
+       />
+       <UserMacro
+               Name="PythonPathX64"
+               Value="$(PythonPath).x64"
+       />
 </VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 44875c1..b8ca930 100644
--- a/configure.ac
+++ b/configure.ac
@@ -613,7 +613,9 @@ tests/Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
+build/win32/vs9/pango-version-paths.vsprops
 build/win32/vs10/Makefile
+build/win32/vs10/pango-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile