Commits October 2008

commits@lists.geany.org

3 participants
118 discussions

SF.net SVN: geany:[3055] trunk
by ntrel＠users.sourceforge.net 07 Oct '08

07 Oct '08

Revision: 3055 http://geany.svn.sourceforge.net/geany/?rev=3055&view=rev Author: ntrel Date: 2008-10-07 17:31:17 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Add filename label. Fix Gtk warning when resplitting. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-07 17:12:33 UTC (rev 3054) +++ trunk/ChangeLog 2008-10-07 17:31:17 UTC (rev 3055) @@ -13,6 +13,9 @@ document. * plugins/splitwindow.c: Refactor with set_editor(). + * plugins/splitwindow.c: + Add filename label. + Fix Gtk warning when resplitting. 2008-10-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-10-07 17:12:33 UTC (rev 3054) +++ trunk/plugins/splitwindow.c 2008-10-07 17:31:17 UTC (rev 3055) @@ -185,14 +185,16 @@ /* first destroy any widget, otherwise its signals will have an * invalid document as user_data */ - if (edit_window.sci != NULL) - gtk_widget_destroy(GTK_WIDGET(edit_window.sci)); + if (editwin->sci != NULL) + gtk_widget_destroy(GTK_WIDGET(editwin->sci)); editwin->sci = p_editor->create_widget(editor); gtk_widget_show(GTK_WIDGET(editwin->sci)); gtk_container_add(GTK_CONTAINER(editwin->vbox), GTK_WIDGET(editwin->sci)); sync_to_current(editwin->sci, editor->sci); + + gtk_label_set_text(GTK_LABEL(editwin->name_label), DOC_FILENAME(editor->document)); } @@ -262,6 +264,7 @@ gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(tool_item)); item = gtk_label_new(NULL); + gtk_label_set_ellipsize(GTK_LABEL(item), PANGO_ELLIPSIZE_START); gtk_container_add(GTK_CONTAINER(tool_item), item); edit_window.name_label = item; @@ -325,6 +328,7 @@ gtk_widget_destroy(pane); edit_window.editor = NULL; + edit_window.sci = NULL; gtk_widget_reparent(notebook, parent); } @@ -364,9 +368,18 @@ on_unsplit(NULL, NULL); } + +static void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_data) +{ + /* update filename */ + gtk_label_set_text(GTK_LABEL(edit_window.name_label), DOC_FILENAME(doc)); +} + + PluginCallback plugin_callbacks[] = { { "document-close", (GCallback) &on_document_close, FALSE, NULL }, + { "document-save", (GCallback) &on_document_save, FALSE, NULL }, { NULL, NULL, FALSE, NULL } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3054] trunk
by ntrel＠users.sourceforge.net 07 Oct '08

07 Oct '08

Revision: 3054 http://geany.svn.sourceforge.net/geany/?rev=3054&view=rev Author: ntrel Date: 2008-10-07 17:12:33 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Refactor with set_editor(). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-07 15:19:37 UTC (rev 3053) +++ trunk/ChangeLog 2008-10-07 17:12:33 UTC (rev 3054) @@ -11,6 +11,8 @@ Fix segfault when clicking on split window after the original document has been closed and the view has been refreshed to another document. + * plugins/splitwindow.c: + Refactor with set_editor(). 2008-10-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-10-07 15:19:37 UTC (rev 3053) +++ trunk/plugins/splitwindow.c 2008-10-07 17:12:33 UTC (rev 3054) @@ -69,10 +69,12 @@ { GeanyEditor *editor; /* original editor for split view */ ScintillaObject *sci; /* new editor widget */ + GtkWidget *vbox; + GtkWidget *name_label; } EditWindow; -static EditWindow edit_window = {NULL, NULL}; +static EditWindow edit_window = {NULL, NULL, NULL, NULL}; static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data); @@ -153,10 +155,8 @@ } -static void sync_to_current(EditWindow *editwin, GeanyEditor *editor) +static void sync_to_current(ScintillaObject *sci, ScintillaObject *current) { - ScintillaObject *sci = editwin->sci; - ScintillaObject *current = editor->sci; gpointer sdoc; gint lexer; gint pos; @@ -176,8 +176,23 @@ /* override some defaults */ set_line_numbers(sci, TRUE, 0); p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin */ +} + +static void set_editor(EditWindow *editwin, GeanyEditor *editor) +{ editwin->editor = editor; + + /* first destroy any widget, otherwise its signals will have an + * invalid document as user_data */ + if (edit_window.sci != NULL) + gtk_widget_destroy(GTK_WIDGET(edit_window.sci)); + + editwin->sci = p_editor->create_widget(editor); + gtk_widget_show(GTK_WIDGET(editwin->sci)); + gtk_container_add(GTK_CONTAINER(editwin->vbox), GTK_WIDGET(editwin->sci)); + + sync_to_current(editwin->sci, editor->sci); } @@ -208,22 +223,12 @@ static void on_refresh(void) { - GtkWidget *parent; GeanyDocument *doc = p_document->get_current(); g_return_if_fail(doc); g_return_if_fail(edit_window.sci); - /* before reassigning edit_window.editor, we must destroy the old widget, - * otherwise its signals will have an invalid document as user_data */ - parent = gtk_widget_get_parent(GTK_WIDGET(edit_window.sci)); - gtk_widget_destroy(GTK_WIDGET(edit_window.sci)); - - edit_window.sci = p_editor->create_widget(doc->editor); - gtk_widget_show(GTK_WIDGET(edit_window.sci)); - gtk_container_add(GTK_CONTAINER(parent), GTK_WIDGET(edit_window.sci)); - - sync_to_current(&edit_window, doc->editor); + set_editor(&edit_window, doc->editor); } @@ -256,6 +261,10 @@ gtk_tool_item_set_expand(tool_item, TRUE); gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(tool_item)); + item = gtk_label_new(NULL); + gtk_container_add(GTK_CONTAINER(tool_item), item); + edit_window.name_label = item; + item = create_tool_button(after_underscore(_("_Unsplit")), GTK_STOCK_CLOSE); gtk_container_add(GTK_CONTAINER(toolbar), item); g_signal_connect(item, "clicked", G_CALLBACK(on_unsplit), NULL); @@ -290,10 +299,9 @@ toolbar = create_toolbar(); gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(pane), box); + edit_window.vbox = box; - edit_window.sci = p_editor->create_widget(doc->editor); - sync_to_current(&edit_window, doc->editor); - gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(edit_window.sci), TRUE, TRUE, 0); + set_editor(&edit_window, doc->editor); gtk_paned_set_position(GTK_PANED(pane), width); gtk_widget_show_all(pane); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3052] trunk
by ntrel＠users.sourceforge.net 07 Oct '08

07 Oct '08

Revision: 3052 http://geany.svn.sourceforge.net/geany/?rev=3052&view=rev Author: ntrel Date: 2008-10-07 14:50:54 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Use EditWindow structure instead of separate global variables. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-07 12:14:57 UTC (rev 3051) +++ trunk/ChangeLog 2008-10-07 14:50:54 UTC (rev 3052) @@ -5,6 +5,8 @@ an Unsplit button (reuses existing string). * src/editor.c: Fix segfault when holding Alt and scrolling editor window. + * plugins/splitwindow.c: + Use EditWindow structure instead of separate global variables. 2008-10-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-10-07 12:14:57 UTC (rev 3051) +++ trunk/plugins/splitwindow.c 2008-10-07 14:50:54 UTC (rev 3052) @@ -63,9 +63,18 @@ menu_items; static enum State plugin_state; -static GeanyEditor *our_editor = NULL; /* original editor for split view */ -static ScintillaObject *our_sci = NULL; /* new editor widget */ + +typedef struct EditWindow +{ + GeanyEditor *editor; /* original editor for split view */ + ScintillaObject *sci; /* new editor widget */ +} +EditWindow; + +static EditWindow edit_window = {NULL, NULL}; + + static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data); @@ -198,9 +207,9 @@ GeanyDocument *doc = p_document->get_current(); g_return_if_fail(doc); - g_return_if_fail(our_sci); + g_return_if_fail(edit_window.sci); - sync_to_current(doc->editor->sci, our_sci); + sync_to_current(doc->editor->sci, edit_window.sci); } @@ -252,7 +261,7 @@ set_state(STATE_SPLIT_HORIZONTAL); g_return_if_fail(doc); - g_return_if_fail(our_editor == NULL); + g_return_if_fail(edit_window.editor == NULL); /* temporarily put document notebook in main vbox (scintilla widgets must stay * in a visible parent window, otherwise there are X selection and scrollbar issues) */ @@ -268,10 +277,10 @@ gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(pane), box); - our_editor = doc->editor; - our_sci = p_editor->create_widget(our_editor); - sync_to_current(our_editor->sci, our_sci); - gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(our_sci), TRUE, TRUE, 0); + edit_window.editor = doc->editor; + edit_window.sci = p_editor->create_widget(edit_window.editor); + sync_to_current(edit_window.editor->sci, edit_window.sci); + gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(edit_window.sci), TRUE, TRUE, 0); gtk_paned_set_position(GTK_PANED(pane), width); gtk_widget_show_all(pane); @@ -286,7 +295,7 @@ set_state(STATE_UNSPLIT); - g_return_if_fail(our_editor); + g_return_if_fail(edit_window.editor); /* temporarily put document notebook in main vbox (scintilla widgets must stay * in a visible parent window, otherwise there are X selection and scrollbar issues) */ @@ -294,7 +303,7 @@ p_support->lookup_widget(geany->main_widgets->window, "vbox1")); gtk_widget_destroy(pane); - our_editor = NULL; + edit_window.editor = NULL; gtk_widget_reparent(notebook, parent); } @@ -330,7 +339,7 @@ static void on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) { /* remove the split window because the document won't exist anymore */ - if (our_editor && doc == our_editor->document) + if (doc->editor == edit_window.editor) on_unsplit(NULL, NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3051] trunk
by ntrel＠users.sourceforge.net 07 Oct '08

07 Oct '08

Revision: 3051 http://geany.svn.sourceforge.net/geany/?rev=3051&view=rev Author: ntrel Date: 2008-10-07 12:14:57 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Fix segfault when holding Alt and scrolling editor window. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-07 12:03:45 UTC (rev 3050) +++ trunk/ChangeLog 2008-10-07 12:14:57 UTC (rev 3051) @@ -3,6 +3,8 @@ * plugins/splitwindow.c: Add toolbar with Refresh button to sync to the current document, and an Unsplit button (reuses existing string). + * src/editor.c: + Fix segfault when holding Alt and scrolling editor window. 2008-10-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-10-07 12:03:45 UTC (rev 3050) +++ trunk/src/editor.c 2008-10-07 12:14:57 UTC (rev 3051) @@ -3810,7 +3810,7 @@ static gboolean on_editor_scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer user_data) { - /* Handle scroll events if Shift or Alt is pressed and scroll whole pages instead of a + /* Handle scroll events if Alt is pressed and scroll whole pages instead of a * few lines only, maybe this could/should be done in Scintilla directly */ if (event->state & GDK_MOD1_MASK) { @@ -3951,6 +3951,7 @@ GeanyEditor *editor = g_new0(GeanyEditor, 1); editor->document = doc; + doc->editor = editor; /* needed in case some editor functions/callbacks expect it */ editor->auto_indent = (iprefs->auto_indent_mode != GEANY_AUTOINDENT_NONE); editor->line_wrapping = editor_prefs.line_wrapping; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3050] trunk/plugins/splitwindow.c
by ntrel＠users.sourceforge.net 07 Oct '08

07 Oct '08

Revision: 3050 http://geany.svn.sourceforge.net/geany/?rev=3050&view=rev Author: ntrel Date: 2008-10-07 12:03:45 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Fix file header info. Modified Paths: -------------- trunk/plugins/splitwindow.c Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-10-07 12:00:29 UTC (rev 3049) +++ trunk/plugins/splitwindow.c 2008-10-07 12:03:45 UTC (rev 3050) @@ -1,7 +1,8 @@ /* - * splitview.c + * splitwindow.c - this file is part of Geany, a fast and lightweight IDE * * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +18,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. + * + * $Id$ */ +/* Split Window plugin. */ + #include "geany.h" #include <glib/gi18n.h> #include "Scintilla.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3049] trunk
by ntrel＠users.sourceforge.net 07 Oct '08

07 Oct '08

Revision: 3049 http://geany.svn.sourceforge.net/geany/?rev=3049&view=rev Author: ntrel Date: 2008-10-07 12:00:29 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Add toolbar with Refresh button to sync to the current document, and an Unsplit button (reuses existing string). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-06 18:37:22 UTC (rev 3048) +++ trunk/ChangeLog 2008-10-07 12:00:29 UTC (rev 3049) @@ -1,3 +1,10 @@ +2008-10-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/splitwindow.c: + Add toolbar with Refresh button to sync to the current document, and + an Unsplit button (reuses existing string). + + 2008-10-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/splitwindow.c: Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-10-06 18:37:22 UTC (rev 3048) +++ trunk/plugins/splitwindow.c 2008-10-07 12:00:29 UTC (rev 3049) @@ -59,8 +59,11 @@ static enum State plugin_state; static GeanyEditor *our_editor = NULL; /* original editor for split view */ +static ScintillaObject *our_sci = NULL; /* new editor widget */ +static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data); + static gint sci_get_value(ScintillaObject *sci, gint message_id, gint param) { return p_sci->send_message(sci, message_id, param, 0); @@ -171,13 +174,74 @@ } +static GtkWidget *create_tool_button(const gchar *label, const gchar *stock_id) +{ + GtkToolItem *item; + GtkTooltips *tooltips = GTK_TOOLTIPS(p_support->lookup_widget( + geany->main_widgets->window, "tooltips")); + + item = gtk_tool_button_new(NULL, label); + gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), stock_id); + gtk_tool_item_set_tooltip(item, tooltips, label, NULL); + + return GTK_WIDGET(item); +} + + +static void on_refresh(void) +{ + GeanyDocument *doc = p_document->get_current(); + + g_return_if_fail(doc); + g_return_if_fail(our_sci); + + sync_to_current(doc->editor->sci, our_sci); +} + + +/* avoid adding new strings which are the same but without a leading underscore */ +static const gchar *after_underscore(const gchar *str) +{ + const gchar *u = g_strstr_len(str, -1, "_"); + + if (u) + return ++u; + else + return str; +} + + +static GtkWidget *create_toolbar(void) +{ + GtkWidget *toolbar, *item; + GtkToolItem *tool_item; + + toolbar = gtk_toolbar_new(); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); + + item = (GtkWidget*)gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH); + gtk_container_add(GTK_CONTAINER(toolbar), item); + g_signal_connect(item, "clicked", G_CALLBACK(on_refresh), NULL); + + tool_item = gtk_tool_item_new(); + gtk_tool_item_set_expand(tool_item, TRUE); + gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(tool_item)); + + item = create_tool_button(after_underscore(_("_Unsplit")), GTK_STOCK_CLOSE); + gtk_container_add(GTK_CONTAINER(toolbar), item); + g_signal_connect(item, "clicked", G_CALLBACK(on_unsplit), NULL); + + return toolbar; +} + + static void on_split_view(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *notebook = geany_data->main_widgets->notebook; GtkWidget *parent = gtk_widget_get_parent(notebook); - GtkWidget *pane; + GtkWidget *pane, *toolbar, *box; GeanyDocument *doc = p_document->get_current(); - ScintillaObject *sci; gint width = notebook->allocation.width / 2; set_state(STATE_SPLIT_HORIZONTAL); @@ -194,10 +258,15 @@ gtk_container_add(GTK_CONTAINER(parent), pane); gtk_widget_reparent(notebook, pane); + box = gtk_vbox_new(FALSE, 0); + toolbar = create_toolbar(); + gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(pane), box); + our_editor = doc->editor; - sci = p_editor->create_widget(our_editor); - sync_to_current(our_editor->sci, sci); - gtk_paned_add2(GTK_PANED(pane), GTK_WIDGET(sci)); + our_sci = p_editor->create_widget(our_editor); + sync_to_current(our_editor->sci, our_sci); + gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(our_sci), TRUE, TRUE, 0); gtk_paned_set_position(GTK_PANED(pane), width); gtk_widget_show_all(pane); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3048] trunk/wscript
by eht16＠users.sourceforge.net 06 Oct '08

06 Oct '08

Revision: 3048 http://geany.svn.sourceforge.net/geany/?rev=3048&view=rev Author: eht16 Date: 2008-10-06 18:37:22 +0000 (Mon, 06 Oct 2008) Log Message: ----------- Use Tabs for indentation. Modified Paths: -------------- trunk/wscript Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-10-06 18:37:10 UTC (rev 3047) +++ trunk/wscript 2008-10-06 18:37:22 UTC (rev 3048) @@ -32,7 +32,7 @@ Missing features: --enable-binreloc, make targets: dist, pdf (in doc/) Known issues: Dependency handling is buggy, e.g. if src/document.h is - changed, depending source files are not rebuilt (maybe Waf bug). + changed, depending source files are not rebuilt (maybe Waf bug). Requires WAF 1.5 (SVN r4661 or later) and Python 2.4 (or later). """ @@ -51,426 +51,426 @@ tagmanager_sources = [ - 'tagmanager/args.c', 'tagmanager/asm.c', 'tagmanager/basic.c', 'tagmanager/c.c', - 'tagmanager/conf.c', 'tagmanager/css.c', 'tagmanager/ctags.c', 'tagmanager/diff.c', - 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', - 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c', - 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c', - 'tagmanager/make.c', 'tagmanager/options.c', 'tagmanager/parse.c', 'tagmanager/pascal.c', - 'tagmanager/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c', - 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c', - 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/tcl.c', 'tagmanager/tm_file_entry.c', - 'tagmanager/tm_project.c', 'tagmanager/tm_source_file.c', 'tagmanager/tm_symbol.c', - 'tagmanager/tm_tag.c', 'tagmanager/tm_tagmanager.c', 'tagmanager/tm_work_object.c', - 'tagmanager/tm_workspace.c', 'tagmanager/vhdl.c', 'tagmanager/vstring.c' ] + 'tagmanager/args.c', 'tagmanager/asm.c', 'tagmanager/basic.c', 'tagmanager/c.c', + 'tagmanager/conf.c', 'tagmanager/css.c', 'tagmanager/ctags.c', 'tagmanager/diff.c', + 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', + 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c', + 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c', + 'tagmanager/make.c', 'tagmanager/options.c', 'tagmanager/parse.c', 'tagmanager/pascal.c', + 'tagmanager/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c', + 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c', + 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/tcl.c', 'tagmanager/tm_file_entry.c', + 'tagmanager/tm_project.c', 'tagmanager/tm_source_file.c', 'tagmanager/tm_symbol.c', + 'tagmanager/tm_tag.c', 'tagmanager/tm_tagmanager.c', 'tagmanager/tm_work_object.c', + 'tagmanager/tm_workspace.c', 'tagmanager/vhdl.c', 'tagmanager/vstring.c' ] scintilla_sources = [ - 'scintilla/AutoComplete.cxx', 'scintilla/CallTip.cxx', 'scintilla/CellBuffer.cxx', - 'scintilla/CharClassify.cxx', 'scintilla/ContractionState.cxx', 'scintilla/Decoration.cxx', - 'scintilla/DocumentAccessor.cxx', 'scintilla/Document.cxx', 'scintilla/Editor.cxx', - 'scintilla/ExternalLexer.cxx', 'scintilla/Indicator.cxx', 'scintilla/KeyMap.cxx', - 'scintilla/KeyWords.cxx', 'scintilla/LexAsm.cxx', 'scintilla/LexBash.cxx', - 'scintilla/LexBasic.cxx', 'scintilla/LexCaml.cxx', 'scintilla/LexCPP.cxx', - 'scintilla/LexCrontab.cxx', 'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx', - 'scintilla/LexFortran.cxx', 'scintilla/LexHaskell.cxx', 'scintilla/LexHTML.cxx', - 'scintilla/LexLua.cxx', 'scintilla/LexOMS.cxx', 'scintilla/LexOthers.cxx', - 'scintilla/LexPascal.cxx', 'scintilla/LexPerl.cxx', 'scintilla/LexPython.cxx', - 'scintilla/LexR.cxx', - 'scintilla/LexRuby.cxx', 'scintilla/LexSQL.cxx', 'scintilla/LexTCL.cxx', - 'scintilla/LexVHDL.cxx', 'scintilla/LineMarker.cxx', 'scintilla/PlatGTK.cxx', - 'scintilla/PositionCache.cxx', 'scintilla/PropSet.cxx', 'scintilla/RESearch.cxx', - 'scintilla/RunStyles.cxx', 'scintilla/ScintillaBase.cxx', 'scintilla/ScintillaGTK.cxx', - 'scintilla/scintilla-marshal.c', 'scintilla/StyleContext.cxx', 'scintilla/Style.cxx', - 'scintilla/UniConversion.cxx', 'scintilla/ViewStyle.cxx', 'scintilla/WindowAccessor.cxx', - 'scintilla/XPM.cxx' ] + 'scintilla/AutoComplete.cxx', 'scintilla/CallTip.cxx', 'scintilla/CellBuffer.cxx', + 'scintilla/CharClassify.cxx', 'scintilla/ContractionState.cxx', 'scintilla/Decoration.cxx', + 'scintilla/DocumentAccessor.cxx', 'scintilla/Document.cxx', 'scintilla/Editor.cxx', + 'scintilla/ExternalLexer.cxx', 'scintilla/Indicator.cxx', 'scintilla/KeyMap.cxx', + 'scintilla/KeyWords.cxx', 'scintilla/LexAsm.cxx', 'scintilla/LexBash.cxx', + 'scintilla/LexBasic.cxx', 'scintilla/LexCaml.cxx', 'scintilla/LexCPP.cxx', + 'scintilla/LexCrontab.cxx', 'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx', + 'scintilla/LexFortran.cxx', 'scintilla/LexHaskell.cxx', 'scintilla/LexHTML.cxx', + 'scintilla/LexLua.cxx', 'scintilla/LexOMS.cxx', 'scintilla/LexOthers.cxx', + 'scintilla/LexPascal.cxx', 'scintilla/LexPerl.cxx', 'scintilla/LexPython.cxx', + 'scintilla/LexR.cxx', + 'scintilla/LexRuby.cxx', 'scintilla/LexSQL.cxx', 'scintilla/LexTCL.cxx', + 'scintilla/LexVHDL.cxx', 'scintilla/LineMarker.cxx', 'scintilla/PlatGTK.cxx', + 'scintilla/PositionCache.cxx', 'scintilla/PropSet.cxx', 'scintilla/RESearch.cxx', + 'scintilla/RunStyles.cxx', 'scintilla/ScintillaBase.cxx', 'scintilla/ScintillaGTK.cxx', + 'scintilla/scintilla-marshal.c', 'scintilla/StyleContext.cxx', 'scintilla/Style.cxx', + 'scintilla/UniConversion.cxx', 'scintilla/ViewStyle.cxx', 'scintilla/WindowAccessor.cxx', + 'scintilla/XPM.cxx' ] geany_sources = [ - 'src/about.c', 'src/build.c', 'src/callbacks.c', 'src/dialogs.c', 'src/document.c', - 'src/editor.c', 'src/encodings.c', 'src/filetypes.c', 'src/geanyobject.c', - 'src/geanywraplabel.c', 'src/highlighting.c', 'src/interface.c', 'src/keybindings.c', - 'src/keyfile.c', 'src/log.c', 'src/main.c', 'src/msgwindow.c', 'src/navqueue.c', 'src/notebook.c', - 'src/plugins.c', 'src/prefix.c', 'src/prefs.c', 'src/printing.c', 'src/project.c', - 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/support.c', 'src/symbols.c', - 'src/templates.c', 'src/tools.c', 'src/treeviews.c', 'src/ui_utils.c', 'src/utils.c' ] + 'src/about.c', 'src/build.c', 'src/callbacks.c', 'src/dialogs.c', 'src/document.c', + 'src/editor.c', 'src/encodings.c', 'src/filetypes.c', 'src/geanyobject.c', + 'src/geanywraplabel.c', 'src/highlighting.c', 'src/interface.c', 'src/keybindings.c', + 'src/keyfile.c', 'src/log.c', 'src/main.c', 'src/msgwindow.c', 'src/navqueue.c', 'src/notebook.c', + 'src/plugins.c', 'src/prefix.c', 'src/prefs.c', 'src/printing.c', 'src/project.c', + 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/support.c', 'src/symbols.c', + 'src/templates.c', 'src/tools.c', 'src/treeviews.c', 'src/ui_utils.c', 'src/utils.c' ] def configure(conf): - def conf_get_svn_rev(): - # try GIT - if os.path.exists('.git'): - cmds = [ 'git svn find-rev HEAD 2>/dev/null', - 'git svn find-rev origin/trunk 2>/dev/null', - 'git svn find-rev trunk 2>/dev/null', - 'git svn find-rev master 2>/dev/null' ] - for c in cmds: - try: - stdout = Utils.cmd_output(c) - if stdout: - return stdout.strip() - except: - pass - # try SVN - elif os.path.exists('.svn'): - try: - stdout = Utils.cmd_output('svn info --non-interactive', {'LANG' : 'C'}) - lines = stdout.splitlines(True) - for line in lines: - if line.startswith('Last Changed Rev'): - key, value = line.split(': ', 1) - return value.strip() - except: - pass - else: - pass - return '-1' + def conf_get_svn_rev(): + # try GIT + if os.path.exists('.git'): + cmds = [ 'git svn find-rev HEAD 2>/dev/null', + 'git svn find-rev origin/trunk 2>/dev/null', + 'git svn find-rev trunk 2>/dev/null', + 'git svn find-rev master 2>/dev/null' ] + for c in cmds: + try: + stdout = Utils.cmd_output(c) + if stdout: + return stdout.strip() + except: + pass + # try SVN + elif os.path.exists('.svn'): + try: + stdout = Utils.cmd_output('svn info --non-interactive', {'LANG' : 'C'}) + lines = stdout.splitlines(True) + for line in lines: + if line.startswith('Last Changed Rev'): + key, value = line.split(': ', 1) + return value.strip() + except: + pass + else: + pass + return '-1' - def conf_define_from_opt(define_name, opt_name, default_value, quote=1): - if opt_name: - if isinstance(opt_name, bool): - opt_name = 1 - conf.define(define_name, opt_name, quote) - elif default_value: - conf.define(define_name, default_value, quote) + def conf_define_from_opt(define_name, opt_name, default_value, quote=1): + if opt_name: + if isinstance(opt_name, bool): + opt_name = 1 + conf.define(define_name, opt_name, quote) + elif default_value: + conf.define(define_name, default_value, quote) - conf.check_tool('compiler_cc') + conf.check_tool('compiler_cc') - conf.check(header_name='fcntl.h') - conf.check(header_name='fnmatch.h') - conf.check(header_name='glob.h') - conf.check(header_name='sys/time.h') - conf.check(header_name='sys/types.h') - conf.check(header_name='sys/stat.h') - conf.define('HAVE_STDLIB_H', 1) # are there systems without stdlib.h? - conf.define('STDC_HEADERS', 1) # an optimistic guess ;-) + conf.check(header_name='fcntl.h') + conf.check(header_name='fnmatch.h') + conf.check(header_name='glob.h') + conf.check(header_name='sys/time.h') + conf.check(header_name='sys/types.h') + conf.check(header_name='sys/stat.h') + conf.define('HAVE_STDLIB_H', 1) # are there systems without stdlib.h? + conf.define('STDC_HEADERS', 1) # an optimistic guess ;-) - if Options.options.gnu_regex: - conf.define('HAVE_REGCOMP', 1, 0) - conf.define('USE_INCLUDED_REGEX', 1, 0) - else: - conf.check(header_name='regex.h') - if conf.env['HAVE_REGEX_H'] == 1: - conf.check(function_name='regcomp', header_name='regex.h') - # fallback to included regex lib - if conf.env['HAVE_REGCOMP'] != 1 or conf.env['HAVE_REGEX_H'] != 1: - conf.define('HAVE_REGCOMP', 1, 0) - conf.define('USE_INCLUDED_REGEX', 1, 0) - Utils.pprint('YELLOW', 'Using included GNU regex library.') + if Options.options.gnu_regex: + conf.define('HAVE_REGCOMP', 1, 0) + conf.define('USE_INCLUDED_REGEX', 1, 0) + else: + conf.check(header_name='regex.h') + if conf.env['HAVE_REGEX_H'] == 1: + conf.check(function_name='regcomp', header_name='regex.h') + # fallback to included regex lib + if conf.env['HAVE_REGCOMP'] != 1 or conf.env['HAVE_REGEX_H'] != 1: + conf.define('HAVE_REGCOMP', 1, 0) + conf.define('USE_INCLUDED_REGEX', 1, 0) + Utils.pprint('YELLOW', 'Using included GNU regex library.') - conf.check(function_name='fgetpos', header_name='stdio.h') - conf.check(function_name='ftruncate', header_name='unistd.h') - conf.check(function_name='gethostname', header_name='unistd.h') - conf.check(function_name='mkstemp', header_name='stdlib.h') - conf.check(function_name='strstr', header_name='string.h', mandatory=True) + conf.check(function_name='fgetpos', header_name='stdio.h') + conf.check(function_name='ftruncate', header_name='unistd.h') + conf.check(function_name='gethostname', header_name='unistd.h') + conf.check(function_name='mkstemp', header_name='stdlib.h') + conf.check(function_name='strstr', header_name='string.h', mandatory=True) - # check for cxx after the header and function checks have been done to ensure they are - # checked with cc not cxx - conf.check_tool('compiler_cxx intltool misc') + # check for cxx after the header and function checks have been done to ensure they are + # checked with cc not cxx + conf.check_tool('compiler_cxx intltool misc') - conf.check_cfg(package='gtk+-2.0', atleast_version='2.6.0', uselib_store='GTK') - conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK') + conf.check_cfg(package='gtk+-2.0', atleast_version='2.6.0', uselib_store='GTK') + conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK') - # GTK version check - have_gtk_210 = False - gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') - if gtk_version: - if version.LooseVersion(gtk_version) >= version.LooseVersion('2.10.0'): - have_gtk_210 = True - else: - gtk_version = 'Unknown' + # GTK version check + have_gtk_210 = False + gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') + if gtk_version: + if version.LooseVersion(gtk_version) >= version.LooseVersion('2.10.0'): + have_gtk_210 = True + else: + gtk_version = 'Unknown' - conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib') - conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany') - conf_define_from_opt('MANDIR', Options.options.mandir, conf.env['DATADIR'] + '/man') + conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib') + conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany') + conf_define_from_opt('MANDIR', Options.options.mandir, conf.env['DATADIR'] + '/man') - svn_rev = conf_get_svn_rev() - conf.define('ENABLE_NLS', 1) - conf.define('GEANY_LOCALEDIR', 'LOCALEDIR', 0) - conf.define('GEANY_DATADIR', 'DATADIR', 0) - conf.define('GEANY_DOCDIR', 'DOCDIR', 0) - conf.define('GEANY_LIBDIR', 'LIBDIR', 0) - conf.define('GEANY_PREFIX', conf.env['PREFIX'], 1) - conf.define('PACKAGE', APPNAME, 1) - conf.define('VERSION', VERSION, 1) - conf.define('REVISION', svn_rev, 1) + svn_rev = conf_get_svn_rev() + conf.define('ENABLE_NLS', 1) + conf.define('GEANY_LOCALEDIR', 'LOCALEDIR', 0) + conf.define('GEANY_DATADIR', 'DATADIR', 0) + conf.define('GEANY_DOCDIR', 'DOCDIR', 0) + conf.define('GEANY_LIBDIR', 'LIBDIR', 0) + conf.define('GEANY_PREFIX', conf.env['PREFIX'], 1) + conf.define('PACKAGE', APPNAME, 1) + conf.define('VERSION', VERSION, 1) + conf.define('REVISION', svn_rev, 1) - conf.define('GETTEXT_PACKAGE', APPNAME, 1) + conf.define('GETTEXT_PACKAGE', APPNAME, 1) - conf_define_from_opt('HAVE_PLUGINS', not Options.options.no_plugins, None, 0) - conf_define_from_opt('HAVE_SOCKET', not Options.options.no_socket, None, 0) - conf_define_from_opt('HAVE_VTE', not Options.options.no_vte, None, 0) + conf_define_from_opt('HAVE_PLUGINS', not Options.options.no_plugins, None, 0) + conf_define_from_opt('HAVE_SOCKET', not Options.options.no_socket, None, 0) + conf_define_from_opt('HAVE_VTE', not Options.options.no_vte, None, 0) - conf.write_config_header('config.h') + conf.write_config_header('config.h') - Utils.pprint('BLUE', 'Summary:') - print_message('Install Geany ' + VERSION + ' in', conf.env['PREFIX']) - print_message('Using GTK version', gtk_version) - print_message('Build with GTK printing support', have_gtk_210 and 'yes' or 'no') - print_message('Build with plugin support', Options.options.no_plugins and 'no' or 'yes') - print_message('Use virtual terminal support', Options.options.no_vte and 'no' or 'yes') - if svn_rev != '-1': - print_message('Compiling Subversion revision', svn_rev) - conf.env.append_value('CCFLAGS', '-g -DGEANY_DEBUG') + Utils.pprint('BLUE', 'Summary:') + print_message('Install Geany ' + VERSION + ' in', conf.env['PREFIX']) + print_message('Using GTK version', gtk_version) + print_message('Build with GTK printing support', have_gtk_210 and 'yes' or 'no') + print_message('Build with plugin support', Options.options.no_plugins and 'no' or 'yes') + print_message('Use virtual terminal support', Options.options.no_vte and 'no' or 'yes') + if svn_rev != '-1': + print_message('Compiling Subversion revision', svn_rev) + conf.env.append_value('CCFLAGS', '-g -DGEANY_DEBUG') - conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H') - conf.env.append_value('CXXFLAGS', '-DNDEBUG -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE \ - -Wno-missing-braces -Wno-char-subscripts') # Scintilla flags + conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H') + conf.env.append_value('CXXFLAGS', '-DNDEBUG -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE \ + -Wno-missing-braces -Wno-char-subscripts') # Scintilla flags def set_options(opt): - opt.tool_options('compiler_cc') - opt.tool_options('compiler_cxx') - opt.tool_options('intltool') + opt.tool_options('compiler_cc') + opt.tool_options('compiler_cxx') + opt.tool_options('intltool') - if 'configure' in sys.argv: - # Features - opt.add_option('--disable-plugins', action='store_true', default=False, - help='compile without plugin support [default: No]', dest='no_plugins') - opt.add_option('--disable-socket', action='store_true', default=False, - help='compile without support to detect a running instance [[default: No]', dest='no_socket') - opt.add_option('--disable-vte', action='store_true', default=False, - help='compile without support for an embedded virtual terminal [[default: No]', dest='no_vte') - opt.add_option('--enable-gnu-regex', action='store_true', default=False, - help='compile with included GNU regex library [default: No]', dest='gnu_regex') - # Paths - opt.add_option('--mandir', type='string', default='', - help='man documentation', dest='mandir') - opt.add_option('--docdir', type='string', default='', - help='documentation root', dest='docdir') - opt.add_option('--libdir', type='string', default='', - help='object code libraries', dest='libdir') - # Actions - opt.add_option('--htmldoc', action='store_true', default=False, - help='generate HTML documentation', dest='htmldoc') - opt.add_option('--apidoc', action='store_true', default=False, - help='generate API reference documentation', dest='apidoc') - opt.add_option('--update-po', action='store_true', default=False, - help='update the message catalogs for translation', dest='update_po') + if 'configure' in sys.argv: + # Features + opt.add_option('--disable-plugins', action='store_true', default=False, + help='compile without plugin support [default: No]', dest='no_plugins') + opt.add_option('--disable-socket', action='store_true', default=False, + help='compile without support to detect a running instance [[default: No]', dest='no_socket') + opt.add_option('--disable-vte', action='store_true', default=False, + help='compile without support for an embedded virtual terminal [[default: No]', dest='no_vte') + opt.add_option('--enable-gnu-regex', action='store_true', default=False, + help='compile with included GNU regex library [default: No]', dest='gnu_regex') + # Paths + opt.add_option('--mandir', type='string', default='', + help='man documentation', dest='mandir') + opt.add_option('--docdir', type='string', default='', + help='documentation root', dest='docdir') + opt.add_option('--libdir', type='string', default='', + help='object code libraries', dest='libdir') + # Actions + opt.add_option('--htmldoc', action='store_true', default=False, + help='generate HTML documentation', dest='htmldoc') + opt.add_option('--apidoc', action='store_true', default=False, + help='generate API reference documentation', dest='apidoc') + opt.add_option('--update-po', action='store_true', default=False, + help='update the message catalogs for translation', dest='update_po') def build(bld): - def build_plugin(plugin_name, install = True): - obj = bld.new_task_gen('cc', 'shlib') - obj.source = 'plugins/' + plugin_name + '.c' - obj.includes = '. plugins/ src/ scintilla/include tagmanager/include' - obj.env['shlib_PATTERN'] = '%s.so' - obj.target = plugin_name - obj.uselib = 'GTK' - if install: - obj.install_path = '${LIBDIR}/geany/' - else: - obj.install_path = 0 - #~ obj.want_libtool = 1 + def build_plugin(plugin_name, install = True): + obj = bld.new_task_gen('cc', 'shlib') + obj.source = 'plugins/' + plugin_name + '.c' + obj.includes = '. plugins/ src/ scintilla/include tagmanager/include' + obj.env['shlib_PATTERN'] = '%s.so' + obj.target = plugin_name + obj.uselib = 'GTK' + if install: + obj.install_path = '${LIBDIR}/geany/' + else: + obj.install_path = 0 + #~ obj.want_libtool = 1 - # Tagmanager - if bld.env['USE_INCLUDED_REGEX'] == 1: - tagmanager_sources.append('tagmanager/regex.c') - obj = bld.new_task_gen('cc', 'staticlib') - obj.name = 'tagmanager' - obj.target = 'tagmanager' - obj.source = tagmanager_sources - obj.includes = '. tagmanager/ tagmanager/include/' - obj.uselib = 'GTK' - obj.install_path = 0 # do not install this library + # Tagmanager + if bld.env['USE_INCLUDED_REGEX'] == 1: + tagmanager_sources.append('tagmanager/regex.c') + obj = bld.new_task_gen('cc', 'staticlib') + obj.name = 'tagmanager' + obj.target = 'tagmanager' + obj.source = tagmanager_sources + obj.includes = '. tagmanager/ tagmanager/include/' + obj.uselib = 'GTK' + obj.install_path = 0 # do not install this library - # Scintilla - obj = bld.new_task_gen('cxx', 'staticlib') - obj.features.append('cc') - obj.name = 'scintilla' - obj.target = 'scintilla' - obj.source = scintilla_sources - obj.includes = 'scintilla/ scintilla/include/' - obj.uselib = 'GTK' - obj.install_path = 0 # do not install this library + # Scintilla + obj = bld.new_task_gen('cxx', 'staticlib') + obj.features.append('cc') + obj.name = 'scintilla' + obj.target = 'scintilla' + obj.source = scintilla_sources + obj.includes = 'scintilla/ scintilla/include/' + obj.uselib = 'GTK' + obj.install_path = 0 # do not install this library - # Geany - if bld.env['HAVE_VTE'] == 1: - geany_sources.append('src/vte.c') - if sys.platform == "win32": - geany_sources.append('src/win32.c') - obj = bld.new_task_gen('cxx', 'program') - obj.features.append('cc') - obj.name = 'geany' - obj.target = 'geany' - obj.source = geany_sources - obj.includes = '. src/ scintilla/include/ tagmanager/include/' - obj.uselib = 'GTK' - obj.uselib_local = 'scintilla tagmanager' + # Geany + if bld.env['HAVE_VTE'] == 1: + geany_sources.append('src/vte.c') + if sys.platform == "win32": + geany_sources.append('src/win32.c') + obj = bld.new_task_gen('cxx', 'program') + obj.features.append('cc') + obj.name = 'geany' + obj.target = 'geany' + obj.source = geany_sources + obj.includes = '. src/ scintilla/include/ tagmanager/include/' + obj.uselib = 'GTK' + obj.uselib_local = 'scintilla tagmanager' - # Plugins - if bld.env['HAVE_PLUGINS'] == 1: - build_plugin('classbuilder') - build_plugin('demoplugin', False) - build_plugin('export') - build_plugin('filebrowser') - build_plugin('htmlchars') - build_plugin('saveactions') - build_plugin('splitwindow') - build_plugin('vcdiff') + # Plugins + if bld.env['HAVE_PLUGINS'] == 1: + build_plugin('classbuilder') + build_plugin('demoplugin', False) + build_plugin('export') + build_plugin('filebrowser') + build_plugin('htmlchars') + build_plugin('saveactions') + build_plugin('splitwindow') + build_plugin('vcdiff') - # Translations - obj = bld.new_task_gen('intltool_po') - obj.podir = 'po' - obj.appname = 'geany' + # Translations + obj = bld.new_task_gen('intltool_po') + obj.podir = 'po' + obj.appname = 'geany' - # geany.desktop - obj = bld.new_task_gen('intltool_in') - obj.source = 'geany.desktop.in' - obj.flags = '-d' - obj.install_path = '${DATADIR}/applications' + # geany.desktop + obj = bld.new_task_gen('intltool_in') + obj.source = 'geany.desktop.in' + obj.flags = '-d' + obj.install_path = '${DATADIR}/applications' - # geany.pc - obj = bld.new_task_gen('subst') - obj.source = 'geany.pc.in' - obj.target = 'geany.pc' - obj.dict = { 'VERSION' : VERSION, - 'prefix': bld.env['PREFIX'], - 'exec_prefix': '${prefix}', - 'libdir': '${exec_prefix}/lib', - 'includedir': '${prefix}/include', - 'datarootdir': '${prefix}/share', - 'datadir': '${datarootdir}', - 'localedir': '${datarootdir}/locale' } - # seems currently broken in Waf - #~ obj.install_path = '${LIBDIR}/pkgconfig' - obj.install_path = 0 - bld.install_files('${LIBDIR}/pkgconfig', 'geany.pc') + # geany.pc + obj = bld.new_task_gen('subst') + obj.source = 'geany.pc.in' + obj.target = 'geany.pc' + obj.dict = { 'VERSION' : VERSION, + 'prefix': bld.env['PREFIX'], + 'exec_prefix': '${prefix}', + 'libdir': '${exec_prefix}/lib', + 'includedir': '${prefix}/include', + 'datarootdir': '${prefix}/share', + 'datadir': '${datarootdir}', + 'localedir': '${datarootdir}/locale' } + # seems currently broken in Waf + #~ obj.install_path = '${LIBDIR}/pkgconfig' + obj.install_path = 0 + bld.install_files('${LIBDIR}/pkgconfig', 'geany.pc') - # geany.1 - obj = bld.new_task_gen('subst') - obj.source = 'doc/geany.1.in' - obj.target = 'geany.1' - obj.dict = { 'VERSION' : VERSION, - 'GEANY_DATA_DIR': bld.env['DATADIR'] + '/geany' } - # seems currently broken in Waf - #~ obj.install_path = '${MANDIR}/man1' - obj.install_path = 0 - bld.install_files('${MANDIR}/man1', 'doc/geany.1') + # geany.1 + obj = bld.new_task_gen('subst') + obj.source = 'doc/geany.1.in' + obj.target = 'geany.1' + obj.dict = { 'VERSION' : VERSION, + 'GEANY_DATA_DIR': bld.env['DATADIR'] + '/geany' } + # seems currently broken in Waf + #~ obj.install_path = '${MANDIR}/man1' + obj.install_path = 0 + bld.install_files('${MANDIR}/man1', 'doc/geany.1') - # geany.spec - obj = bld.new_task_gen('subst') - obj.source = 'geany.spec.in' - obj.target = 'geany.spec' - obj.install_path = 0 - obj.dict = { 'VERSION' : VERSION } + # geany.spec + obj = bld.new_task_gen('subst') + obj.source = 'geany.spec.in' + obj.target = 'geany.spec' + obj.install_path = 0 + obj.dict = { 'VERSION' : VERSION } - # Doxyfile - obj = bld.new_task_gen('subst') - obj.source = 'doc/Doxyfile.in' - obj.target = 'Doxyfile' - obj.install_path = 0 - obj.dict = { 'VERSION' : VERSION } + # Doxyfile + obj = bld.new_task_gen('subst') + obj.source = 'doc/Doxyfile.in' + obj.target = 'Doxyfile' + obj.install_path = 0 + obj.dict = { 'VERSION' : VERSION } - ### - # Install files - ### - # Headers - bld.install_files('${PREFIX}/include/geany', ''' - src/dialogs.h src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h - src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h src/plugins.h - src/prefs.h src/project.h src/sciwrappers.h src/search.h src/support.h src/templates.h - src/ui_utils.h src/utils.h - plugins/pluginmacros.h ''') - bld.install_files('${PREFIX}/include/geany/scintilla', ''' - scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface - scintilla/include/ScintillaWidget.h ''') - bld.install_files('${PREFIX}/include/geany/tagmanager', ''' - tagmanager/include/tm_file_entry.h tagmanager/include/tm_project.h tagmanager/include/tm_source_file.h - tagmanager/include/tm_symbol.h tagmanager/include/tm_tag.h tagmanager/include/tm_tagmanager.h - tagmanager/include/tm_work_object.h tagmanager/include/tm_workspace.h ''') - # Docs - bld.install_files('${DOCDIR}', 'AUTHORS ChangeLog COPYING README NEWS THANKS TODO') - bld.install_files('${DOCDIR}/html/images', 'doc/images/*.png') - bld.install_as('${DOCDIR}/manual.txt', 'doc/geany.txt') - bld.install_as('${DOCDIR}/html/index.html', 'doc/geany.html') - bld.install_as('${DOCDIR}/ScintillaLicense.txt', 'scintilla/License.txt') - # Data - bld.install_files('${DATADIR}/geany', 'data/filetype*') - bld.install_files('${DATADIR}/geany', 'data/*.tags') - bld.install_files('${DATADIR}/geany', 'data/snippets.conf') - bld.install_as('${DATADIR}/geany/GPL-2', 'COPYING') - # Icons - bld.install_files('${DATADIR}/pixmaps', 'pixmaps/geany.png') - bld.install_files('${DATADIR}/icons/hicolor/16x16/apps', 'icons/16x16/*.png') + ### + # Install files + ### + # Headers + bld.install_files('${PREFIX}/include/geany', ''' + src/dialogs.h src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h + src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h src/plugins.h + src/prefs.h src/project.h src/sciwrappers.h src/search.h src/support.h src/templates.h + src/ui_utils.h src/utils.h + plugins/pluginmacros.h ''') + bld.install_files('${PREFIX}/include/geany/scintilla', ''' + scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface + scintilla/include/ScintillaWidget.h ''') + bld.install_files('${PREFIX}/include/geany/tagmanager', ''' + tagmanager/include/tm_file_entry.h tagmanager/include/tm_project.h tagmanager/include/tm_source_file.h + tagmanager/include/tm_symbol.h tagmanager/include/tm_tag.h tagmanager/include/tm_tagmanager.h + tagmanager/include/tm_work_object.h tagmanager/include/tm_workspace.h ''') + # Docs + bld.install_files('${DOCDIR}', 'AUTHORS ChangeLog COPYING README NEWS THANKS TODO') + bld.install_files('${DOCDIR}/html/images', 'doc/images/*.png') + bld.install_as('${DOCDIR}/manual.txt', 'doc/geany.txt') + bld.install_as('${DOCDIR}/html/index.html', 'doc/geany.html') + bld.install_as('${DOCDIR}/ScintillaLicense.txt', 'scintilla/License.txt') + # Data + bld.install_files('${DATADIR}/geany', 'data/filetype*') + bld.install_files('${DATADIR}/geany', 'data/*.tags') + bld.install_files('${DATADIR}/geany', 'data/snippets.conf') + bld.install_as('${DATADIR}/geany/GPL-2', 'COPYING') + # Icons + bld.install_files('${DATADIR}/pixmaps', 'pixmaps/geany.png') + bld.install_files('${DATADIR}/icons/hicolor/16x16/apps', 'icons/16x16/*.png') def shutdown(): - # the following code was taken from midori's WAF script, thanks - if Options.commands['install'] or Options.commands['uninstall']: - dir = Build.bld.get_install_path('${DATADIR}/icons/hicolor') - icon_cache_updated = False - if not Options.options.destdir: - try: - subprocess.call(['gtk-update-icon-cache', '-q', '-f', '-t', dir]) - Utils.pprint('GREEN', 'GTK icon cache updated.') - icon_cache_updated = True - except: - Utils.pprint('YELLOW', 'Failed to update icon cache for ' + dir + '.') - if not icon_cache_updated and not Options.options.destdir: - print 'Icon cache not updated. After install, run this:' - print 'gtk-update-icon-cache -q -f -t %s' % dir + # the following code was taken from midori's WAF script, thanks + if Options.commands['install'] or Options.commands['uninstall']: + dir = Build.bld.get_install_path('${DATADIR}/icons/hicolor') + icon_cache_updated = False + if not Options.options.destdir: + try: + subprocess.call(['gtk-update-icon-cache', '-q', '-f', '-t', dir]) + Utils.pprint('GREEN', 'GTK icon cache updated.') + icon_cache_updated = True + except: + Utils.pprint('YELLOW', 'Failed to update icon cache for ' + dir + '.') + if not icon_cache_updated and not Options.options.destdir: + print 'Icon cache not updated. After install, run this:' + print 'gtk-update-icon-cache -q -f -t %s' % dir - if Options.options.apidoc: - doxyfile = os.path.join(Build.bld.srcnode.abspath( \ - Build.bld.env), 'doc', 'Doxyfile') - os.chdir('doc') - launch('doxygen ' + doxyfile, 'Generating API reference documentation') + if Options.options.apidoc: + doxyfile = os.path.join(Build.bld.srcnode.abspath( \ + Build.bld.env), 'doc', 'Doxyfile') + os.chdir('doc') + launch('doxygen ' + doxyfile, 'Generating API reference documentation') - if Options.options.htmldoc: - os.chdir('doc') - # first try rst2html.py as it is the upstream default - ret = launch('rst2html.py -stg --stylesheet=geany.css geany.txt geany.html', - 'Generating HTML documentation') - if not ret == 0: - launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html', - 'Generating HTML documentation (using fallback "rst2html")') + if Options.options.htmldoc: + os.chdir('doc') + # first try rst2html.py as it is the upstream default + ret = launch('rst2html.py -stg --stylesheet=geany.css geany.txt geany.html', + 'Generating HTML documentation') + if not ret == 0: + launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html', + 'Generating HTML documentation (using fallback "rst2html")') - if Options.options.update_po: - # the following code was taken from midori's WAF script, thanks - os.chdir('./po') - try: - try: - size_old = os.stat('geany.pot').st_size - except: - size_old = 0 - subprocess.call(['intltool-update', '--pot']) - size_new = os.stat('geany.pot').st_size - if size_new != size_old: - Utils.pprint('CYAN', 'Updated POT file.') - launch('intltool-update -r', 'Updating translations', 'CYAN') - else: - Utils.pprint('CYAN', 'POT file is up to date.') - except: - Utils.pprint('RED', 'Failed to generate pot file.') - os.chdir('..') + if Options.options.update_po: + # the following code was taken from midori's WAF script, thanks + os.chdir('./po') + try: + try: + size_old = os.stat('geany.pot').st_size + except: + size_old = 0 + subprocess.call(['intltool-update', '--pot']) + size_new = os.stat('geany.pot').st_size + if size_new != size_old: + Utils.pprint('CYAN', 'Updated POT file.') + launch('intltool-update -r', 'Updating translations', 'CYAN') + else: + Utils.pprint('CYAN', 'POT file is up to date.') + except: + Utils.pprint('RED', 'Failed to generate pot file.') + os.chdir('..') # Simple function to execute a command and print its exit status def launch(command, status, success_color='GREEN'): - ret = 0 - Utils.pprint(success_color, status) - try: - ret = subprocess.call(command.split()) - except OSError, e: - ret = 1 - print str(e), ":", command - except: - ret = 1 + ret = 0 + Utils.pprint(success_color, status) + try: + ret = subprocess.call(command.split()) + except OSError, e: + ret = 1 + print str(e), ":", command + except: + ret = 1 - if ret != 0: - Utils.pprint('RED', status + ' failed') + if ret != 0: + Utils.pprint('RED', status + ' failed') - return ret + return ret line_len = 0 def print_message(msg, result, color = 'GREEN'): - global line_len - if line_len == 0: - line_len = Configure.ConfigurationContext().line_just + global line_len + if line_len == 0: + line_len = Configure.ConfigurationContext().line_just - line_len = max(line_len, len(msg)) - print "%s :" % msg.ljust(line_len), - Utils.pprint(color, result) - Runner.print_log(msg, '\n\n') + line_len = max(line_len, len(msg)) + print "%s :" % msg.ljust(line_len), + Utils.pprint(color, result) + Runner.print_log(msg, '\n\n') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3047] trunk
by eht16＠users.sourceforge.net 06 Oct '08

06 Oct '08

Revision: 3047 http://geany.svn.sourceforge.net/geany/?rev=3047&view=rev Author: eht16 Date: 2008-10-06 18:37:10 +0000 (Mon, 06 Oct 2008) Log Message: ----------- Use g_strerror() instead of strerror(). Remove build system checks for strerror(). Modified Paths: -------------- trunk/ChangeLog trunk/src/tools.c trunk/tagmanager/ctags.c trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-06 18:36:36 UTC (rev 3046) +++ trunk/ChangeLog 2008-10-06 18:37:10 UTC (rev 3047) @@ -16,6 +16,9 @@ * wscript, waf: Update waf to its latest SVN version (nearly 1.5.0). Adjust wscript to latest Waf API changes. + * configure.in, wscript, tagmanager/ctags.c, src/tools.c: + Use g_strerror() instead of strerror(). + Remove build system checks for strerror(). 2008-10-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2008-10-06 18:36:36 UTC (rev 3046) +++ trunk/src/tools.c 2008-10-06 18:37:10 UTC (rev 3047) @@ -275,7 +275,7 @@ if (wrote < 0) { g_warning("%s: %s: %s\n", __func__, "Failed sending data to command", - strerror(errno)); + g_strerror(errno)); break; } remaining -= wrote; Modified: trunk/tagmanager/ctags.c =================================================================== --- trunk/tagmanager/ctags.c 2008-10-06 18:36:36 UTC (rev 3046) +++ trunk/tagmanager/ctags.c 2008-10-06 18:37:10 UTC (rev 3047) @@ -285,11 +285,7 @@ selected (selection, WARNING) ? "Warning: " : ""); vfprintf (errout, format, ap); if (selected (selection, PERROR)) -#ifdef HAVE_STRERROR - fprintf (errout, " : %s", strerror (errno)); -#else - perror (" "); -#endif + fprintf (errout, " : %s", g_strerror (errno)); fputs ("\n", errout); va_end (ap); if (selected (selection, FATAL)) Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-10-06 18:36:36 UTC (rev 3046) +++ trunk/wscript 2008-10-06 18:37:10 UTC (rev 3047) @@ -161,7 +161,6 @@ conf.check(function_name='ftruncate', header_name='unistd.h') conf.check(function_name='gethostname', header_name='unistd.h') conf.check(function_name='mkstemp', header_name='stdlib.h') - conf.check(function_name='strerror', header_name='string.h') conf.check(function_name='strstr', header_name='string.h', mandatory=True) # check for cxx after the header and function checks have been done to ensure they are This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3046] trunk
by eht16＠users.sourceforge.net 06 Oct '08

06 Oct '08

Revision: 3046 http://geany.svn.sourceforge.net/geany/?rev=3046&view=rev Author: eht16 Date: 2008-10-06 18:36:36 +0000 (Mon, 06 Oct 2008) Log Message: ----------- Update waf to its latest SVN version (nearly 1.5.0). Adjust wscript to latest Waf API changes. Modified Paths: -------------- trunk/ChangeLog trunk/waf trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-06 18:36:08 UTC (rev 3045) +++ trunk/ChangeLog 2008-10-06 18:36:36 UTC (rev 3046) @@ -13,6 +13,9 @@ * geany.glade, src/interface.c: Enable interactive search for the keybindings tree view in the prefs dialog. + * wscript, waf: + Update waf to its latest SVN version (nearly 1.5.0). + Adjust wscript to latest Waf API changes. 2008-10-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/waf =================================================================== --- trunk/waf 2008-10-06 18:36:08 UTC (rev 3045) +++ trunk/waf 2008-10-06 18:36:36 UTC (rev 3046) @@ -37,11 +37,11 @@ try:import psyco;psyco.full() except:pass -VERSION="1.4.9" -REVISION="9c6acfdf44c0fc6a0f12572dc64bbde1" +VERSION="1.5.0" +REVISION="5547843b3b641570d7513f093ab6814a" INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' -C1='#*' -C2='#)' +C1='#&' +C2='#%' cwd = os.getcwd() join = os.path.join @@ -127,5 +127,5 @@ Scripting.prepare(t, cwd, VERSION, wafdir) #==> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3045] trunk
by eht16＠users.sourceforge.net 06 Oct '08

06 Oct '08

Revision: 3045 http://geany.svn.sourceforge.net/geany/?rev=3045&view=rev Author: eht16 Date: 2008-10-06 18:36:08 +0000 (Mon, 06 Oct 2008) Log Message: ----------- Enable interactive search for the keybindings tree view in the prefs dialog. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-06 16:13:35 UTC (rev 3044) +++ trunk/ChangeLog 2008-10-06 18:36:08 UTC (rev 3045) @@ -8,6 +8,13 @@ non-visible widget. +2008-10-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * geany.glade, src/interface.c: + Enable interactive search for the keybindings tree view in the + prefs dialog. + + 2008-10-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * data/latex.tags: Added some more keywords for moderncv to tag list. Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-10-06 16:13:35 UTC (rev 3044) +++ trunk/geany.glade 2008-10-06 18:36:08 UTC (rev 3045) @@ -8909,7 +8909,7 @@ <property name="headers_visible">True</property> <property name="rules_hint">True</property> <property name="reorderable">False</property> - <property name="enable_search">False</property> + <property name="enable_search">True</property> <property name="fixed_height_mode">False</property> <property name="hover_selection">False</property> <property name="hover_expand">False</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-10-06 16:13:35 UTC (rev 3044) +++ trunk/src/interface.c 2008-10-06 18:36:08 UTC (rev 3045) @@ -4640,7 +4640,6 @@ gtk_widget_show (treeview7); gtk_container_add (GTK_CONTAINER (scrolledwindow8), treeview7); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview7), TRUE); - gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview7), FALSE); alignment10 = gtk_alignment_new (0.5, 0.5, 0.3, 1); gtk_widget_show (alignment10); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008