Plugins-Commits January 2009

plugins-commits@lists.geany.org

5 participants
56 discussions

SF.net SVN: geany-plugins:[376] trunk/spellcheck
by eht16＠users.sourceforge.net 14 Jan '09

14 Jan '09

Revision: 376 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=376&view=rev Author: eht16 Date: 2009-01-14 18:49:06 +0000 (Wed, 14 Jan 2009) Log Message: ----------- Update copyright information. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/po/de.po trunk/spellcheck/src/gui.c trunk/spellcheck/src/gui.h trunk/spellcheck/src/scplugin.c trunk/spellcheck/src/scplugin.h trunk/spellcheck/src/speller.c trunk/spellcheck/src/speller.h Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/ChangeLog 2009-01-14 18:49:06 UTC (rev 376) @@ -3,9 +3,11 @@ * src/scplugin.c: Fix deprecated usage of g_win32_get_package_installation_directory(), pass NULL as package name. + * po/de.po, src/gui.c, src/scplugin.c, src/speller.c, src/gui.h, + src/scplugin.h, src/speller.h: + Update copyright information. - 2008-12-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/scplugin.c, src/gui.c, src/speller.c: Modified: trunk/spellcheck/po/de.po =================================================================== --- trunk/spellcheck/po/de.po 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/po/de.po 2009-01-14 18:49:06 UTC (rev 376) @@ -1,7 +1,7 @@ # German translations for spellcheck package. -# Copyright (C) 2008 THE spellcheck's COPYRIGHT HOLDER +# Copyright (C) 2008-2009 THE spellcheck's COPYRIGHT HOLDER # This file is distributed under the same license as the spellcheck package. -# Enrico Tröger <enrico.troeger(a)uvena.de> 2008 +# Enrico Tröger <enrico.troeger(a)uvena.de> 2008-2009 # msgid "" msgstr "" @@ -85,7 +85,7 @@ #: src/gui.c:378 msgid "Spelling Suggestions" -msgstr "Rechtschreib-Vorschläge" +msgstr "Rechtschreibvorschläge" #: src/gui.c:401 msgid "Default" Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/src/gui.c 2009-01-14 18:49:06 UTC (rev 376) @@ -1,8 +1,8 @@ /* * gui.c - this file is part of Spellcheck, a Geany plugin * - * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * 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 Modified: trunk/spellcheck/src/gui.h =================================================================== --- trunk/spellcheck/src/gui.h 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/src/gui.h 2009-01-14 18:49:06 UTC (rev 376) @@ -1,8 +1,8 @@ /* * gui.h - this file is part of Spellcheck, a Geany plugin * - * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * 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 Modified: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/src/scplugin.c 2009-01-14 18:49:06 UTC (rev 376) @@ -1,8 +1,8 @@ /* * scplugin.c - this file is part of Spellcheck, a Geany plugin * - * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * 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 Modified: trunk/spellcheck/src/scplugin.h =================================================================== --- trunk/spellcheck/src/scplugin.h 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/src/scplugin.h 2009-01-14 18:49:06 UTC (rev 376) @@ -1,8 +1,8 @@ /* * scplugin.h - this file is part of Spellcheck, a Geany plugin * - * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * 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 Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/src/speller.c 2009-01-14 18:49:06 UTC (rev 376) @@ -1,8 +1,8 @@ /* * speller.c - this file is part of Spellcheck, a Geany plugin * - * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * 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 Modified: trunk/spellcheck/src/speller.h =================================================================== --- trunk/spellcheck/src/speller.h 2009-01-14 18:44:52 UTC (rev 375) +++ trunk/spellcheck/src/speller.h 2009-01-14 18:49:06 UTC (rev 376) @@ -1,8 +1,8 @@ /* * speller.h - this file is part of Spellcheck, a Geany plugin * - * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2008-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[375] trunk/spellcheck
by eht16＠users.sourceforge.net 14 Jan '09

14 Jan '09

Revision: 375 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=375&view=rev Author: eht16 Date: 2009-01-14 18:44:52 +0000 (Wed, 14 Jan 2009) Log Message: ----------- Fix deprecated usage of g_win32_get_package_installation_directory(), pass NULL as package name. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/scplugin.c Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2009-01-09 16:29:01 UTC (rev 374) +++ trunk/spellcheck/ChangeLog 2009-01-14 18:44:52 UTC (rev 375) @@ -1,3 +1,11 @@ +2009-01-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/scplugin.c: + Fix deprecated usage of g_win32_get_package_installation_directory(), + pass NULL as package name. + + + 2008-12-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/scplugin.c, src/gui.c, src/speller.c: Modified: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c 2009-01-09 16:29:01 UTC (rev 374) +++ trunk/spellcheck/src/scplugin.c 2009-01-14 18:44:52 UTC (rev 375) @@ -114,7 +114,7 @@ #endif #ifdef G_OS_WIN32 - gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); + gchar *install_dir = g_win32_get_package_installation_directory(NULL, NULL); /* e.g. C:\Program Files\geany\lib\locale */ locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); g_free(install_dir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[374] trunk/wscript
by eht16＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 374 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=374&view=rev Author: eht16 Date: 2009-01-09 16:29:01 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Fix build (oops). Modified Paths: -------------- trunk/wscript Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-01-08 12:35:31 UTC (rev 373) +++ trunk/wscript 2009-01-09 16:29:01 UTC (rev 374) @@ -160,7 +160,8 @@ conf.check_tool('compiler_cc intltool') - conf.check_cfg(package='gtk+-2.0', atleast_version='2.6.0', uselib_store='GTK', mandatory=True, args='--cflags --libs', uselib_store='GTK') + conf.check_cfg(package='gtk+-2.0', atleast_version='2.6.0', uselib_store='GTK', + mandatory=True, args='--cflags --libs') conf.check_cfg(package='geany', atleast_version='0.15', mandatory=True, args='--cflags --libs') gtk_version = conf.check_cfg(modversion='gtk+-2.0') or 'Unknown' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[373] trunk/geanylipsum/src/geanylipsum.c
by frlan＠users.sourceforge.net 08 Jan '09

08 Jan '09

Revision: 373 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=373&view=rev Author: frlan Date: 2009-01-08 12:35:31 +0000 (Thu, 08 Jan 2009) Log Message: ----------- GeanyLipsum: Grab length from dialog Modified Paths: -------------- trunk/geanylipsum/src/geanylipsum.c Modified: trunk/geanylipsum/src/geanylipsum.c =================================================================== --- trunk/geanylipsum/src/geanylipsum.c 2009-01-08 12:35:05 UTC (rev 372) +++ trunk/geanylipsum/src/geanylipsum.c 2009-01-08 12:35:31 UTC (rev 373) @@ -107,6 +107,7 @@ GeanyDocument *doc = NULL; GeanyFiletype *ft = NULL; gboolean toggled = FALSE; + int length = 0; tooltip = gtk_tooltips_new(); @@ -182,6 +183,10 @@ type = PLAIN_LIPSUM; } + /* Checking for length of string that should be inserted */ + length = gtk_spin_button_get_value_as_int( + GTK_SPIN_BUTTON(spin)); + gtk_widget_destroy(dialog); insert_string(LOREMIPSUM); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[372] trunk/geanylipsum/src/geanylipsum.c
by frlan＠users.sourceforge.net 08 Jan '09

08 Jan '09

Revision: 372 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=372&view=rev Author: frlan Date: 2009-01-08 12:35:05 +0000 (Thu, 08 Jan 2009) Log Message: ----------- GeanyLipsum: Added a spin button to enter the wished length of Lipsum text. Without any function at the moment Modified Paths: -------------- trunk/geanylipsum/src/geanylipsum.c Modified: trunk/geanylipsum/src/geanylipsum.c =================================================================== --- trunk/geanylipsum/src/geanylipsum.c 2009-01-06 19:08:11 UTC (rev 371) +++ trunk/geanylipsum/src/geanylipsum.c 2009-01-08 12:35:05 UTC (rev 372) @@ -100,6 +100,9 @@ GtkWidget *radio1 = NULL; GtkWidget *radio2 = NULL; GtkWidget *radio3 = NULL; + GtkWidget *label = NULL; + GtkWidget *hbox = NULL; + GtkWidget *spin = NULL; GtkTooltips *tooltip = NULL; GeanyDocument *doc = NULL; GeanyFiletype *ft = NULL; @@ -151,6 +154,16 @@ } gtk_container_add(GTK_CONTAINER(vbox), radio3); + label = gtk_label_new(_("characters")); + spin = gtk_spin_button_new_with_range(1, 1800, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 1500); + + hbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(hbox), spin, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); + gtk_widget_show_all(vbox); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[371] trunk/geanygdb/src/gdb-ui-main.c
by eht16＠users.sourceforge.net 06 Jan '09

06 Jan '09

Revision: 371 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=371&view=rev Author: eht16 Date: 2009-01-06 19:08:11 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Make the debug window in the sidebar scrollable to avoid display glitches in case the window allocates too much space (patch by Cameron Hart, thanks). Modified Paths: -------------- trunk/geanygdb/src/gdb-ui-main.c Modified: trunk/geanygdb/src/gdb-ui-main.c =================================================================== --- trunk/geanygdb/src/gdb-ui-main.c 2009-01-05 20:29:51 UTC (rev 370) +++ trunk/geanygdb/src/gdb-ui-main.c 2009-01-06 19:08:11 UTC (rev 371) @@ -21,7 +21,7 @@ GdbUiSetup gdbui_setup; -static GtkWidget *vbox; +static GtkWidget *main_vbox; static GtkWidget *action_area; static GtkWidget *stat_lab; @@ -72,7 +72,7 @@ void gdbui_enable(gboolean enabled) { - gtk_widget_set_sensitive(vbox, enabled); + gtk_widget_set_sensitive(main_vbox, enabled); } @@ -771,7 +771,7 @@ #define split1 split(action_area) -#define split2 split(vbox) +#define split2 split(main_vbox) //#define splitw gtk_widget_new(GTK_TYPE_BIN,NULL) @@ -791,18 +791,26 @@ gdbui_create_widgets(GtkWidget * parent) { GtkWidget *w = NULL; - vbox = gtk_vbox_new(FALSE, 0); + GtkWidget *scrollable; + + scrollable = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollable), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_show(scrollable); + if (parent) { - gtk_container_add(GTK_CONTAINER(parent), vbox); + gtk_container_add(GTK_CONTAINER(parent), scrollable); } + main_vbox = gtk_vbox_new(FALSE, 0); + + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollable), main_vbox); + split2 stat_lab = gtk_label_new(_("no program")); - gtk_box_pack_start(GTK_BOX(vbox), stat_lab, FALSE, FALSE, 4); - gtk_widget_show(vbox); + gtk_box_pack_start(GTK_BOX(main_vbox), stat_lab, FALSE, FALSE, 4); action_area = gtk_vbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), action_area, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(main_vbox), action_area, FALSE, FALSE, 0); gtk_widget_show(action_area); load_btn = make_btn(_("_Load"), load_click, GTK_STOCK_OPEN, _("Load target program into debugger.")); @@ -898,7 +906,7 @@ split1; - w = vbox; + w = main_vbox; term_chk = gtk_check_button_new_with_label(_("Run in terminal")); gtk_box_pack_start(GTK_BOX(w), term_chk, FALSE, FALSE, 0); gdbui_set_tip(term_chk, _("Execute target program inside a terminal window.")); @@ -916,13 +924,13 @@ con_lab = gtk_label_new(_("Console:")); gdbui_set_tip(con_lab, _("Send a GDB command directly to the debugger.")); gtk_misc_set_alignment(GTK_MISC(con_lab), 0.0f, 0.0f); - gtk_box_pack_start(GTK_BOX(vbox), con_lab, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(main_vbox), con_lab, FALSE, FALSE, 0); con_cmd = gtk_entry_new(); g_signal_connect(G_OBJECT(con_cmd), "activate", G_CALLBACK(entry_activate), NULL); - gtk_box_pack_start(GTK_BOX(vbox), con_cmd, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(main_vbox), con_cmd, FALSE, FALSE, 0); - gtk_widget_show_all(vbox); + gtk_widget_show_all(main_vbox); gdbio_setup.error_func = err_func; gdbio_setup.signal_func = signal_func; @@ -932,7 +940,7 @@ last_used = load_btn; status_func(curr_status); - return vbox; + return main_vbox; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[370] trunk/geany-mini-script/src/Makefile.am
by prublot＠users.sourceforge.net 05 Jan '09

05 Jan '09

Revision: 370 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=370&view=rev Author: prublot Date: 2009-01-05 20:29:51 +0000 (Mon, 05 Jan 2009) Log Message: ----------- add CFLAGS : -Wshadow Modified Paths: -------------- trunk/geany-mini-script/src/Makefile.am Modified: trunk/geany-mini-script/src/Makefile.am =================================================================== --- trunk/geany-mini-script/src/Makefile.am 2009-01-05 20:26:37 UTC (rev 369) +++ trunk/geany-mini-script/src/Makefile.am 2009-01-05 20:29:51 UTC (rev 370) @@ -4,4 +4,4 @@ gms_la_LDFLAGS = -module -avoid-version gms_la_LIBADD = @GEANY_LIBS@ -AM_CPPFLAGS = @GEANY_CFLAGS@ -DLOCALEDIR=\""$(localedir)"\" +AM_CPPFLAGS = -Wshadow @GEANY_CFLAGS@ -DLOCALEDIR=\""$(localedir)"\" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[369] trunk/geany-mini-script/src/gms_gui.c
by prublot＠users.sourceforge.net 05 Jan '09

05 Jan '09

Revision: 369 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=369&view=rev Author: prublot Date: 2009-01-05 20:26:37 +0000 (Mon, 05 Jan 2009) Log Message: ----------- fix two compiler warnings because 'this' was declared twice in two functions. Modified Paths: -------------- trunk/geany-mini-script/src/gms_gui.c Modified: trunk/geany-mini-script/src/gms_gui.c =================================================================== --- trunk/geany-mini-script/src/gms_gui.c 2009-01-05 16:31:21 UTC (rev 368) +++ trunk/geany-mini-script/src/gms_gui.c 2009-01-05 20:26:37 UTC (rev 369) @@ -251,7 +251,6 @@ if (gtk_dialog_run (GTK_DIALOG (p_dialog)) == GTK_RESPONSE_ACCEPT) { - gms_private_t *this = GMS_PRIVATE(data) ; gchar *filename = NULL; filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (p_dialog)); @@ -307,7 +306,6 @@ if (gtk_dialog_run (GTK_DIALOG (p_dialog)) == GTK_RESPONSE_ACCEPT) { - gms_private_t *this = GMS_PRIVATE(data) ; gchar *filename = NULL; filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (p_dialog)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[368] trunk/geanygdb/src/gdb-ui-main.c
by eht16＠users.sourceforge.net 05 Jan '09

05 Jan '09

Revision: 368 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=368&view=rev Author: eht16 Date: 2009-01-05 16:31:21 +0000 (Mon, 05 Jan 2009) Log Message: ----------- Support opening big endian elf files (patch by Cameron Hart, thanks). Modified Paths: -------------- trunk/geanygdb/src/gdb-ui-main.c Modified: trunk/geanygdb/src/gdb-ui-main.c =================================================================== --- trunk/geanygdb/src/gdb-ui-main.c 2009-01-04 23:28:39 UTC (rev 367) +++ trunk/geanygdb/src/gdb-ui-main.c 2009-01-05 16:31:21 UTC (rev 368) @@ -9,6 +9,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <elf.h> #include <gtk/gtk.h> #include "gdb-io.h" @@ -392,56 +393,84 @@ -// Crude check for "ELF 32-bit LSB [reloc|exec|shared|core] Intel 80386, version 1" +/* Check for ELF type */ typedef enum -{ ELF_RELOC, ELF_EXEC, ELF_SHARED, ELF_CORE, ELF_NOT_ELF } ElfType; +{ ELF_RELOC, ELF_EXEC, ELF_SHARED, ELF_CORE, ELF_UNKNOWN } ElfType; static ElfType -get_elf_type(const char *filename) +get_elf_type(const char * filename) { - char buf[32]; - ElfType rv = ELF_NOT_ELF; - int n; - FILE *fh = fopen(filename, "r"); - if (fh) + /* There are seperate 32 bit and 64 bit elf headers on linux. The + * bits we are interested in should be in the same location for + * both. */ + union { - memset(buf, 0, sizeof(buf)); - n = fread(buf, 1, sizeof(buf), fh); - fclose(fh); - if ((n == sizeof(buf)) && - (memcmp(buf, "\177ELF", 4) == 0) && - (memcmp(buf + 5, "\1\1\0\0\0\0\0\0\0\0\0", 11) == 0) - /* && (memcmp(buf+17,"\0\3\0\1",4)==0) *//* <= Intel 80386, version 1 */ - ) - { - switch (buf[4]) - { - case '\1': - break; /* 32-bit */ - case '\2': - break; /* 64-bit */ - default: - return ELF_NOT_ELF; - } - switch (buf[16]) - { - case '\1': - return ELF_RELOC; - case '\2': - return ELF_EXEC; - case '\3': - return ELF_SHARED; - case '\4': - return ELF_CORE; - } - } + Elf32_Ehdr ehdr32; + Elf64_Ehdr ehdr64; + } e_header; + + int read_ehdr; + int is_32bit_elf; + int is_little_endian; + const char* e_type_buf; + unsigned int e_type; + FILE* file = fopen(filename, "r"); + + if (!file) + return ELF_UNKNOWN; + + read_ehdr = fread(&e_header, sizeof(e_header), 1, file); + fclose(file); + + if (read_ehdr != 1) + return ELF_UNKNOWN; + + /* Determine how to read the rest of the header. */ + switch (e_header.ehdr32.e_ident[EI_DATA]) + { + default: /* fall through */ + case ELFDATANONE: /* fall through */ + case ELFDATA2LSB: + is_little_endian = 1; + break; + case ELFDATA2MSB: + is_little_endian = 0; + break; } - return rv; + + /* For now we only support 32 bit and 64 bit ELF files. */ + is_32bit_elf = (e_header.ehdr32.e_ident[EI_CLASS] != ELFCLASS64); + + /* The type field offset and size should be the same between 32 and 64 bit platforms! */ + if (!is_32bit_elf && + ((char*) &e_header.ehdr32.e_type != (char*) &e_header.ehdr64.e_type || + (char*) &e_header.ehdr32.e_machine != (char*) &e_header.ehdr64.e_machine)) + return ELF_UNKNOWN; + + /* get the type taking endian into account */ + e_type_buf = (char*) &e_header.ehdr32.e_type; + if (is_little_endian) + e_type = ((unsigned int) (e_type_buf[0])) | (((unsigned int) (e_type_buf[1])) << 8); + else + e_type = ((unsigned int) (e_type_buf[1])) | (((unsigned int) (e_type_buf[0])) << 8); + + switch (e_type) + { + case ET_REL: + return ELF_RELOC; + case ET_EXEC: + return ELF_EXEC; + case ET_DYN: + return ELF_SHARED; + case ET_CORE: + return ELF_CORE; + default: + return ELF_UNKNOWN; + } } - static void load_click(GtkWidget * btn, gpointer user_data) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[367] trunk/wscript
by eht16＠users.sourceforge.net 05 Jan '09

05 Jan '09

Revision: 367 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=367&view=rev Author: eht16 Date: 2009-01-04 23:28:39 +0000 (Sun, 04 Jan 2009) Log Message: ----------- Add build support for 'geany-mini-script'. Minor simplifications for package checking. Modified Paths: -------------- trunk/wscript Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-01-04 21:40:11 UTC (rev 366) +++ trunk/wscript 2009-01-04 23:28:39 UTC (rev 367) @@ -109,6 +109,10 @@ [ 'geanylipsum/src/geanylipsum.c' ], # source files [ 'geanylipsum', 'geanylipsum/src' ], # include dirs '0.1dev'), + Plugin('geany-mini-script', + [ 'geany-mini-script/src/gms.c', 'geany-mini-script/src/gms_gui.c' ], # source files + [ 'geany-mini-script', 'geany-mini-script/src' ], # include dirs + '0.2') ] @@ -156,10 +160,8 @@ conf.check_tool('compiler_cc intltool') - conf.check_cfg(package='gtk+-2.0', atleast_version='2.6.0', uselib_store='GTK', mandatory=True) - conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK') - conf.check_cfg(package='geany', atleast_version='0.15', mandatory=True) - conf.check_cfg(package='geany', args='--cflags --libs') + conf.check_cfg(package='gtk+-2.0', atleast_version='2.6.0', uselib_store='GTK', mandatory=True, args='--cflags --libs', uselib_store='GTK') + conf.check_cfg(package='geany', atleast_version='0.15', mandatory=True, args='--cflags --libs') gtk_version = conf.check_cfg(modversion='gtk+-2.0') or 'Unknown' geany_version = conf.check_cfg(modversion='geany') or 'Unknown' @@ -184,12 +186,10 @@ if p.name in enabled_plugins: for l in p.libs: uselib = Utils.quote_define_name(l[0]) - conf.check_cfg(package=l[0], uselib_store=uselib, atleast_version=l[1]) + conf.check_cfg(package=l[0], uselib_store=uselib, atleast_version=l[1], args='--cflags --libs') if not conf.env['HAVE_%s' % uselib] == 1: if l[2]: enabled_plugins.remove(p.name) - else: - conf.check_cfg(package=l[0], args='--cflags --libs', uselib_store=uselib) conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib') # get and define Geany's libdir for use as plugin binary installation dir @@ -271,11 +271,14 @@ if p.name == 'geanydebug': build_debug(bld, p, libs) # build additional binary for the debug plugin + if p.name == 'geany-mini-script': tgt = 'gms' + else: tgt = p.name + obj = bld.new_task_gen('cc', 'shlib') obj.source = p.sources obj.includes = p.includes obj.env['shlib_PATTERN'] = '%s.so' - obj.target = p.name + obj.target = tgt obj.uselib = libs obj.install_path = '${GEANY_LIBDIR}/geany' # if we are compiling more than one plugin, allow some of to fail @@ -345,11 +348,12 @@ size_old = os.stat(p.name + '.pot').st_size except: size_old = 0 - subprocess.call(['intltool-update', '--pot']) + subprocess.call(['intltool-update', '--pot', 'g', p.name]) size_new = os.stat(p.name + '.pot').st_size if size_new != size_old: Utils.pprint('CYAN', 'Updated POT file for %s.' % p.name) - launch('intltool-update -r', 'Updating translations for %s' % p.name, 'CYAN') + launch('intltool-update -r -g %s' % p.name, + 'Updating translations for %s' % p.name, 'CYAN') else: Utils.pprint('CYAN', 'POT file is up to date for %s.' % p.name) except: 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

Plugins-Commits January 2009