autotools build: Don't generate NMake snippets for introspection

We now have those parts directly in our NMake Makefiles used for introspection, which results from the work to split out the source file listings from gdk/Makefile.am and gtk/Makefile.am, so we could drop those items from our autotools build files where those snippets were generated during 'make dist'.
2019-07-31 20:32:16 +08:00
parent 3df0e78d4a
commit 3edbb75831
4 changed files with 3 additions and 246 deletions
--- a/build/Makefile.msvc-introspection
+++ b/build/Makefile.msvc-introspection
@@ -1,128 +0,0 @@
-# Author: Fan, Chun-wei
-# Common autotools file for constructing the g-ir-scanner and
-# g-ir-compiler command lines for Visual Studio builds.
-
-# This is copied from $(srcroot)/build from the gobject-introspection
-# project, which may be included in projects that support both
-# Visual Studio builds and introspection.
-
-# * Input variables:
-#
-#   MSVC_INTROSPECT_GIRS - List of .gir's that should be built
-#                          in the NMake Makefiles
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM
-#    is required unless --headers-only is specified in
-#    YourLib_1_0_gir__MSVC_SCANNERFLAGS)
-#
-#   include $(top_srcdir)/build/Makefile.msvc-introspection
-#   MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
-#   YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
-#   YourLib_1_0_gir_VERSION = 1.0 # This is optional
-#   YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0
-#   YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES)
-#   YourLib_1_0_gir_MSVC_PROGRAM = YourProgram
-#   YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files)
-#   YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's)
-#   YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
-
-# Private functions
-
-## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
-## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
-_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-
-# Namespace and Version is either fetched from the gir filename
-# or the _NAMESPACE/_VERSION variable combo
-_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1)))))
-_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=))))
-_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc)
-
-# _PROGRAM is an optional variable which needs its own --program argument
-_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM))
-
-# Deduce the sub-folder from $(srcroot) where the sources reside in
-_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
-_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc))
-_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\)
-_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc))
-
-_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES))
-_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc))))
-
-# Create a list of items for:
-# - Libraries
-# - Packages
-# - GIRs to include
-# - packages to export
-
-_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib))
-_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
-_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
-_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
-
-#
-# Create NMake Makefile Sections for Building Introspection files
-# from autotools files
-# $(1) - File Name of the .gir that is to be generated
-#
-
-define gir-nmake-builder
-
-# Basic sanity check, to make sure required variables are set
-$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES))
-$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
-          $($(_gir_name)_MSVC_LIBS),
-          $($(_gir_name)_MSVC_PROGRAM)),,
-    $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-
-$(top_builddir)/build/win32/$(_gir_name)_list: Makefile
-	rm -f $(top_builddir)/build/win32/$(_gir_name)_list
-	for F in $(_gir_files_msvc); do \
-		case $$$$F in \
-		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
-			echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/build/win32/$(_gir_name)_list \
-			;; \
-		esac; \
-	done
-
-$(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
-	-$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
-
-# Assemble the Command to Run g-ir-scanner
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--verbose -no-libtool	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--namespace='$(_gir_namespace_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--nsversion='$(_gir_version_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--cflags-begin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_CFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--cflags-end	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
-
-# Finally Assemble the Command to Compile the generated .gir
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--includedir=$$$$(@D:\=/) --debug --verbose	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(@R:\=/).gir	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
-endef
-
-$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,31 +1,5 @@
 include $(top_srcdir)/Makefile.decl

-if HAVE_INTROSPECTION
-GENERATED_ITEMS = \
-	introspection.body.mak	\
-	Gdk_3_0_gir_list		\
-	GdkWin32_3_0_gir_list	\
-	Gtk_3_0_gir_list
-
-MSVC_INTROSPECTION_INTERMEDIATE_FILES = Gdk-3.0.gir.msvc.introspect GdkWin32-3.0.gir.msvc.introspect Gtk-3.0.gir.msvc.introspect
-
-introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-	-$(RM) introspection.body.mak
-	for F in `ls *.msvc.introspect`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \
-			;; \
-		esac; \
-	done
-	$(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-else
-GENERATED_ITEMS =
-DISTCLEANFILES =
-endif
-
 SUBDIRS =	\
 	vs9 	\
 	vs10	\
@@ -48,7 +22,6 @@ EXTRA_DIST +=	\
 	replace.py			\
 	pc_base.py			\
 	gtkpc.py			\
-	README_EGL_MSVC.txt		\
-	$(GENERATED_ITEMS)
+	README_EGL_MSVC.txt

 -include $(top_srcdir)/git.mk
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -312,46 +312,9 @@ gdk_3_HEADERS_EXCLUDES = dummy

 include $(top_srcdir)/build/Makefile.msvcproj

-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir
-
-BASE_MSVC_GIR_CFLAGS =			\
-	$(GDK_CFLAGS_DEFINES)		\
-	-I../.. -I../../gdk -I.../../gdk/win32
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/build/win32/Gdk-3.0.gir.msvc.introspect	\
-	$(top_builddir)/build/win32/Gdk_3_0_gir_list			\
-	$(top_builddir)/build/win32/GdkWin32-3.0.gir.msvc.introspect	\
-	$(top_builddir)/build/win32/GdkWin32_3_0_gir_list
-
-Gdk_3_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES)
-Gdk_3_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_3_0_gir_INCLUDES)
-Gdk_3_0_gir_MSVC_LIBS = gdk-3.0
-Gdk_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_3_0_gir_MSVC_SCANNERFLAGS = $(Gdk_3_0_gir_SCANNERFLAGS)
-
-GdkWin32_3_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_3_0_gir_INCLUDES)
-GdkWin32_3_0_gir_MSVC_LIBS = $(Gdk_3_0_gir_MSVC_LIBS)
-GdkWin32_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-GdkWin32_3_0_gir_MSVC_SCANNERFLAGS =	\
-	--identifier-prefix=Gdk		\
-	--c-include="gdk/gdkwin32.h"	\
-	--include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir'
-
-include $(top_srcdir)/build/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
 dist-hook: \
 	$(top_builddir)/build/win32/vs9/gdk-3.vcproj	\
-	$(top_builddir)/build/win32/vs9/gdk-3.headers	\
-	$(INTROSPECTION_INTERMEDIATE_ITEMS)
+	$(top_builddir)/build/win32/vs9/gdk-3.headers

 DISTCLEANFILES = gdkconfig.h stamp-gc-h

--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -583,60 +583,9 @@ gtk_3_HEADERS_EXCLUDES = dummy

 include $(top_srcdir)/build/Makefile.msvcproj

-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gtk-3.0.gir
-
-GTK_MSVC_GIR_CFLAGS =						\
-	$(GTK_BASE_CFLAGS_DEFINES)				\
-	-DGTK_LIBDIR=\\\"/dummy/lib\\\"				\
-	-DGTK_DATADIR=\\\"/dummy/share\\\"			\
-	-DGTK_DATA_PREFIX=\\\"/dummy\\\"			\
-	-DGTK_SYSCONFDIR=\\\"/dummy/etc\\\"			\
-	-DGTK_HOST=\\\"'$$$$(AT_PLAT)'-pc-vs'$$$$(VSVER)'\\\"	\
-	-DGTK_PRINT_BACKENDS=\\\"file\\\"			\
-	-DINCLUDE_IM_am_et			\
-	-DINCLUDE_IM_cedilla			\
-	-DINCLUDE_IM_cyrillic_translit		\
-	-DINCLUDE_IM_ime			\
-	-DINCLUDE_IM_inuktitu			\
-	-DINCLUDE_IM_ipa			\
-	-DINCLUDE_IM_multipress			\
-	-DINCLUDE_IM_thai			\
-	-DINCLUDE_IM_ti_er			\
-	-DINCLUDE_IM_ti_et			\
-	-DINCLUDE_IM_viqr			\
-	-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API	\
-	-I../.. -I../../gtk -I../../gdk
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/build/win32/Gtk-3.0.gir.msvc.introspect		\
-	$(top_builddir)/build/win32/Gtk_3_0_gir_list
-
-Gtk_3_0_gir_MSVC_FILES =		\
-	$(introspected_pub_headers)	\
-	$(gtk_base_c_sources)		\
-	$(gtk_os_win32_c_sources)	\
-	gtktypebuiltins.h		\
-	gtktypebuiltins.c
-
-Gtk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_3_0_gir_EXPORT_PACKAGES)
-Gtk_3_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
-Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0
-Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
-Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir'
-
-include $(top_srcdir)/build/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-
-endif
-
 dist-hook: \
 	$(top_builddir)/build/win32/vs9/gtk-3.vcproj	\
-	$(top_builddir)/build/win32/vs9/gtk-3.headers	\
-	$(INTROSPECTION_INTERMEDIATE_ITEMS)
+	$(top_builddir)/build/win32/vs9/gtk-3.headers

 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme