[gtk+] MSVC Build Files: Use Real GTK+ Version

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

commit 8a2a5adc8f2fda05edb0484891536c3eb4b0d326
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Aug 7 23:11:34 2014 +0800

    MSVC Build Files: Use Real GTK+ Version
    
    Make the Visual C++-related build files contain the actual GTK+ version, by
    generating them during the configure stage and dist'ing them in the release
    tarballs.  This is especially important for builds of introspection files,
    as one may need to look at the release version of GTK+ in those files.

 build/Makefile.am                                  |    1 +
 ...tion-msvc.mak => gtk-introspection-msvc.mak.in} |    2 +-
 build/win32/vs10/Makefile.am                       |    1 +
 ...sion-paths.props => gtk-version-paths.props.in} |    4 ++++
 build/win32/vs9/Makefile.am                        |    1 +
 ...-paths.vsprops => gtk-version-paths.vsprops.in} |    4 ++++
 configure.ac                                       |    3 +++
 7 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/build/Makefile.am b/build/Makefile.am
index 931735b..1e6b825 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST +=   \
        gen-file-list-gtk.py    \
        detectenv_msvc.mak      \
        introspection-msvc.mak  \
+       gtk-introspection-msvc.mak.in   \
        gtk-introspection-msvc.mak
 
 -include $(top_srcdir)/git.mk
diff --git a/build/gtk-introspection-msvc.mak b/build/gtk-introspection-msvc.mak.in
similarity index 98%
rename from build/gtk-introspection-msvc.mak
rename to build/gtk-introspection-msvc.mak.in
index fe1fa3f..9713023 100644
--- a/build/gtk-introspection-msvc.mak
+++ b/build/gtk-introspection-msvc.mak.in
@@ -74,7 +74,7 @@ Gtk-$(APIVERSION).gir: gtk_list
        --pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"       \
        -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"      \
        $(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"    \
-       -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\"        \
+       -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION \" \
        -DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"        \
        -DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\" \
        -DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"     \
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index ba9b0aa..74767fb 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -36,6 +36,7 @@ EXTRA_DIST += \
        gtk-gen-srcs.props      \
        gtk-ignore-broadway.props       \
        gtk-install.props       \
+       gtk-version-paths.props.in      \
        gtk-version-paths.props
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/gtk-version-paths.props b/build/win32/vs10/gtk-version-paths.props.in
similarity index 94%
rename from build/win32/vs10/gtk-version-paths.props
rename to build/win32/vs10/gtk-version-paths.props.in
index f23f373..ea2a1dc 100644
--- a/build/win32/vs10/gtk-version-paths.props
+++ b/build/win32/vs10/gtk-version-paths.props.in
@@ -5,6 +5,7 @@
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>3.0</ApiVersion>
+    <GtkVersion>@GTK_VERSION@</GtkVersion>
     <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
     <GtkLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GtkLibtoolCompatibleDllSuffix>
     <GtkSeparateVSDllPrefix />
@@ -29,6 +30,9 @@
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>
+    <BuildMacro Include="GtkVersion">
+      <Value>$(GtkVersion)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkLibtoolCompatibleDllPrefix">
       <Value>$(GtkLibtoolCompatibleDllPrefix)</Value>
     </BuildMacro>
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index f5d6f21..18e3fe3 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST += \
        gtk-gen-srcs.vsprops    \
        gtk-ignore-broadway.vsprops     \
        gtk-install.vsprops     \
+       gtk-version-paths.vsprops.in    \
        gtk-version-paths.vsprops
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/gtk-version-paths.vsprops b/build/win32/vs9/gtk-version-paths.vsprops.in
similarity index 94%
rename from build/win32/vs9/gtk-version-paths.vsprops
rename to build/win32/vs9/gtk-version-paths.vsprops.in
index c12a839..7f2d102 100644
--- a/build/win32/vs9/gtk-version-paths.vsprops
+++ b/build/win32/vs9/gtk-version-paths.vsprops.in
@@ -21,6 +21,10 @@
                Value="3.0"
        />
        <UserMacro
+               Name="GtkVersion"
+               Value="@GTK_VERSION@"
+       />
+       <UserMacro
                Name="GtkLibtoolCompatibleDllPrefix"
                Value="lib"
        />
diff --git a/configure.ac b/configure.ac
index 314dacf..a75130e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1875,10 +1875,13 @@ docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
 build/Makefile
+build/gtk-introspection-msvc.mak
 build/win32/Makefile
 build/win32/crypt/Makefile
 build/win32/vs9/Makefile
+build/win32/vs9/gtk-version-paths.vsprops
 build/win32/vs10/Makefile
+build/win32/vs10/gtk-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 gdk/Makefile