Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 16 Mar 2015 00:43:18 UTC
Commit: 6b4cd0decd6fb5d5a749047bc43e45d40ad85347
https://github.com/geany/geany-plugins/commit/6b4cd0decd6fb5d5a749047bc43e4…
Log Message:
-----------
webhelper: Avoid build-relative paths in checked in generated files
gwh-enum-types.[ch] are automatically generated, but are also checked
into version control, so we need to avoid any unwanted changes.
To achieve this, use basenames instead of full names in the generated
files. This requires glib-mkenums >= 2.22, but it should be old enough
not to cause dependencies concerns. If this dependency appear to be a
problem, another solution could be to simply remove reference to the
source files in the generated output.
These files need to stay checked in even if they are auto-generated
because they contain translatable strings that the translation system
has to be able to extract, whether the plugin is built or not.
Close #163.
Modified Paths:
--------------
build/webhelper.m4
webhelper/src/gwh-enum-types.c
webhelper/src/gwh-enum-types.c.tpl
webhelper/src/gwh-enum-types.h
webhelper/src/gwh-enum-types.h.tpl
webhelper/wscript_configure
Modified: build/webhelper.m4
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,8 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
GP_ARG_DISABLE([WebHelper], [auto])
GTK_VERSION=2.16
- GLIB_VERSION=2.16
+ dnl 2.22 for glib-mkenums' @basename@ template
+ GLIB_VERSION=2.22
GIO_VERSION=2.18
GDK_PIXBUF_VERSION=2.0
WEBKIT_VERSION=1.1.18
Modified: webhelper/src/gwh-enum-types.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -5,7 +5,7 @@
#include <glib/gi18n.h>
-/* enumerations from "./gwh-browser.h" */
+/* enumerations from "gwh-browser.h" */
GType
gwh_browser_position_get_type (void)
{
@@ -22,7 +22,7 @@ gwh_browser_position_get_type (void)
return etype;
}
-/* enumerations from "./gwh-settings.h" */
+/* enumerations from "gwh-settings.h" */
GType
gwh_settings_notify_flags_get_type (void)
{
@@ -38,7 +38,7 @@ gwh_settings_notify_flags_get_type (void)
return etype;
}
-/* enumerations from "./gwh-utils.h" */
+/* enumerations from "gwh-utils.h" */
GType
gwh_window_type_get_type (void)
{
Modified: webhelper/src/gwh-enum-types.c.tpl
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -6,7 +6,7 @@
/*** END file-header ***/
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
Modified: webhelper/src/gwh-enum-types.h
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -13,17 +13,17 @@
G_BEGIN_DECLS
-/* enumerations from "./gwh-browser.h" */
+/* enumerations from "gwh-browser.h" */
G_GNUC_INTERNAL
GType gwh_browser_position_get_type (void) G_GNUC_CONST;
#define GWH_TYPE_BROWSER_POSITION (gwh_browser_position_get_type ())
-/* enumerations from "./gwh-settings.h" */
+/* enumerations from "gwh-settings.h" */
G_GNUC_INTERNAL
GType gwh_settings_notify_flags_get_type (void) G_GNUC_CONST;
#define GWH_TYPE_SETTINGS_NOTIFY_FLAGS (gwh_settings_notify_flags_get_type ())
-/* enumerations from "./gwh-utils.h" */
+/* enumerations from "gwh-utils.h" */
G_GNUC_INTERNAL
GType gwh_window_type_get_type (void) G_GNUC_CONST;
#define GWH_TYPE_WINDOW_TYPE (gwh_window_type_get_type ())
Modified: webhelper/src/gwh-enum-types.h.tpl
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
Modified: webhelper/wscript_configure
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -27,7 +27,7 @@ conf.load ('glib2')
packages = [
('gtk+-2.0', '2.16', 'GTK'),
- ('glib-2.0', '2.16', 'GLIB'),
+ ('glib-2.0', '2.22', 'GLIB'),
('gio-2.0', '2.18', 'GIO'),
('gdk-pixbuf-2.0', '2.0', 'GDK_PIXBUF'),
('webkit-1.0', '1.1.18', 'WEBKIT'),
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Dominic Hopf <dmaphy(a)googlemail.com>
Committer: Dominic Hopf <dmaphy(a)googlemail.com>
Date: Sun, 15 Mar 2015 11:53:58 UTC
Commit: dcc18ebfb7bfa7d9c41f24d0722ee751361306a4
https://github.com/geany/plugins.geany.org/commit/dcc18ebfb7bfa7d9c41f24d07…
Log Message:
-----------
add separate HTML file for Quick Open File Plugin
Modified Paths:
--------------
content/quick_open_file.html
gencontent.sh
index.php
Modified: content/quick_open_file.html
30 lines changed, 30 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,30 @@
+<h2>About</h2>
+<p>Quick Open File offers you the possibility to reach quickly a file. Without
+your mouse.</p>
+
+<h2>Installation</h2>
+<p>Download the plugin: https://github.com/samyBadjoudj/geany-qop-plugin/blob/master/qop.c</p>
+
+<p>
+Run:
+ <pre>
+ gcc -c qop.c `pkg-config --cflags --libs geany` -fPIC;gcc -shared -o qop.so qop.o;
+ sudo cp ./qop.so /file/of/geany/plugins/ (ex:/usr/lib/x86_64-linux-gnu/geany)
+ </pre>
+</p>
+
+<h2>Usage</h2>
+<p> After installed successfully, load the plugin in Geany's plugin manager. Go
+to Tools and click on "Quick Open File". Here a POP-UP will help you to find
+your file quickly, by typing some letters that are in the name. Then select the
+file by the arrows (up or down), type enter... or esc to dismiss the POP-UP
+<br /> <img src="http://s1.postimg.org/69i6bssof/qop_geany.png" alt="Geany Quick
+Open File Plugin" /> </p>
+
+<h2>Requirements</h2>
+<ul class="simple">
+ <li>GTK >= 2.8.0</li>
+</ul>
+
+<h2>Contact developers</h2>
+<p>Samy Badjoudj <samy(dot)badjoudj(at)gmail(dot)com></p>
Modified: gencontent.sh
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -68,7 +68,7 @@ LOGDIR=${WORKDIR}"gencontent_logs/"
# plugins to exclude from the nightly re-generation via rst2html because they
# have a separate HTML page not generated from the README file
-declare -a EXCLUDE_PLUGINS=( geanylatex geanysendmail geanylua )
+declare -a EXCLUDE_PLUGINS=( geanylatex geanysendmail geanylua quick_open_file )
RST2HTML=$(which rst2html)
TIDY=$(which tidy)
Modified: index.php
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -70,7 +70,7 @@
<li><a href="https://sourceforge.net/projects/geanyeasyunicodeinput/">GeanyEasyUnicodeInput</a></li>
<li><a href="http://sourceforge.net/projects/geanyunicodetocodepoint/">GeanyUnicodeToCodepoint</a></li>
<li><a href="https://sourceforge.net/projects/geanyhighlightselectedword/">GeanyHighlightSelectedWord</a></li>
- <li><a href="https://github.com/samyBadjoudj/geany-qop-plugin">Geany Quick Open File Plugin</a></li>
+ <li><a href="quick_open_file.html">Geany Quick Open File Plugin</a></li>
</ul>
<hr />
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Wed, 18 Feb 2015 21:19:03 UTC
Commit: baa693fe3f0b9b1e824a04409ff51f70291c16fc
https://github.com/geany/geany-plugins/commit/baa693fe3f0b9b1e824a04409ff51…
Log Message:
-----------
waf: Fix git-changebar plugin name
This fixes the name of the `.so` and the installation directory for
common files with Waf.
Modified Paths:
--------------
git-changebar/wscript_build
Modified: git-changebar/wscript_build
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -32,6 +32,7 @@ defines = ['PLUGIN="%s"' % name_lower]
libraries = ['GTK', 'GLIB', 'LIBGIT2']
build_plugin(bld, name,
+ plugin_name=name_lower,
sources=sources,
includes=includes,
defines=defines,
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Wed, 18 Feb 2015 19:10:16 UTC
Commit: 3d3ff936bef18e1c920135589909eee78841768b
https://github.com/geany/geany-plugins/commit/3d3ff936bef18e1c920135589909e…
Log Message:
-----------
waf: Allow to explicitly specify the plugin name
Add an option to explicitly set the plugin name instead of deriving it
from the `name` which is also used as log domain and expected to use
CamelCase.
This should seldom be useful, but for plugins using separators in their
lowercase names (like e.g. dashes).
Modified Paths:
--------------
build/wafutils.py
Modified: build/wafutils.py
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -77,7 +77,7 @@ def add_to_env_and_define(conf, key, value, quote=False):
conf.env[key] = value
-def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries=None, features=None):
+def build_plugin(ctx, name, plugin_name=None, sources=None, includes=None, defines=None, libraries=None, features=None):
"""
Common build task for plugins, every plugin should call this in its wscript_build module
@@ -86,6 +86,7 @@ def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries
@param ctx (waflib.Build.BuildContext)
@param name (str)
+ @param plugin_name (str)
@param sources (list)
@param includes (list)
@param defines (list)
@@ -93,7 +94,7 @@ def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries
@param features (list)
"""
log_domain = name
- plugin_name = name.lower()
+ plugin_name = plugin_name or name.lower()
includes = includes or []
defines = defines or []
libraries = libraries or []
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).