[Antiright-devel] antiright Makefile ACE-desktop/ACE ACE-desktop/...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/25 21:33:11

Modified files:
        .              : Makefile 
        ACE-desktop    : ACE Makefile 
        doc            : gtkshell.1 
        gshterm        : main.c 
Removed files:
        ACE-desktop    : dateload.c 

Log message:
        Replaced dateload.  Fixed default font setting on gshterm.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/Makefile?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/dateload.c?cvsroot=antiright&r1=1.7&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/doc/gtkshell.1?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.10&r2=1.11

Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Makefile    9 Feb 2007 03:16:12 -0000       1.9
+++ Makefile    25 Feb 2007 21:33:10 -0000      1.10
@@ -64,7 +64,6 @@
        $(INSTALL_DATA) README $(docdir)/antiright
        $(INSTALL_DATA) doc/TODO $(docdir)/antiright
        $(INSTALL_DATA) doc/INSTALL $(docdir)/antiright
-       $(INSTALL_DATA) doc/HACKING $(docdir)/antiright
        cd gtkshell && $(MAKE) install
        cd gshterm && $(MAKE) install
        cd ACE-desktop && $(MAKE) install

Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ACE-desktop/ACE     24 Feb 2007 08:50:27 -0000      1.11
+++ ACE-desktop/ACE     25 Feb 2007 21:33:10 -0000      1.12
@@ -107,7 +107,7 @@
 }
 Clock()
 {
-    gtkshell -os -on -og -0-0 -aul "dateload | tr '\n' ' '"
+    gtkshell -os -on -og -0-0 -aul "date | tr '\n' ' '"
 }
 Console()
 {
@@ -132,11 +132,9 @@
 }
 taskbar_update()
 {
-       if [ "$(uname)" = "NetBSD" ]; then
-                dateload; swap_load
-        else
-                dateload
-        fi
+# From the NetBSD date man page
+       date '+%m/%d/%y%n%H:%M:%S'
+#              uptime | awk '{$7=$7"\n"; print $0}'
 }
 Sticky_Note()
 {

Index: ACE-desktop/Makefile
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ACE-desktop/Makefile        21 Feb 2007 16:15:49 -0000      1.7
+++ ACE-desktop/Makefile        25 Feb 2007 21:33:10 -0000      1.8
@@ -24,17 +24,17 @@
 
 include ../config.mk
 
-CFLAGS+=$(DEFS) `pkg-config --cflags glib-2.0`
-LIBS+=`pkg-config --libs glib-2.0` ../libantiright/libantiright.a
-all: dateload.o
-       $(CC) -o dateload dateload.o $(LIBS)
+#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
        cat ACE >> ACE.install
        chmod +x ACE.install
        
 clean:
-       rm -f dateload dateload.o ACE.install
+       rm -f ACE.install
 
 
 INSTALL_PROGRAM=$(INSTALL) -c -s
@@ -58,7 +58,6 @@
        $(INSTALL_DATA) *.5 $(man5dir)
        $(INSTALL_DATA) AUTHORS $(docdir)
        $(INSTALL_DATA) icons/*.* $(icondir)
-       $(INSTALL_PROGRAM) dateload $(bindir)
 
 bzball: distclean
        cd .. && tar cjf ACE-desktop-$(VERSION).tar.bz2 ACE-desktop

Index: doc/gtkshell.1
===================================================================
RCS file: /sources/antiright/antiright/doc/gtkshell.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/gtkshell.1      25 Feb 2007 10:48:38 -0000      1.3
+++ doc/gtkshell.1      25 Feb 2007 21:33:11 -0000      1.4
@@ -5,15 +5,15 @@
 .B gtkshell
 .B [-a[[e 
 file
-.B][I 
+.B ][I 
 command icon
-.B][i 
+.B ][i 
 command/label icon
-.B][l 
+.B ][l 
 label
-.B][t
+.B ][t
 command
-.B]Tu[[l
+.B ]Tu[[l
 command
 .B ][p
 command
@@ -30,6 +30,7 @@
 for providing a user interface for shell scripts.  
 .I ACE 
 is such a script, defining the AntiRight environment and its core logic.  
+.\" THESE OPTIONS NEED TO BE UPDATED!
 .SH OPTIONS
 .TP
 .B \-\-help

Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gshterm/main.c      23 Feb 2007 22:52:36 -0000      1.10
+++ gshterm/main.c      25 Feb 2007 21:33:11 -0000      1.11
@@ -40,6 +40,8 @@
   ARPASSERT (term->gsh->window);
 #endif                         /* DEBUG */
 
+       term->font=NULL;
+
   term->script = gshterm_command_script (
                            gshterm_construct_command (term, *argc, *argv));
 

Index: ACE-desktop/dateload.c
===================================================================
RCS file: ACE-desktop/dateload.c
diff -N ACE-desktop/dateload.c
--- ACE-desktop/dateload.c      20 Feb 2007 04:29:42 -0000      1.7
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include "../libantiright/library.h"
-
-int 
-main (int argc, char **argv)
-{
-  char *date;
-  double loadavg[3];
-  time_t time_data;
-
-  UNUSED (argc);
-  UNUSED (argv);
-
-  time (&time_data);
-  date = ctime (&time_data);
-  /* Get rid of newline.  DATE has constant width, according to ctime
-     documentation, so position is uniform.  */
-  date[24] = '\0';
-
-  getloadavg (loadavg, 3);
-
-  g_print ("%s \n%.2f, %.2f, %.2f",
-          date, loadavg[0], loadavg[1], loadavg[2]);
-
-  return (0);
-}