Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 16 Mar 2015 00:43:18 UTC Commit: 6b4cd0decd6fb5d5a749047bc43e45d40ad85347 https://github.com/geany/geany-plugins/commit/6b4cd0decd6fb5d5a749047bc43e45...

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).