GNOME.org
 

[libsoup/master.novcproj: 3/4] build: Remove the Visual Studio project files

commit 12daf2bc56ef28acf2776c6f845b1a065a705c7e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Sep 11 17:42:44 2018 +0800

    build: Remove the Visual Studio project files
    
    As it is now possible to build libsoup on Visual Studio using Meson,
    remove the Visual Studio project files and the related items.  All
    Visual Studio build system maintenance will now be focused on the Meson
    build system.

 .gitignore                               |  10 -
 Makefile.am                              |   5 +-
 config.h.win32.in                        | 116 -----------
 configure.ac                             |  10 -
 libsoup/Makefile.am                      |  69 -------
 win32/Makefile-newvs.am                  |  55 -----
 win32/Makefile.am                        |  35 ----
 win32/Makefile.msvc-introspection        | 129 ------------
 win32/Makefile.msvcproj                  | 153 --------------
 win32/detectenv-msvc.mak                 |  78 -------
 win32/introspection-msvc.mak             |  94 ---------
 win32/pc_base.py                         | 124 -----------
 win32/replace.py                         | 115 -----------
 win32/soup-introspection-msvc.mak        |  37 ----
 win32/soup_version_h.py                  |  29 ---
 win32/souppc.py                          |  32 ---
 win32/vs10/Makefile.am                   |  39 ----
 win32/vs10/get.vcxproj                   | 159 --------------
 win32/vs10/get.vcxproj.filters           |  17 --
 win32/vs10/libsoup.sln                   | 128 ------------
 win32/vs10/simple-httpd.vcxproj          | 159 --------------
 win32/vs10/simple-httpd.vcxproj.filters  |  17 --
 win32/vs10/simple-proxy.vcxproj          | 159 --------------
 win32/vs10/simple-proxy.vcxproj.filters  |  17 --
 win32/vs10/soup-build-defines.props      |  29 ---
 win32/vs10/soup-dll-build-defines.props  |  24 ---
 win32/vs10/soup-gen-srcs.props           |  26 ---
 win32/vs10/soup-gnome.vcxproj.filtersin  |  17 --
 win32/vs10/soup-gnome.vcxprojin          | 161 ---------------
 win32/vs10/soup-install.propsin          |  51 -----
 win32/vs10/soup-install.vcxproj          | 121 -----------
 win32/vs10/soup-install.vcxproj.filters  |  13 --
 win32/vs10/soup-version-paths.props.in   |  69 -------
 win32/vs10/soup.vcxproj.filtersin        |  22 --
 win32/vs10/soup.vcxprojin                | 341 -------------------------------
 win32/vs11/Makefile.am                   |  28 ---
 win32/vs12/Makefile.am                   |  28 ---
 win32/vs14/Makefile.am                   |  28 ---
 win32/vs15/Makefile.am                   |  29 ---
 win32/vs9/Makefile.am                    |  27 ---
 win32/vs9/get.vcproj                     | 162 ---------------
 win32/vs9/libsoup.sln                    | 147 -------------
 win32/vs9/simple-httpd.vcproj            | 162 ---------------
 win32/vs9/simple-proxy.vcproj            | 162 ---------------
 win32/vs9/soup-build-defines.vsprops     |  22 --
 win32/vs9/soup-dll-build-defines.vsprops |  38 ----
 win32/vs9/soup-gen-srcs.vsprops          |  20 --
 win32/vs9/soup-gnome.vcprojin            | 162 ---------------
 win32/vs9/soup-install.vcproj            | 114 -----------
 win32/vs9/soup-install.vspropsin         |  40 ----
 win32/vs9/soup-version-paths.vsprops.in  |  65 ------
 win32/vs9/soup.vcprojin                  | 318 ----------------------------
 52 files changed, 2 insertions(+), 4210 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd9347bf..09572b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ build-aux
 config.h
 config.h.in
 config.h.in~
-config.h.win32
 config.log
 config.status
 configure
@@ -70,12 +69,3 @@ tests/ntlm-test-helper
 tests/pull-api
 tests/soup-tests.gresource
 tests/uri-parsing
-win32/SoupGNOME_2_4_gir_list
-win32/Soup_2_4_gir_list
-win32/introspection.body.mak
-win32/vs9/*.vsprops
-win32/vs9/*.vcproj
-win32/vs*/*.vcxproj
-win32/vs*/*.vcxproj.filters
-win32/vs*/libsoup.sln
-win32/vs*/soup-*.props
diff --git a/Makefile.am b/Makefile.am
index b5d73dd0..24cb9541 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = libsoup po tests examples docs win32
+SUBDIRS = libsoup po tests examples docs 
 
 EXTRA_DIST =                           \
        libsoup-2.4.pc.in               \
@@ -15,8 +15,7 @@ EXTRA_DIST =                          \
        meson.build                     \
        meson_options.txt               \
        po/meson.build                  \
-       get_apache_modules_dirs.py      \
-       config.h.win32
+       get_apache_modules_dirs.py
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-vala
 
diff --git a/configure.ac b/configure.ac
index 16168d39..4d139bab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,15 +430,5 @@ AC_CONFIG_FILES([
        docs/Makefile
        docs/reference/Makefile
        libsoup/soup-version.h
-       config.h.win32
-       win32/Makefile
-       win32/vs9/Makefile
-       win32/vs9/soup-version-paths.vsprops
-       win32/vs10/Makefile
-       win32/vs10/soup-version-paths.props
-       win32/vs11/Makefile
-       win32/vs12/Makefile
-       win32/vs14/Makefile
-       win32/vs15/Makefile
        ])
 AC_OUTPUT
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 53cc00ac..8de081f1 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -329,72 +329,3 @@ CLEANFILES+= $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
 endif
 
 EXTRA_DIST += meson.build soup-enum-types.h.template soup-enum-types.c.template
-
-# ------ MSVC Project File Generation ------
-MSVCPROJS = soup soup-gnome
-
-soup_FILES = $(libsoup_2_4_la_SOURCES)
-soup_EXCLUDES = dummy
-
-soup_HEADERS_DIR = $(libsoupincludedir)
-soup_HEADERS_INST = $(libsoupinclude_HEADERS) $(nodist_libsoupinclude_HEADERS)
-soup_HEADERS_EXCLUDES = dummy
-
-soup_gnome_FILES = $(libsoup_gnome_2_4_la_SOURCES)
-soup_gnome_EXCLUDES = dummy
-
-soup_gnome_HEADERS_DIR = $(libsoupgnomeincludedir)
-soup_gnome_HEADERS_INST = $(libsoupgnomeinclude_HEADERS)
-soup_gnome_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Soup-2.4.gir
-if BUILD_LIBSOUP_GNOME
-MSVC_INTROSPECT_GIRS += SoupGNOME-2.4.gir
-endif
-
-BASE_MSVC_GIR_CFLAGS =         \
-       $(SOUP_COMMON_CPPFLAGS) \
-       -I..
-
-INTROSPECTION_INTERMEDIATE_ITEMS =                                     \
-       $(top_builddir)/win32/Soup-2.4.gir.msvc.introspect      \
-       $(top_builddir)/win32/Soup_2_4_gir_list                 \
-       $(top_builddir)/win32/SoupGNOME-2.4.gir.msvc.introspect \
-       $(top_builddir)/win32/SoupGNOME_2_4_gir_list
-
-# libsoup
-Soup_2_4_gir_MSVC_FILES = $(gi_soup_files) $(gi_built_soup_files)
-Soup_2_4_gir_MSVC_EXPORT_PACKAGES = $(Soup_2_4_gir_EXPORT_PACKAGES)
-Soup_2_4_gir_MSVC_INCLUDE_GIRS = $(Soup_2_4_gir_INCLUDES)
-Soup_2_4_gir_MSVC_LIBS = soup-2.4
-Soup_2_4_gir_MSVC_CFLAGS =  $(BASE_MSVC_GIR_CFLAGS) $(SOUP_UNSTABLE_REQUEST_CFLAG)
-Soup_2_4_gir_MSVC_SCANNERFLAGS = --c-include \"libsoup/soup.h\"
-
-if BUILD_LIBSOUP_GNOME
-# libsoup-gnome
-SoupGNOME_2_4_gir_MSVC_FILES = $(gi_soup_gnome_files)
-SoupGNOME_2_4_gir_MSVC_GIR_DEPS = Soup-2.4.gir
-SoupGNOME_2_4_gir_MSVC_EXPORT_PACKAGES = $(SoupGNOME_2_4_gir_EXPORT_PACKAGES)
-SoupGNOME_2_4_gir_MSVC_LIBS = soup-gnome-2.4 soup-2.4
-SoupGNOME_2_4_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-SoupGNOME_2_4_gir_MSVC_SCANNERFLAGS =  i       \
-       $(SOUPGNOME_GIR_SCANNER_BASE_FLAGS)     \
-        --c-include \"libsoup/soup-gnome.h\"   \
-       --include-uninstalled=./Soup-2.4.gir
-endif
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
-dist-hook: \
-       $(top_builddir)/win32/vs9/soup.vcproj           \
-       $(top_builddir)/win32/vs9/soup.headers          \
-       $(top_builddir)/win32/vs9/soup-gnome.vcproj     \
-       $(top_builddir)/win32/vs9/soup-gnome.headers    \
-       $(INTROSPECTION_INTERMEDIATE_ITEMS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]