GNOME.org
 

[gnome-builder] build: fix distcheck

commit be18fe01a19487a38083a0968418e25bb235c4cc
Author: Christian Hergert <chergert redhat com>
Date:   Sat Jan 16 13:57:02 2016 -0800

    build: fix distcheck

 configure.ac                                       |    2 +
 doc/examples/scripts/Makefile.am                   |    1 -
 doc/reference/libide/libide-docs.sgml              |    3 --
 doc/reference/libide/libide-sections.txt           |   22 --------------------
 doc/reference/libide/libide.types                  |    3 --
 libide/Makefile.am                                 |    7 ++++-
 plugins/Makefile.am                                |    1 +
 plugins/contributing/Makefile.am                   |   17 +++++++++++++++
 plugins/contributing/configure.ac                  |   12 ++++++++++
 plugins/contributing/contributing.plugin           |    2 +-
 .../__init__.py}                                   |    4 +-
 .../{ => contributing_plugin}/helper.py            |    0
 po/POTFILES.in                                     |   12 +---------
 po/POTFILES.skip                                   |    8 +++++++
 14 files changed, 50 insertions(+), 44 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2cc0adb..6d86eff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,7 @@ m4_include([plugins/build-tools/configure.ac])
 m4_include([plugins/c-pack/configure.ac])
 m4_include([plugins/clang/configure.ac])
 m4_include([plugins/command-bar/configure.ac])
+m4_include([plugins/contributing/configure.ac])
 m4_include([plugins/ctags/configure.ac])
 m4_include([plugins/devhelp/configure.ac])
 m4_include([plugins/file-search/configure.ac])
@@ -484,6 +485,7 @@ echo "  Build Tools .......................... : ${enable_build_tools_plugin}"
 echo "  C Language Pack ...................... : ${enable_c_pack_plugin}"
 echo "  Clang ................................ : ${enable_clang_plugin}"
 echo "  Command Bar .......................... : ${enable_command_bar_plugin}"
+echo "  Contribute ........................... : ${enable_contributing_plugin}"
 echo "  Ctags ................................ : ${enable_ctags_plugin}"
 echo "  Devhelp .............................. : ${enable_devhelp_plugin}"
 echo "  Fpaste.org ........................... : ${enable_fpaste_plugin}"
diff --git a/doc/examples/scripts/Makefile.am b/doc/examples/scripts/Makefile.am
index ed18644..cc84382 100644
--- a/doc/examples/scripts/Makefile.am
+++ b/doc/examples/scripts/Makefile.am
@@ -1,6 +1,5 @@
 EXTRA_DIST = \
        README.md \
-       search-provider.js \
        search-provider.py \
        $(NULL)
 
diff --git a/doc/reference/libide/libide-docs.sgml b/doc/reference/libide/libide-docs.sgml
index d5cce0f..75d592f 100644
--- a/doc/reference/libide/libide-docs.sgml
+++ b/doc/reference/libide/libide-docs.sgml
@@ -51,9 +51,6 @@
     <xi:include href="xml/ide-file.xml"/>
     <xi:include href="xml/ide-file-settings.xml"/>
     <xi:include href="xml/ide-fixit.xml"/>
-    <xi:include href="xml/ide-git-buffer-change-monitor.xml"/>
-    <xi:include href="xml/ide-git-remote-callbacks.xml"/>
-    <xi:include href="xml/ide-git-vcs.xml"/>
     <xi:include href="xml/ide-global.xml"/>
     <xi:include href="xml/ide-highlight-engine.xml"/>
     <xi:include href="xml/ide-highlight-index.xml"/>
diff --git a/doc/reference/libide/libide-sections.txt b/doc/reference/libide/libide-sections.txt
index 236f107..6761cbf 100644
--- a/doc/reference/libide/libide-sections.txt
+++ b/doc/reference/libide/libide-sections.txt
@@ -463,28 +463,6 @@ ide_fixit_get_type
 </SECTION>
 
 <SECTION>
-<FILE>ide-git-buffer-change-monitor</FILE>
-IDE_TYPE_GIT_BUFFER_CHANGE_MONITOR
-IdeGitBufferChangeMonitor
-</SECTION>
-
-<SECTION>
-<FILE>ide-git-remote-callbacks</FILE>
-IDE_TYPE_GIT_REMOTE_CALLBACKS
-ide_git_remote_callbacks_new
-ide_git_remote_callbacks_get_fraction
-ide_git_remote_callbacks_get_progress
-IdeGitRemoteCallbacks
-</SECTION>
-
-<SECTION>
-<FILE>ide-git-vcs</FILE>
-IDE_TYPE_GIT_VCS
-ide_git_vcs_get_repository
-IdeGitVcs
-</SECTION>
-
-<SECTION>
 <FILE>ide-global</FILE>
 ide_get_program_name
 ide_set_program_name
diff --git a/doc/reference/libide/libide.types b/doc/reference/libide/libide.types
index 061aa33..7b9fa37 100644
--- a/doc/reference/libide/libide.types
+++ b/doc/reference/libide/libide.types
@@ -30,9 +30,6 @@ ide_extension_set_adapter_get_type
 ide_file_get_type
 ide_file_settings_get_type
 ide_fixit_get_type
-ide_git_buffer_change_monitor_get_type
-ide_git_remote_callbacks_get_type
-ide_git_vcs_get_type
 ide_highlight_engine_get_type
 ide_highlight_index_get_type
 ide_highlight_result_get_type
diff --git a/libide/Makefile.am b/libide/Makefile.am
index 42fdd5f..eef1348 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -32,6 +32,7 @@ libide_1_0_la_public_sources = \
        ide-application.h \
        ide-application-addin.c \
        ide-application-addin.h \
+       ide-application-credits.h \
        ide-application-tool.c \
        ide-application-tool.h \
        ide-back-forward-item.c \
@@ -115,6 +116,7 @@ libide_1_0_la_public_sources = \
        ide-layout-pane.h \
        ide-layout-stack.c \
        ide-layout-stack.h \
+       ide-layout-stack-split.h \
        ide-layout-view.c \
        ide-layout-view.h \
        ide-log.c \
@@ -293,6 +295,7 @@ libide_1_0_la_SOURCES = \
        ide-keybindings.c \
        ide-keybindings.h \
        ide-layout-stack-actions.c \
+       ide-layout-stack-actions.h \
        ide-layout-stack-private.h \
        ide-layout-tab.c \
        ide-layout-tab.h \
@@ -409,7 +412,7 @@ libide_1_0_la_includes = \
        -I$(top_srcdir)/contrib/libeditorconfig \
        -I$(top_srcdir)/contrib/search \
        -I$(top_srcdir)/contrib/xml \
-       -I$(top_srcdir)/data/icons/hicolor \
+       -I$(top_builddir)/data/icons/hicolor \
        -I$(srcdir) \
        -I$(srcdir)/doap \
        -I$(srcdir)/editor \
@@ -420,7 +423,7 @@ libide_1_0_la_includes = \
        -I$(srcdir)/local \
        -I$(srcdir)/modelines \
        -I$(srcdir)/preferences \
-       -I$(srcdir)/resources \
+       -I$(builddir)/resources \
        -I$(srcdir)/theatrics \
        -I$(srcdir)/util \
        $(NULL)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index c0fc119..7e9628a 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
        build-tools \
        clang \
        command-bar \
+       contributing \
        c-pack \
        ctags \
        devhelp \
diff --git a/plugins/contributing/Makefile.am b/plugins/contributing/Makefile.am
new file mode 100644
index 0000000..50d9c67
--- /dev/null
+++ b/plugins/contributing/Makefile.am
@@ -0,0 +1,17 @@
+if ENABLE_CONTRIBUTING_PLUGIN
+
+EXTRA_DIST = $(plugin_DATA)
+
+plugindir = $(libdir)/gnome-builder/plugins
+dist_plugin_DATA = contributing.plugin
+
+moduledir = $(libdir)/gnome-builder/plugins/contributing_plugin
+dist_module_DATA = \
+       contributing_plugin/__init__.py \
+       contributing_plugin/helper.py
+
+endif
+
+GITIGNOREFILES = contributing_plugin/__pycache__
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/contributing/configure.ac b/plugins/contributing/configure.ac
new file mode 100644
index 0000000..04f0e40
--- /dev/null
+++ b/plugins/contributing/configure.ac
@@ -0,0 +1,12 @@
+# --enable-contributing-plugin=yes/no
+AC_ARG_ENABLE([contributing-plugin],
+              [AS_HELP_STRING([--enable-contributing-plugin=@<:@yes/no@:>@],
+                              [Build with tools to simplify contributing to existing project.])],
+              [enable_contributing_plugin=$enableval],
+              [enable_contributing_plugin=yes])
+
+# for if ENABLE_CONTRIBUTING_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_CONTRIBUTING_PLUGIN, test x$enable_contributing_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/contributing/Makefile])
diff --git a/plugins/contributing/contributing.plugin b/plugins/contributing/contributing.plugin
index 3f56d83..80b8ac2 100644
--- a/plugins/contributing/contributing.plugin
+++ b/plugins/contributing/contributing.plugin
@@ -7,5 +7,5 @@ Authors=Christian Hergert <christian hergert me>
 Copyright=Copyright © 2015 Christian Hergert
 Builtin=true
 Hidden=true
-X-Tool-Name=contribute
+X-Tool-Name=contribute-to
 X-Tool-Description=Get started contributing to an existing GNOME project
diff --git a/plugins/contributing/contributing_plugin.py 
b/plugins/contributing/contributing_plugin/__init__.py
similarity index 99%
rename from plugins/contributing/contributing_plugin.py
rename to plugins/contributing/contributing_plugin/__init__.py
index d1de4f3..4f4ee01 100644
--- a/plugins/contributing/contributing_plugin.py
+++ b/plugins/contributing/contributing_plugin/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 #
-# contributing_plugin.py
+# __init__.py
 #
 # Copyright (C) 2015 Christian Hergert <chris dronelabs com>
 #
@@ -29,7 +29,7 @@ import time
 
 gi.require_version('Ggit', '1.0')
 
-import helper
+from contributing_plugin import helper
 
 from gi.repository import GLib
 from gi.repository import GObject
diff --git a/plugins/contributing/helper.py b/plugins/contributing/contributing_plugin/helper.py
similarity index 100%
rename from plugins/contributing/helper.py
rename to plugins/contributing/contributing_plugin/helper.py
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f6a87bb..59e776d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,8 +63,8 @@ plugins/clang/ide-clang-symbol-node.c
 plugins/clang/ide-clang-translation-unit.c
 plugins/command-bar/gb-command-bar.c
 plugins/command-bar/gb-vim.c
-plugins/contributing/contributing_plugin.py
-plugins/contributing/helper.py
+plugins/contributing/contributing_plugin/__init__.py
+plugins/contributing/contributing_plugin/helper.py
 plugins/c-pack/ide-c-format-provider.c
 plugins/devhelp/gbp-devhelp-search-provider.c
 plugins/devhelp/gbp-devhelp-workbench-addin.c
@@ -96,11 +96,3 @@ plugins/terminal/gb-terminal-view-actions.c
 plugins/terminal/gb-terminal-workbench-addin.c
 [type: gettext/glade]plugins/terminal/gtk/menus.ui
 plugins/todo/todo_plugin/__init__.py
-tools/ide-build.c
-tools/ide-list-build-flags.c
-tools/ide-list-devices.c
-tools/ide-list-diagnostics.c
-tools/ide-list-files.c
-tools/ide-list-file-settings.c
-tools/ide-mine-projects.c
-tools/ide-search.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index fb5afe2..0eb3d99 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,9 @@
 tests/menus.ui
+tools/ide-build.c
+tools/ide-list-build-flags.c
+tools/ide-list-devices.c
+tools/ide-list-diagnostics.c
+tools/ide-list-files.c
+tools/ide-list-file-settings.c
+tools/ide-mine-projects.c
+tools/ide-search.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]