[glib] Visual Studio builds: Move @GLIB_VERSION@ usage

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

commit 99b30f389ee0272b5d5d256d95c4e7ea278d3cd3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Feb 25 18:37:01 2016 +0800

    Visual Studio builds: Move @GLIB_VERSION@ usage
    
    ... from glib-gen-srcs.[vsprops|props].in to
    glib-version-paths.[vsprops|props].in, and instead let autotools generate
    glib-version-paths.[vsprops|props] rather than
    glib-gen-srcs.[vsprops|props], as this will need to be referenced for
    other items as well, namely generating the .pc files which will become
    useful for introspection builds.

 build/win32/vs10/.gitignore                        |    2 +-
 build/win32/vs10/Makefile.am                       |    8 ++++----
 ...{glib-gen-srcs.props.in => glib-gen-srcs.props} |    2 +-
 ...ion-paths.props => glib-version-paths.props.in} |   12 ++++++++----
 build/win32/vs9/.gitignore                         |    2 +-
 build/win32/vs9/Makefile.am                        |    6 +++---
 ...b-gen-srcs.vsprops.in => glib-gen-srcs.vsprops} |    2 +-
 ...paths.vsprops => glib-version-paths.vsprops.in} |   12 ++++++++----
 configure.ac                                       |    4 ++--
 9 files changed, 29 insertions(+), 21 deletions(-)
---
diff --git a/build/win32/vs10/.gitignore b/build/win32/vs10/.gitignore
index bfc6500..0bdbb50 100644
--- a/build/win32/vs10/.gitignore
+++ b/build/win32/vs10/.gitignore
@@ -8,5 +8,5 @@ glib-compile-resources.vcxproj
 glib-compile-resources.vcxproj.filters
 glib-compile-schemas.vcxproj
 glib-compile-schemas.vcxproj.filters
-glib-gen-srcs.props
+glib-version-paths.props
 glib-install.props
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index a1b5a5a..75b9483 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -9,7 +9,7 @@ GENERATED_ITEMS = \
        glib-compile-schemas.vcxproj.filters    \
        glib-compile-resources.vcxproj  \
        glib-compile-resources.vcxproj.filters  \
-       glib-gen-srcs.props     \
+       glib-version-paths.props        \
        glib-install.props
 
 MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers
@@ -46,10 +46,10 @@ EXTRA_DIST = \
        gdbus.vcxproj                   \
        gdbus.vcxproj.filters           \
        glib-install.vcxproj            \
-       glib-build-defines.props                \
+       glib-build-defines.props        \
        glib-install.propsin            \
-       glib-version-paths.props        \
-       glib-gen-srcs.props.in          \
+       glib-version-paths.props.in     \
+       glib-gen-srcs.props             \
        $(GENERATED_ITEMS)
 
 glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
diff --git a/build/win32/vs10/glib-gen-srcs.props.in b/build/win32/vs10/glib-gen-srcs.props
similarity index 96%
rename from build/win32/vs10/glib-gen-srcs.props.in
rename to build/win32/vs10/glib-gen-srcs.props
index 5cc213f..64a20ea 100644
--- a/build/win32/vs10/glib-gen-srcs.props.in
+++ b/build/win32/vs10/glib-gen-srcs.props
@@ -8,7 +8,7 @@
     <GenGLibConfigH>copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h</GenGLibConfigH>
     <GenGModuleConfH>copy ..\..\..\gmodule\gmoduleconf.h.win32 
..\..\..\gmodule\gmoduleconf.h</GenGModuleConfH>
     <GenGNetworkingH>copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h</GenGNetworkingH>
-    <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py 
--action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums 
--var=GLIB_VERSION --outstring= GLIB_VERSION@</GenGLibMKEnums>
+    <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py 
--action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums 
--var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/glib-version-paths.props b/build/win32/vs10/glib-version-paths.props.in
similarity index 93%
rename from build/win32/vs10/glib-version-paths.props
rename to build/win32/vs10/glib-version-paths.props.in
index 4663a84..6932252 100644
--- a/build/win32/vs10/glib-version-paths.props
+++ b/build/win32/vs10/glib-version-paths.props.in
@@ -2,9 +2,10 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup Label="UserMacros">
     <VSVer>10</VSVer>
+    <GlibVersion>@GLIB_VERSION@</GlibVersion>
+    <ApiVersion>2.0</ApiVersion>
     <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <ApiVersion>2.0</ApiVersion>
     <GlibLibtoolCompatibleDllPrefix>lib</GlibLibtoolCompatibleDllPrefix>
     <GlibLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GlibLibtoolCompatibleDllSuffix>
     <GlibSeparateVSDllPrefix />
@@ -20,15 +21,18 @@
     <BuildMacro Include="VSVer">
       <Value>$(VSVer)</Value>
     </BuildMacro>
+    <BuildMacro Include="GlibVersion">
+      <Value>$(GlibVersion)</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="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
     <BuildMacro Include="GlibLibtoolCompatibleDllPrefix">
       <Value>$(GlibLibtoolCompatibleDllPrefix)</Value>
     </BuildMacro>
diff --git a/build/win32/vs9/.gitignore b/build/win32/vs9/.gitignore
index 08775ac..c23b304 100644
--- a/build/win32/vs9/.gitignore
+++ b/build/win32/vs9/.gitignore
@@ -3,5 +3,5 @@ gobject.vcproj
 gio.vcproj
 glib-compile-resources.vcproj
 glib-compile-schemas.vcproj
-glib-gen-srcs.vsprops
+glib-version-paths.vsprops
 glib-install.vsprops
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index dd97b7b..1cc2b21 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -4,7 +4,7 @@ GENERATED_ITEMS = \
        gio.vcproj              \
        glib-compile-schemas.vcproj     \
        glib-compile-resources.vcproj   \
-       glib-gen-srcs.vsprops   \
+       glib-version-paths.vsprops      \
        glib-install.vsprops
 
 MSVC_HEADERS_LIST = glib.headers gobject.headers gio.headers
@@ -28,8 +28,8 @@ EXTRA_DIST = \
        glib-compile-resources.vcprojin \
        glib-install.vcproj     \
        glib-build-defines.vsprops      \
-       glib-version-paths.vsprops      \
-       glib-gen-srcs.vsprops.in        \
+       glib-version-paths.vsprops.in   \
+       glib-gen-srcs.vsprops   \
        glib-install.vspropsin  \
        $(GENERATED_ITEMS)
 
diff --git a/build/win32/vs9/glib-gen-srcs.vsprops.in b/build/win32/vs9/glib-gen-srcs.vsprops
similarity index 95%
rename from build/win32/vs9/glib-gen-srcs.vsprops.in
rename to build/win32/vs9/glib-gen-srcs.vsprops
index c317aa8..a4cf9f8 100644
--- a/build/win32/vs9/glib-gen-srcs.vsprops.in
+++ b/build/win32/vs9/glib-gen-srcs.vsprops
@@ -23,6 +23,6 @@
        />
        <UserMacro
                Name="GenGLibMKEnums"
-               Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py 
--action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums 
--var=GLIB_VERSION --outstring= GLIB_VERSION@"
+               Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py 
--action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums 
--var=GLIB_VERSION --outstring=$(GlibVersion)"
        />
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/glib-version-paths.vsprops b/build/win32/vs9/glib-version-paths.vsprops.in
similarity index 94%
rename from build/win32/vs9/glib-version-paths.vsprops
rename to build/win32/vs9/glib-version-paths.vsprops.in
index 33b276c..f69da65 100644
--- a/build/win32/vs9/glib-version-paths.vsprops
+++ b/build/win32/vs9/glib-version-paths.vsprops.in
@@ -9,6 +9,14 @@
                Value="9"
        />
        <UserMacro
+               Name="GlibVersion"
+               Value="@GLIB_VERSION@"
+       />
+       <UserMacro
+               Name="ApiVersion"
+               Value="2.0"
+       />
+       <UserMacro
                Name="GlibEtcInstallRoot"
                Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
        />
@@ -17,10 +25,6 @@
                Value="$(GlibEtcInstallRoot)"
        />
        <UserMacro
-               Name="ApiVersion"
-               Value="2.0"
-       />
-       <UserMacro
                Name="GlibLibtoolCompatibleDllPrefix"
                Value="lib"
        />
diff --git a/configure.ac b/configure.ac
index 39e707e..603f621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3386,9 +3386,9 @@ build/Makefile
 build/win32/Makefile
 build/win32/dirent/Makefile
 build/win32/vs9/Makefile
-build/win32/vs9/glib-gen-srcs.vsprops
+build/win32/vs9/glib-version-paths.vsprops
 build/win32/vs10/Makefile
-build/win32/vs10/glib-gen-srcs.props
+build/win32/vs10/glib-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile