[json-glib] Visual Studio builds: Record version numbers in property sheets



commit 6b2f39f0bc8a943446ec3629154df750cfaef572
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Mar 13 15:20:34 2017 +0800

    Visual Studio builds: Record version numbers in property sheets
    
    This will enable us to more easily generate the .pc files after the build.

 ...aths.props => json-glib-version-paths.props.in} |   12 ++++++++++++
 ....vsprops => json-glib-version-paths.vsprops.in} |   12 ++++++++++++
 configure.ac                                       |    2 ++
 3 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/build/win32/vs10/json-glib-version-paths.props 
b/build/win32/vs10/json-glib-version-paths.props.in
similarity index 80%
rename from build/win32/vs10/json-glib-version-paths.props
rename to build/win32/vs10/json-glib-version-paths.props.in
index 0e0eca5..be940e9 100644
--- a/build/win32/vs10/json-glib-version-paths.props
+++ b/build/win32/vs10/json-glib-version-paths.props.in
@@ -5,6 +5,9 @@
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
+    <JsonGlibMajorVersion>@JSON_MAJOR_VERSION@</JsonGlibMajorVersion>
+    <JsonGlibMinorVersion>@JSON_MINOR_VERSION@</JsonGlibMinorVersion>
+    <JsonGlibMicroVersion>@JSON_MICRO_VERSION@</JsonGlibMicroVersion>
     <ApiVersion>1.0</ApiVersion>
     <JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
     <JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
@@ -26,6 +29,15 @@
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="JsonGlibMajorVersion">
+      <Value>$(JsonGlibMajorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="JsonGlibMinorVersion">
+      <Value>$(JsonGlibMinorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="JsonGlibMicroVersion">
+      <Value>$(JsonGlibMicroVersion)</Value>
+    </BuildMacro>
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>
diff --git a/build/win32/vs9/json-glib-version-paths.vsprops 
b/build/win32/vs9/json-glib-version-paths.vsprops.in
similarity index 83%
rename from build/win32/vs9/json-glib-version-paths.vsprops
rename to build/win32/vs9/json-glib-version-paths.vsprops.in
index cade5f9..d9dbda7 100644
--- a/build/win32/vs9/json-glib-version-paths.vsprops
+++ b/build/win32/vs9/json-glib-version-paths.vsprops.in
@@ -21,6 +21,18 @@
                Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
        />
        <UserMacro
+               Name="JsonGlibMajorVersion"
+               Value="@JSON_MAJOR_VERSION@"
+       />
+       <UserMacro
+               Name="JsonGlibMinorVersion"
+               Value="@JSON_MINOR_VERSION@"
+       />
+       <UserMacro
+               Name="JsonGlibMicroVersion"
+               Value="@JSON_MICRO_VERSION@"
+       />
+       <UserMacro
                Name="ApiVersion"
                Value="1.0"
        />
diff --git a/configure.ac b/configure.ac
index 718a249..28d7a62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -378,7 +378,9 @@ AC_CONFIG_FILES([
         build/win32/Makefile
         build/win32/config.h.win32
         build/win32/vs9/Makefile
+        build/win32/vs9/json-glib-version-paths.vsprops
         build/win32/vs10/Makefile
+        build/win32/vs10/json-glib-version-paths.props
         build/win32/vs11/Makefile
         build/win32/vs12/Makefile
         build/win32/vs14/Makefile


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]