[gtksourceview/meson.msvc: 7/8] build: Drop the Visual Studio projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/meson.msvc: 7/8] build: Drop the Visual Studio projects
- Date: Wed, 24 Apr 2019 10:55:05 +0000 (UTC)
commit 959e968b591517a93fd4941c9400a240ec2e6b4e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Apr 24 16:57:43 2019 +0800
build: Drop the Visual Studio projects
Since the Meson build files are now updated to support building on
Visual Studio, Meson is now the supported method of building
GtkSourceView using Visual Studio, so it's time to drop the Visual
Studio projects.
The Meson build files are more comprehensive as:
-It automatically builds the introspection files and 'installs' them, if
GObject-Introspection is found.
-The test programs are built and can be run for the build process.
-It is much easier to build directly from a GIT checkout.
Makefile.am | 6 +-
configure.ac | 11 +-
gtksourceview/Makefile.am | 77 ------
gtksourceview/meson.build | 2 +-
msvc/Makefile.am | 3 +
{win32 => msvc}/math.h | 0
win32/Makefile-newvs.am | 55 ----
win32/Makefile.am | 46 ----
win32/Makefile.msvc-introspection | 129 ---------
win32/Makefile.msvcproj | 153 -----------
win32/detectenv-msvc.mak | 78 ------
win32/gen-enums.batin | 100 -------
win32/gtksource_version_h.py | 29 --
win32/gtksourceview4-introspection-msvc.mak | 36 ---
win32/gtksourceviewpc.py | 42 ---
win32/introspection-msvc.mak | 94 -------
win32/pc_base.py | 124 ---------
win32/replace.py | 115 --------
win32/vs10/Makefile.am | 31 ---
win32/vs10/gtksourceview-4.sln | 36 ---
win32/vs10/gtksourceview-4.vcxproj.filtersin | 26 --
win32/vs10/gtksourceview-4.vcxprojin | 207 --------------
win32/vs10/gtksourceview4-build-defines.props | 36 ---
win32/vs10/gtksourceview4-gen-srcs.props | 32 ---
win32/vs10/gtksourceview4-install.propsin | 51 ----
win32/vs10/gtksourceview4-install.vcxproj | 112 --------
win32/vs10/gtksourceview4-install.vcxproj.filters | 13 -
win32/vs10/gtksourceview4-version-paths.props.in | 83 ------
win32/vs11/Makefile.am | 21 --
win32/vs12/Makefile.am | 21 --
win32/vs14/Makefile.am | 21 --
win32/vs15/Makefile.am | 22 --
win32/vs9/Makefile.am | 24 --
win32/vs9/README.txt | 116 --------
win32/vs9/gtksourceview-4.sln | 39 ---
win32/vs9/gtksourceview-4.vcprojin | 312 ----------------------
win32/vs9/gtksourceview4-build-defines.vsprops | 26 --
win32/vs9/gtksourceview4-gen-srcs.vsprops | 42 ---
win32/vs9/gtksourceview4-install.vcproj | 119 ---------
win32/vs9/gtksourceview4-install.vspropsin | 42 ---
win32/vs9/gtksourceview4-version-paths.vsprops.in | 77 ------
41 files changed, 7 insertions(+), 2602 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5dadfc1a..260bcfdc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po data gtksourceview win32 tests testsuite docs
+SUBDIRS = po data gtksourceview msvc tests testsuite docs
@CODE_COVERAGE_RULES@
@@ -13,9 +13,7 @@ pkgconfig_DATA = gtksourceview-@GSV_API_VERSION@.pc
EXTRA_DIST = \
gtksourceview.doap \
gtksourceview.pc.in \
- HACKING \
- config.h.win32.in \
- config.h.win32
+ HACKING
MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
diff --git a/configure.ac b/configure.ac
index b424aa6d..c8505421 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,16 +238,7 @@ AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
AC_CONFIG_FILES([
gtksourceview-${GSV_API_VERSION}.pc:gtksourceview.pc.in
Makefile
-config.h.win32
-win32/Makefile
-win32/vs9/Makefile
-win32/vs9/gtksourceview${GSV_API_VERSION}-version-paths.vsprops
-win32/vs10/Makefile
-win32/vs10/gtksourceview${GSV_API_VERSION}-version-paths.props
-win32/vs11/Makefile
-win32/vs12/Makefile
-win32/vs14/Makefile
-win32/vs15/Makefile
+msvc/Makefile
data/Makefile
data/glade/Makefile
data/glade/gtksourceview.xml
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 02a1aeac..4dee5559 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -344,81 +344,4 @@ CLEANFILES += $(vapi_DATA)
endif # ENABLE_VAPIGEN
-# MSVC items
-
-# Pull in the libgtksourcecompletionwords sources since on MSVC we want to
-# build everything in the same .dll with no intermediate libs
-gtksource_win32_more_sources = \
- completion-providers/words/gtksourcecompletionwords.c \
- completion-providers/words/gtksourcecompletionwordsbuffer.c \
- completion-providers/words/gtksourcecompletionwordslibrary.c \
- completion-providers/words/gtksourcecompletionwordsproposal.c \
- completion-providers/words/gtksourcecompletionwordsutils.c
-
-MSVCPROJS = gtksourceview-@GSV_API_VERSION@
-
-gtksourceview_@GSV_API_VERSION@_FILES = \
- $(libgtksourceview_public_c_files) \
- $(libgtksourceview_private_c_files) \
- $(nodist_libgtksourceview_core_la_SOURCES) \
- $(gtksource_win32_more_sources)
-
-gtksourceview_@GSV_API_VERSION@_EXCLUDES = dummy
-gtksourceview_@GSV_API_VERSION@_HEADERS_DIR = $(libgtksourceview_@GSV_API_VERSION@_includedir)
-gtksourceview_@GSV_API_VERSION@_HEADERS_INST = \
- $(libgtksourceview_public_headers) \
- $(nodist_libgtksourceview_@GSV_API_VERSION@_include_HEADERS)
-
-gtksourceview_@GSV_API_VERSION@_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-$(top_builddir)/win32/enums.headers: $(libgtksourceview_public_headers)
- -$(RM) $(top_builddir)/win32/enum.headers
- for F in $(libgtksourceview_public_headers); do \
- case $$F in \
- *.h) \
- echo $$F' ^'>>$(top_builddir)/win32/enum.headers \
- ;; \
- esac \
- done
-
-# NMake/MSVC introspection
-if HAVE_INTROSPECTION
-NMAKE_INTROSPECTION_FILES = \
- $(top_builddir)/win32/GtkSource-@GSV_API_VERSION gir msvc.introspect \
- $(top_builddir)/win32/GtkSource_@GSV_API_VERSION@_gir_list
-
-MSVC_INTROSPECT_GIRS = GtkSource-@GSV_API_VERSION@.gir
-
-# Ensure that gtksource.h is the first one.
-GtkSource_@GSV_API_VERSION@_gir_MSVC_FILES = \
- gtksource.h \
- $(libgtksourcecompletionwords_files) \
- $(libgtksourceview_public_headers) \
- $(libgtksourceview_public_c_files) \
- $(BUILT_SOURCES)
-
-GtkSource_@GSV_API_VERSION@_gir_MSVC_INCLUDE_GIRS = $(GtkSource_@GSV_API_VERSION@_gir_INCLUDES)
-GtkSource_@GSV_API_VERSION@_gir_MSVC_PACKAGES = $(GtkSource_@GSV_API_VERSION@_gir_PACKAGES)
-GtkSource_@GSV_API_VERSION@_gir_MSVC_EXPORT_PACKAGES = gtksourceview-@GSV_API_VERSION@
-GtkSource_@GSV_API_VERSION@_gir_MSVC_LIBS = gtksourceview-@GSV_API_VERSION@
-GtkSource_@GSV_API_VERSION@_gir_MSVC_CFLAGS = -I..
-
-GtkSource_@GSV_API_VERSION@_gir_MSVC_SCANNERFLAGS = \
- --c-include=gtksourceview/gtksource.h \
- --warn-all \
- --filelist=GtkSource_@GSV_API_VERSION@_gir_list
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-else
-NMAKE_INTROSPECTION_FILES =
-endif
-
-dist-hook: \
- $(top_builddir)/win32/enums.headers \
- $(top_builddir)/win32/vs9/gtksourceview-@GSV_API_VERSION@.vcproj \
- $(top_builddir)/win32/vs9/gtksourceview-@GSV_API_VERSION@.headers \
- $(NMAKE_INTROSPECTION_FILES)
-
-include $(top_srcdir)/git.mk
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index 991403fe..62184678 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -124,7 +124,7 @@ if cc.get_id() == 'msvc'
# include our math.h to implement round() for pre-2013 Visual Studio
msvc_maj_ver = cc.version().split('.')[0].to_int()
if msvc_maj_ver < 18
- gtksourceview_include_dirs = [rootdir, include_directories('../win32')]
+ gtksourceview_include_dirs = [rootdir, include_directories('../msvc')]
else
gtksourceview_include_dirs = rootdir
endif
diff --git a/msvc/Makefile.am b/msvc/Makefile.am
new file mode 100644
index 00000000..f367dc02
--- /dev/null
+++ b/msvc/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = math.h
+
+-include $(top_srcdir)/git.mk
diff --git a/win32/math.h b/msvc/math.h
similarity index 100%
rename from win32/math.h
rename to msvc/math.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
