From 3aa6d1186f2769defbb382ffef21af7f26179ea9 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed, 1 Mar 2017 18:08:47 +0800
Subject: Visual Studio builds: Get the micro version as well

Update croco-version-paths.[vsprops|props].in to record the major, minor
and micro versions of a release, and assemble the API version from these
values.  This prepares for generating the .pc file for libcroco.
---
 win32/vs10/croco-version-paths.props.in  | 14 +++++++++++++-
 win32/vs9/croco-version-paths.vsprops.in | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/win32/vs10/croco-version-paths.props.in b/win32/vs10/croco-version-paths.props.in
index 10bbb2b..2184b21 100644
--- a/win32/vs10/croco-version-paths.props.in
+++ b/win32/vs10/croco-version-paths.props.in
@@ -20,7 +20,10 @@ See COPYRIGHTS file for copyright information.
 -->
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <ApiVersion>@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@</ApiVersion>
+    <CrocoMajorVersion>@LIBCROCO_MAJOR_VERSION@</CrocoMajorVersion>
+    <CrocoMinorVersion>@LIBCROCO_MINOR_VERSION@</CrocoMinorVersion>
+    <CrocoMicroVersion>@LIBCROCO_MICRO_VERSION@</CrocoMicroVersion>
+    <ApiVersion>$(CrocoMajorVersion).$(CrocoMinorVersion)</ApiVersion>
     <VSVer>10</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
@@ -36,6 +39,15 @@ See COPYRIGHTS file for copyright information.
     <_PropertySheetDisplayName>crocoversionpathsprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
+    <BuildMacro Include="CrocoMajorVersion">
+      <Value>$(CrocoMajorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CrocoMinorVersion">
+      <Value>$(CrocoMinorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CrocoMicroVersion">
+      <Value>$(CrocoMicroVersion)</Value>
+    </BuildMacro>
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>
diff --git a/win32/vs9/croco-version-paths.vsprops.in b/win32/vs9/croco-version-paths.vsprops.in
index ca95e55..f7a14ea 100644
--- a/win32/vs9/croco-version-paths.vsprops.in
+++ b/win32/vs9/croco-version-paths.vsprops.in
@@ -23,9 +23,21 @@ See COPYRIGHTS file for copyright information.
 	Version="8.00"
 	Name="crocoversionpathsprops"
 	>
+	<UserMacro
+		Name="CrocoMajorVersion"
+		Value="@LIBCROCO_MAJOR_VERSION@"
+	/>
+	<UserMacro
+		Name="CrocoMinorVersion"
+		Value="@LIBCROCO_MINOR_VERSION@"
+	/>
+	<UserMacro
+		Name="CrocoMicroVersion"
+		Value="@LIBCROCO_MICRO_VERSION@"
+	/>
 	<UserMacro
 		Name="ApiVersion"
-		Value="@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@"
+		Value="$(CrocoMajorVersion).$(CrocoMinorVersion)"
 	/>
 	<UserMacro
 		Name="VSVer"
-- 
cgit v1.2.1