[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright Makefile configure ACE-desktop/Makefi...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright Makefile configure ACE-desktop/Makefi... |
|
Date: |
Wed, 07 Mar 2007 06:44:47 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/03/07 06:44:47
Modified files:
. : Makefile configure
ACE-desktop : Makefile
gshterm : Makefile command_line.c main.c
gtkshell : Makefile add_options.c arguments.c
dialog_options.c dragdrop.c file_dialog.h
font.c font.h gtkshell.h text.c
Log message:
Pull up some changes from antiright-3.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/Makefile?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/Makefile?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/font.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/font.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.16&r2=1.17
Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Makefile 4 Mar 2007 03:20:14 -0000 1.11
+++ Makefile 7 Mar 2007 06:44:47 -0000 1.12
@@ -1,7 +1,7 @@
###############################################################################
#
# AntiRight
-# (c) 2004-2006 Jeffrey Bedard
+# (c) 2004-2007 Jeffrey Bedard
# address@hidden
#
# This file is part of AntiRight.
@@ -18,7 +18,8 @@
#
# You should have received a copy of the GNU General Public License
# along with AntiRight; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
#
###############################################################################
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- configure 5 Mar 2007 15:38:59 -0000 1.81
+++ configure 7 Mar 2007 06:44:47 -0000 1.82
@@ -25,7 +25,7 @@
#
###############################################################################
-VERSION=2.99.9
+VERSION=3.99.0
USE_DISTCC=YES
USE_CCACHE=YES
@@ -47,6 +47,13 @@
fi
done
+# For development branch
+CFLAGS="$CFLAGS -Wall -W -Werror -W"
+CFLAGS="$CFLAGS -Wwrite-strings "
+CFLAGS="$CFLAGS -Wsign-compare -Wunreachable-code"
+CFLAGS="$CFLAGS -Wmissing-noreturn -Wmissing-declarations"
+
+
DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
Index: ACE-desktop/Makefile
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ACE-desktop/Makefile 5 Mar 2007 15:38:59 -0000 1.11
+++ ACE-desktop/Makefile 7 Mar 2007 06:44:47 -0000 1.12
@@ -18,15 +18,13 @@
#
# You should have received a copy of the GNU General Public License
# along with AntiRight; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
+# Foundation, Inc., 51 Franklin Street,
+# Fifth Floor, Boston, MA 02110-1301 USA
#
###############################################################################
include ../config.mk
-#CFLAGS+=$(DEFS) `pkg-config --cflags glib-2.0`
-#LIBS+=`pkg-config --libs glib-2.0` ../libantiright/libantiright.a
-
all:
echo '#!/bin/sh' > ACE.install
grep ^PREFIX ../config.mk >> ACE.install
@@ -59,6 +57,5 @@
$(INSTALL_SCRIPT) ACE.install $(bindir)/ACE
$(INSTALL_DATA) ACE.1 $(man1dir)
$(INSTALL_DATA) system.antiright.5 $(man5dir)
- $(INSTALL_DATA) AUTHORS $(docdir)/ACE-desktop
$(INSTALL_DATA) icons/*.* $(icondir)
Index: gshterm/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gshterm/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gshterm/Makefile 16 Feb 2007 22:18:01 -0000 1.6
+++ gshterm/Makefile 7 Mar 2007 06:44:47 -0000 1.7
@@ -1,3 +1,28 @@
+###############################################################################
+#
+# AntiRight
+# (c) 2004-2007 Jeffrey Bedard
+# address@hidden
+#
+# This file is part of AntiRight.
+#
+# AntiRight is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# AntiRight is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with AntiRight; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+###############################################################################
+
include ../config.mk
#CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
@@ -8,11 +33,17 @@
LDFLAGS+=`pkg-config --libs vte`
objects=main.o gshterm.o command_line.o script.o
+sources=main.c gshterm.c command_line.c script.c
all: $(objects)
$(CC) -o gshterm $(objects) $(LDFLAGS)
+lint:
+ splint `pkg-config --cflags-only-I gtk+-2.0`\
+ `pkg-config --cflags-only-I vte` $(sources) > lint.out
+
clean:
rm -f gshterm *.o
+
install:
install gshterm $(PREFIX)/bin
Index: gshterm/command_line.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gshterm/command_line.c 28 Feb 2007 03:53:51 -0000 1.7
+++ gshterm/command_line.c 7 Mar 2007 06:44:47 -0000 1.8
@@ -27,7 +27,7 @@
{
gchar *command;
- command = ""; /* Initialize to empty for the first
+ command = (gchar*)""; /* Initialize to empty for the first
* concatenation. */
ARIFNB(gshterm_construct_command_from_args(
@@ -45,7 +45,7 @@
return (command);
}
-gboolean
+static gboolean
gshterm_handle_command_line_option(
struct GSHTerm * term, gchar option, gchar *arg)
{
Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gshterm/main.c 28 Feb 2007 03:53:51 -0000 1.13
+++ gshterm/main.c 7 Mar 2007 06:44:47 -0000 1.14
@@ -17,14 +17,15 @@
You should have received a copy of the GNU General Public License
along with AntiRight; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301 USA
*/
#include "gshterm.h"
#include <unistd.h>
-struct GSHTerm *
+static struct GSHTerm *
gshterm_init_and_script(int *argc, char ***argv)
{
struct GSHTerm *term;
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/Makefile 2 Mar 2007 03:56:07 -0000 1.9
+++ gtkshell/Makefile 7 Mar 2007 06:44:47 -0000 1.10
@@ -1,3 +1,28 @@
+###############################################################################
+#
+# AntiRight
+# (c) 2004-2007 Jeffrey Bedard
+# address@hidden
+#
+# This file is part of AntiRight.
+#
+# AntiRight is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# AntiRight is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with AntiRight; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+###############################################################################
+
include ../config.mk
#CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
@@ -28,6 +53,7 @@
clean:
rm -f gtkshell *.o libgtkshell.a
+
install:
install gtkshell $(PREFIX)/bin
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/add_options.c 5 Mar 2007 01:12:46 -0000 1.16
+++ gtkshell/add_options.c 7 Mar 2007 06:44:47 -0000 1.17
@@ -70,9 +70,11 @@
gsh_count(argc, counter);
gsh_add_label(gsh, argv[(*counter)]);
break;
+
case 'P':
add_piped_generic(gsh, &add_piped_text);
break;
+
case 'p':
add_piped_generic(gsh, &add_piped_label);
break;
@@ -80,6 +82,7 @@
case 'r': /* Force creation of a new row. */
gsh_new_row(gsh);
break;
+
case 't':
if (argc != *counter)
gsh_count(argc, counter);
Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/arguments.c 5 Mar 2007 16:28:14 -0000 1.12
+++ gtkshell/arguments.c 7 Mar 2007 06:44:47 -0000 1.13
@@ -43,22 +43,12 @@
gsh_command_button(gsh, string);
g_strfreev(pair);
-
- //gsh->rows.row--;
-}
-static void
-activate_cb(GtkWidget * widget, gpointer data)
-{
- const gchar * command;
- command=(const gchar *)data;
- ARBUG((gchar *)command);
- antiright_system((char *)command);
}
+
static void
menuitem_parse(struct GSH * gsh, gchar * string)
{
gchar **pair;
- GtkWidget * item;
gchar * command;
pair=g_strsplit(string, ",", 2);
@@ -95,7 +85,6 @@
if(ARPBOOL(tokens[1]))
{
GtkWidget * oldrow;
- GtkWidget * button;
oldrow=gsh->rows.v;
Index: gtkshell/dialog_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/dialog_options.c 28 Feb 2007 03:53:51 -0000 1.10
+++ gtkshell/dialog_options.c 7 Mar 2007 06:44:47 -0000 1.11
@@ -23,6 +23,27 @@
#include "gtkshell.h"
static void
+gsh_message_dialog(struct GSH * gsh,
+ GtkMessageType type,
+ char *text) __attribute__((noreturn));
+
+static void
+gsh_setup_message_dialog(struct GSH * gsh,
+ int argc, char **argv,
+ unsigned int *counter,
+ GtkMessageType type) __attribute__((noreturn));
+
+static void
+gsh_font_dialog() __attribute__((noreturn));
+
+static void
+gsh_color_dialog() __attribute__((noreturn));
+
+static void
+gsh_about_dialog() __attribute__((noreturn));
+
+
+static void
gsh_message_dialog(struct GSH * gsh, GtkMessageType type, char *text)
{
GtkWidget *dialog;
Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/dragdrop.c 2 Mar 2007 19:12:00 -0000 1.8
+++ gtkshell/dragdrop.c 7 Mar 2007 06:44:47 -0000 1.9
@@ -32,7 +32,7 @@
static GtkTargetEntry target_list[] =
{
- {"text/plain", 0, TARGET_STRING}
+ {(gchar *)"text/plain", 0, TARGET_STRING}
};
static guint n_targets = G_N_ELEMENTS(target_list);
Index: gtkshell/file_dialog.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/file_dialog.h 28 Feb 2007 03:53:51 -0000 1.4
+++ gtkshell/file_dialog.h 7 Mar 2007 06:44:47 -0000 1.5
@@ -22,15 +22,21 @@
#ifndef GSH_FILE_DIALOG
#define GSH_FILE_DIALOG
+
void
- gsh_file_dialog(struct GSH * gsh, GtkFileChooserAction action);
+gsh_file_dialog(struct GSH * gsh,
+ GtkFileChooserAction action) __attribute__((noreturn));
+
void
- gsh_file_open_dialog(struct GSH * gsh);
+gsh_file_open_dialog(struct GSH * gsh) __attribute__((noreturn));
+
void
- gsh_file_save_dialog(struct GSH * gsh);
+gsh_file_save_dialog(struct GSH * gsh) __attribute__((noreturn));
+
void
- gsh_folder_open_dialog(struct GSH * gsh);
+gsh_folder_open_dialog(struct GSH * gsh) __attribute__((noreturn));
+
void
- gsh_folder_create_dialog(struct GSH * gsh);
+gsh_folder_create_dialog(struct GSH * gsh) __attribute__((noreturn));
-#endif
+#endif /* !GSH_FILE_DIALOG */
Index: gtkshell/font.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/font.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/font.c 28 Feb 2007 03:53:51 -0000 1.3
+++ gtkshell/font.c 7 Mar 2007 06:44:47 -0000 1.4
@@ -23,7 +23,7 @@
#include "gtkshell.h"
void
-gsh_widget_set_font(GtkWidget *widget, gchar *font)
+gsh_widget_set_font(GtkWidget *widget, const gchar *font)
{
PangoFontDescription *font_desc;
Index: gtkshell/font.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/font.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/font.h 28 Feb 2007 03:53:51 -0000 1.2
+++ gtkshell/font.h 7 Mar 2007 06:44:47 -0000 1.3
@@ -24,9 +24,9 @@
#define GTKSHELL_FONT_H
void
- gsh_widget_set_font(GtkWidget *widget, gchar *font);
+gsh_widget_set_font(GtkWidget *widget, const gchar *font);
void
- gsh_widget_set_font_mono(GtkWidget *widget);
+gsh_widget_set_font_mono(GtkWidget *widget);
#endif /* GTKSHELL_FONT_H */
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gtkshell/gtkshell.h 4 Mar 2007 23:23:20 -0000 1.22
+++ gtkshell/gtkshell.h 7 Mar 2007 06:44:47 -0000 1.23
@@ -93,4 +93,10 @@
GtkWidget *
gsh_create_main_window();
+void
+gsh_GSH(struct GSH * gsh);
+
+struct GSH *
+gsh_new_GSH();
+
#endif
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/text.c 5 Mar 2007 01:05:42 -0000 1.16
+++ gtkshell/text.c 7 Mar 2007 06:44:47 -0000 1.17
@@ -42,7 +42,7 @@
cb->data = command; /* Static storage, will not
* pass out of scope. */
else
- cb->data = "echo"; /* Literal */
+ cb->data = (gpointer)"echo"; /* Literal */
/* Create widget. */
entry = gtk_entry_new();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright Makefile configure ACE-desktop/Makefi...,
Jeffrey Bedard <=