GNOME.org
 

[gnome-builder] build: remove libidemm

commit 4a52b0acfde5c57f2972bcc341a47119138355f3
Author: Christian Hergert <chergert redhat com>
Date:   Mon Feb 20 15:04:23 2017 -0800

    build: remove libidemm
    
    Nothing is using libidemm and we won't be needing it for the things we
    have upcoming. Babysitting gtkmm/glibmm and it's lack of support for
    proper out-of-tree builds is getting annoying, so until something decides
    to implement stuff in C++, I'm just going to drop this.
    
    Having all of this in a single commit is convenience in case we want to
    revert it at some point in the future.
    
    Additionally, it's reliance on automake is holding back our ability to
    move to Meson/Ninja in the future.

 Makefile.am                                        |    2 +-
 autogen.sh                                         |    8 -
 configure.ac                                       |   19 -
 libidemm/Makefile.am                               |   48 -
 libidemm/configure.ac                              |   44 -
 libidemm/idemm.h                                   |   14 -
 libidemm/idemm/Makefile.am                         |   41 -
 libidemm/idemm/filelist.am                         |    8 -
 libidemm/idemm/registermmtype.h                    |   93 -
 libidemm/idemm/wrap_init.h                         |   29 -
 libidemm/src/Makefile.am                           |   22 -
 libidemm/src/application.ccg                       |   67 -
 libidemm/src/application.hg                        |   60 -
 libidemm/src/applicationaddin.ccg                  |   17 -
 libidemm/src/applicationaddin.hg                   |   42 -
 libidemm/src/backforwardlist.ccg                   |   17 -
 libidemm/src/backforwardlist.hg                    |   47 -
 libidemm/src/context.ccg                           |   17 -
 libidemm/src/context.hg                            |   58 -
 libidemm/src/filelist.am                           |   20 -
 libidemm/src/libide.defs                           |    5 -
 libidemm/src/libide_docs.xml                       | 7000 ------------------
 libidemm/src/libide_enums.defs                     |  535 --
 libidemm/src/libide_methods.defs                   | 7620 --------------------
 libidemm/src/libide_signals.defs                   |  190 -
 libidemm/src/libide_vfuncs.defs                    |   21 -
 libidemm/src/object.ccg                            |   30 -
 libidemm/src/object.hg                             |   44 -
 libidemm/src/recentprojects.ccg                    |   17 -
 libidemm/src/recentprojects.hg                     |   39 -
 libidemm/src/uri.ccg                               |   44 -
 libidemm/src/uri.hg                                |   76 -
 libidemm/tools/Makefile.am                         |   29 -
 .../tools/extra_defs_gen/generate_defs_libide.cc   |   37 -
 libidemm/tools/generate_defs_and_docs.sh           |   32 -
 libidemm/tools/m4/convert.m4                       |    7 -
 libidemm/tools/m4/convert_libide.m4                |   53 -
 libidemm/tools/m4/filelist.am                      |    1 -
 org.gnome.Builder.json                             |   34 -
 plugins/Makefile.am                                |    1 -
 plugins/hello-cpp/Makefile.am                      |   22 -
 plugins/hello-cpp/configure.ac                     |   20 -
 plugins/hello-cpp/hello-cpp.plugin                 |    7 -
 plugins/hello-cpp/hellocppapplicationaddin.cc      |   64 -
 plugins/hello-cpp/hellocppapplicationaddin.h       |   51 -
 plugins/hello-cpp/hellocppplugin.cc                |   35 -
 po/POTFILES.in                                     |    1 -
 47 files changed, 1 insertions(+), 16687 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a71a8a0..0529446 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . build contrib data libide src libidemm plugins tools po tests doc help
+SUBDIRS = . build contrib data libide src plugins tools po tests doc help
 
 ACLOCAL_AMFLAGS = -I build/autotools
 
diff --git a/autogen.sh b/autogen.sh
index b59f861..d949b97 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,14 +19,6 @@ touch INSTALL
 
 aclocal --install -I build/autotools || exit 1
 gtkdocize || exit 1
-
-if command -v mm-common-prepare 2>/dev/null; then
-    mm-common-prepare --copy --force $srcdir/libidemm
-else
-    touch $srcdir/libidemm/generate-binding.am
-    touch $srcdir/libidemm/compile-binding.am
-fi
-
 autoreconf --force --install -Wno-portability || exit 1
 
 cd $olddir
diff --git a/configure.ac b/configure.ac
index a5ed7e6..6d67f45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,12 +275,6 @@ AM_CONDITIONAL(ENABLE_PYTHON_SCRIPTING, test x$enable_python_scripting != xno)
 
 
 dnl ***********************************************************************
-dnl Check for idemm
-dnl ***********************************************************************
-m4_include([libidemm/configure.ac])
-
-
-dnl ***********************************************************************
 dnl Check for supported plugins
 dnl ***********************************************************************
 m4_include([plugins/autotools/configure.ac])
@@ -303,7 +297,6 @@ m4_include([plugins/gcc/configure.ac])
 m4_include([plugins/gettext/configure.ac])
 m4_include([plugins/git/configure.ac])
 m4_include([plugins/gnome-code-assistance/configure.ac])
-m4_include([plugins/hello-cpp/configure.ac])
 m4_include([plugins/html-completion/configure.ac])
 m4_include([plugins/html-preview/configure.ac])
 m4_include([plugins/jedi/configure.ac])
@@ -585,14 +578,6 @@ echo "  Build API reference .................. : ${enable_gtk_doc}"
 echo "  Use cross-referencing in API docs .... : ${enable_doc_cross_references}"
 echo "  Sanitizer ............................ : ${with_sanitizer}"
 echo ""
-echo " Optional libraries"
-echo ""
-echo "  idemm ................................ : ${enable_idemm}"
-echo ""
-echo " Scripting"
-echo ""
-echo "  Python ............................... : ${enable_python_scripting}"
-echo ""
 echo " Plugins"
 echo ""
 echo "  Autotools ............................ : ${enable_autotools_plugin}"
@@ -636,10 +621,6 @@ echo "  Vala Language Pack ................... : ${enable_vala_pack_plugin}"
 echo "  Flatpak .............................. : ${enable_flatpak_plugin}"
 echo "  XML Language Pack .................... : ${enable_xml_pack_plugin}"
 echo ""
-echo " Example Plugins"
-echo ""
-echo "  Example C++ .......................... : ${enable_hello_cpp_plugin}"
-echo ""
 echo " Templates"
 echo ""
 echo "  Autotools ............................ : ${enable_autotools_templates}"
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index 716e73e..d23b14c 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -58,7 +58,6 @@
                 "/man", "/share/man", "/share/gtk-doc",
                 "/share/doc", "/share/vala", "/share/appdata",
                 "/share/bash-completions",
-                "/lib/sigc++-2.0", "/lib/glibmm-2.4", "/lib/giomm-2.4",
                 "*.la", "*.a"],
     "modules": [
         {
@@ -246,39 +245,6 @@
             ]
         },
         {
-            "name": "mm-common",
-            "config-opts": [ "--disable-documentation" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/mm-common/0.9/mm-common-0.9.10.tar.xz";,
-                    "sha256": "16c0e2bc196b67fbc145edaecb5dbe5818386504fe5703de27002d77140fa217"
-                }
-            ]
-        },
-        {
-            "name": "libsigcplusplus",
-            "config-opts": [ "--disable-documentation" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsigc++/2.9/libsigc++-2.9.3.tar.xz";,
-                    "sha256": "0bf9b301ad6198c550986c51150a646df198e8d1d235270c16486b0dda30097f"
-                }
-            ]
-        },
-        {
-            "name": "glibmm",
-            "config-opts": [ "--disable-documentation" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/glibmm/2.49/glibmm-2.49.5.tar.xz";,
-                    "sha256": "4e9c147c3fd3b8ecb15b3d5bdc120ef4e88a5d6948c8e82c3d95f85add33304e"
-                }
-            ]
-        },
-        {
             "name": "devhelp",
             "config-opts": [ "--disable-compile-warnings" ],
             "cleanup": [ "/bin/*", "/lib/gedit/plugins", "/share/applications/*", "/share/dbus-1/services", 
"/share/GConf" ],
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index dea7b55..eba51b9 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -19,7 +19,6 @@ SUBDIRS = \
        gettext \
        git \
        gnome-code-assistance \
-       hello-cpp \
        html-completion \
        html-preview \
        jedi \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e344e15..3264e33 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -155,7 +155,6 @@ plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
 plugins/gnome-code-assistance/ide-gca-preferences-addin.c
 plugins/gnome-code-assistance/ide-gca-service.c
 plugins/gnome-code-assistance/org.gnome.builder.gnome-code-assistance.gschema.xml
-plugins/hello-cpp/hellocppapplicationaddin.cc
 plugins/html-preview/html_preview_plugin/gtk/menus.ui
 plugins/jedi/jedi_plugin.py
 plugins/meson/meson_plugin/__init__.py
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]