[gtk/msvcproj-nmake-install: 22/22] Drop win32/Makefile.msvc-introspection

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/msvcproj-nmake-install: 22/22] Drop win32/Makefile.msvc-introspection
Date: Thu, 19 May 2022 03:35:49 +0000 (UTC)

commit ff847c43adf75353033f2692c7abe875cc8297d3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu May 19 11:33:25 2022 +0800

    Drop win32/Makefile.msvc-introspection
    
    We no longer use the autotools 'dist-hook' to generate the items that we
    need to build introspection with the Visual Studio projects, so drop the
    autotools files and bits that we had to support this.  So, for
    introspection on Visual Studio via the project files, it is purely via
    NMake at this point.

 gdk/Makefile.am                   |  42 +------------
 gtk/Makefile.am                   |  54 +---------------
 win32/Makefile.am                 |  29 +--------
 win32/Makefile.msvc-introspection | 128 --------------------------------------
 win32/generate-msvc.mak           |  14 -----
 5 files changed, 3 insertions(+), 264 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 3e9f90a280..e5eb5e43a6 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -293,48 +293,8 @@ gdk_3_EXCLUDES = dummy
 
 include $(top_srcdir)/win32/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'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3' -I.. \
-       -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3/gdk' -I../gdk \
-       -I../gdk/win32
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-       $(top_builddir)/win32/Gdk-3.0.gir.msvc.introspect       \
-       $(top_builddir)/win32/Gdk_3_0_gir_list                  \
-       $(top_builddir)/win32/GdkWin32-3.0.gir.msvc.introspect  \
-       $(top_builddir)/win32/GdkWin32_3_0_gir_list
-
-Gdk_3_0_gir_MSVC_FILES = $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources))   \
-       $(gdk_c_sources)        \
-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)/win32/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
 dist-hook: \
-       $(top_builddir)/win32/vs9/gdk-3.vcproj  \
-       $(INTROSPECTION_INTERMEDIATE_ITEMS)
+       $(top_builddir)/win32/vs9/gdk-3.vcproj
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 17788c82e5..7474ed0d2b 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -529,60 +529,8 @@ gtk_3_EXCLUDES = dummy
 
 include $(top_srcdir)/win32/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'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gtk-3'      \
-       -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3' -I.. \
-       -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gtk-3/gtk' -I../gtk \
-       -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3/gdk' -I../gdk
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-       $(top_builddir)/win32/Gtk-3.0.gir.msvc.introspect               \
-       $(top_builddir)/win32/Gtk_3_0_gir_list
-
-Gtk_3_0_gir_MSVC_FILES =               \
-       $(filter-out gtktypebuiltins.h gtkversion.h, $(introspected_pub_headers)) \
-       $(gtk_base_c_sources)           \
-       $(gtk_os_win32_c_sources)
-
-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)/win32/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-
-endif
-
 dist-hook: \
-       $(top_builddir)/win32/vs9/gtk-3.vcproj  \
-       $(INTROSPECTION_INTERMEDIATE_ITEMS)
+       $(top_builddir)/win32/vs9/gtk-3.vcproj
 
 # 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
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 98424c3771..bc7a513ad5 100644
--- a/win32/Makefile.am
+++ b/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)/win32/$$F >>introspection.body.mak \
-                       ;; \
-               esac; \
-       done
-       $(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-else
-GENERATED_ITEMS =
-DISTCLEANFILES =
-endif
-
 SUBDIRS =      \
        vs9     \
        vs10    \
@@ -51,7 +25,6 @@ EXTRA_DIST += \
        replace.py                      \
        pc_base.py                      \
        gtkpc.py                        \
-       README_FEATURES_MSVC.txt        \
-       $(GENERATED_ITEMS)
+       README_FEATURES_MSVC.txt
 
 -include $(top_srcdir)/git.mk
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index 67f610fd92..fe1523019c 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -299,20 +299,6 @@ regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources)
        @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs16\$(DEMO_VS10_PROJ) 
--instring=">v100<" --outstring=">v142<"
        @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs17\$(DEMO_VS10_PROJ) 
--instring=">v100<" --outstring=">v143<"
 
-Gdk_3_0_gir_list_final: Gdk_3_0_gir_list $(GDK_GENERATED_SOURCES)
-       @echo Generating $@...
-       @type Gdk_3_0_gir_list>$@
-       @for %%s in ($(GDK_GENERATED_SOURCES)) do echo %%s>>$@
-
-Gtk_3_0_gir_list_final: Gtk_3_0_gir_list $(GTK_TYPEBUILTIN_SOURCES)
-       @echo Generating $@...
-       @type Gtk_3_0_gir_list>$@
-       @for %%s in ($(GTK_TYPEBUILTIN_SOURCES) .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkversion.h) do 
echo %%s>>$@
-
-GdkWin32_3_0_gir_list_final: GdkWin32_3_0_gir_list
-       @echo Copying $@...
-       @copy $** $@
-
 # Remove the generated files
 clean:
        @-del /f /q ..\demos\icon-browser\resources.c
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]