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

@@ -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

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\"	\

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

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>

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

build/win32/vs9/gtk-version-paths.vsprops.in

@@ -20,6 +20,10 @@
 		Name="ApiVersion"
 		Value="3.0"
 	/>
+	<UserMacro
+		Name="GtkVersion"
+		Value="@GTK_VERSION@"
+	/>
 	<UserMacro
 		Name="GtkLibtoolCompatibleDllPrefix"
 		Value="lib"

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