lwatch-cvs Mailing List for Log Watcher (Page 2)
Brought to you by:
arturcz
Menu
▾
▴
lwatch-cvs — lwatch CVS commit log
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(9) |
Jul
(22) |
Aug
(11) |
Sep
(5) |
Oct
|
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(29) |
Mar
(85) |
Apr
(45) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
(30) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(55) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2005 |
Jan
|
Feb
(10) |
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(6) |
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2010 |
Jan
|
Feb
(15) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Artur R. C. <ar...@us...> - 2009-03-23 21:15:38
|
Update of /cvsroot/lwatch/files/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18648/src Modified Files: defaults.h lwatch.conf settings.c settings.h strpcre.c yparse.l Log Message: default value for exit/continue on matching rule is configurable now Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** settings.c 21 Mar 2009 10:54:34 -0000 1.35 --- settings.c 23 Mar 2009 21:15:34 -0000 1.36 *************** *** 207,210 **** --- 207,211 ---- lw_conf.def_serv_color=_N_BLUE; lw_conf.def_mesg_color=_N_LIGHTGRAY; + lw_conf.def_action_rule=DEF_ACTION_RULE; if(omit_config) return; *************** *** 235,238 **** --- 236,240 ---- lw_conf.def_serv_color, lw_conf.def_mesg_color); + /* FIXME dodaÄ output dla koÅczenia */ #endif *************** *** 260,264 **** paction->highlight_color, paction->ignore?"yes":"no", ! paction->exit?"yes":"no", paction->match_service?"yes":"no", paction->match_host?"yes":"no"); --- 262,266 ---- paction->highlight_color, paction->ignore?"yes":"no", ! (paction->action==RULE_DEFAULT)?(action_exit(*paction)?"yes (default)":"no (default)"):(action_exit(*paction)?"yes":"no"), paction->match_service?"yes":"no", paction->match_host?"yes":"no"); Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** yparse.l 21 Mar 2009 10:54:34 -0000 1.30 --- yparse.l 23 Mar 2009 21:15:34 -0000 1.31 *************** *** 72,78 **** %option noyywrap nounput ! M_KEYWORD input_file|output_file|show_unparsed|cfg_ver|use_syslog|log_level R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight ! R_KEYWORD match_service|match_host|ignore|exit COLOR black|red|green|brown|blue|magenta|cyan|lightgray|darkgray|brightred|brightgreen|yellow|brightblue|purple|brightcyan|white STRING ".*" --- 72,79 ---- %option noyywrap nounput ! M_KEYWORD input_file|output_file|show_unparsed|cfg_ver|use_syslog|log_level|rule_action R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight ! R_KEYWORD match_service|match_host|ignore|continue|exit ! RA_KEYWORD continue|exit COLOR black|red|green|brown|blue|magenta|cyan|lightgray|darkgray|brightred|brightgreen|yellow|brightblue|purple|brightcyan|white STRING ".*" *************** *** 84,88 **** INTVAL [0-9]* ! %x COLOR REGEXP ERROR SECOND ACTION MULTI TEXT BOOLEAN INTEGER %% --- 85,89 ---- INTVAL [0-9]* ! %x COLOR REGEXP ERROR SECOND ACTION MULTI TEXT BOOLEAN INTEGER RULEACTION %% *************** *** 111,114 **** --- 112,123 ---- #endif } + <INITIAL>rule_action= { + PUSH(RULEACTION); + yyip=&lw_conf.def_action_rule; + #ifdef DEBUG + strcpy(mymsg,"rule_action"); + #endif + + } <INITIAL>output_file= { PUSH(TEXT); *************** *** 240,243 **** --- 249,263 ---- POP; } + <RULEACTION>{RA_KEYWORD} { + if(!strcasecmp(yytext,"exit")) { + *yyip=RULE_EXIT; + } else { + *yyip=RULE_CONTINUE; + } + #ifdef DEBUG + fprintf(stderr,"Set %s to %s (%i)\n",mymsg,yytext,*yyip); + #endif + POP; + } <INTEGER>{INTVAL} { *yyip=0; *************** *** 271,275 **** <MULTI,ACTION>ignore { action.ignore=1; ! action.exit=1; #ifdef DEBUG fprintf(stderr,"Ignore RE\n"); --- 291,295 ---- <MULTI,ACTION>ignore { action.ignore=1; ! action.action=RULE_EXIT; #ifdef DEBUG fprintf(stderr,"Ignore RE\n"); *************** *** 277,285 **** } <MULTI,ACTION>exit { ! action.exit=1; #ifdef DEBUG fprintf(stderr,"Exit on action\n"); #endif } <INITIAL>\/ { BEGIN(SECOND); --- 297,317 ---- } <MULTI,ACTION>exit { ! action.action=RULE_EXIT; #ifdef DEBUG fprintf(stderr,"Exit on action\n"); #endif } + <MULTI,ACTION>continue { + if(action.ignore==1) { + #ifdef DEBUG + fprintf(stderr,"This rule is for ignoring the pattern. Using continue makes no sense"); + #endif + } else { + action.action=RULE_CONTINUE; + #ifdef DEBUG + fprintf(stderr,"Continue with the next action\n"); + #endif + } + } <INITIAL>\/ { BEGIN(SECOND); Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** settings.h 21 Mar 2009 10:54:34 -0000 1.15 --- settings.h 23 Mar 2009 21:15:34 -0000 1.16 *************** *** 33,36 **** --- 33,38 ---- #include <pcre.h> + #include "defaults.h" + struct s_conf { int def_date_color,def_host_color,def_serv_color,def_mesg_color; *************** *** 41,44 **** --- 43,47 ---- int use_syslog; int log_level; + int def_action_rule; int cfg_ver; /* wersja formatu pliku konfiguracyjnego */ }; *************** *** 59,63 **** match_host, /* match hostname instead message */ ignore, /* ignore this line and do not display */ ! exit; /* dont process next options */ }; --- 62,66 ---- match_host, /* match hostname instead message */ ignore, /* ignore this line and do not display */ ! action; /* process next rule? */ }; *************** *** 70,71 **** --- 73,76 ---- extern struct s_action *lw_actions; extern int no_actions; + + #define action_exit(a) ((a).action==RULE_EXIT)||(((a).action==RULE_DEFAULT)&&(lw_conf.def_action_rule==RULE_EXIT)) Index: strpcre.c =================================================================== RCS file: /cvsroot/lwatch/files/src/strpcre.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** strpcre.c 21 Mar 2009 10:54:34 -0000 1.30 --- strpcre.c 23 Mar 2009 21:15:34 -0000 1.31 *************** *** 214,218 **** mesg_s=match; } ! if(lw_actions[i].exit) /* dont check other actions */ break; } --- 214,218 ---- mesg_s=match; } ! if(action_exit(lw_actions[i])) /* dont check other actions */ break; } Index: lwatch.conf =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** lwatch.conf 21 Mar 2009 10:54:34 -0000 1.28 --- lwatch.conf 23 Mar 2009 21:15:34 -0000 1.29 *************** *** 10,13 **** --- 10,18 ---- cfg_ver=1 + # The default is that after success match the rule is executed + # then the next rule is taken into action. You can change this behavior + # changing rule_action from continue to exit. Read lwatch.conf(5) for details. + # rule_action=continue + # Available colors: # black red green brown blue magenta cyan lightgray darkgray brightred *************** *** 65,68 **** --- 70,74 ---- color=red serv_color=brown + continue } Index: defaults.h =================================================================== RCS file: /cvsroot/lwatch/files/src/defaults.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** defaults.h 21 Mar 2009 10:54:34 -0000 1.9 --- defaults.h 23 Mar 2009 21:15:34 -0000 1.10 *************** *** 35,38 **** --- 35,42 ---- #define NO 0 + #define RULE_DEFAULT 0 + #define RULE_EXIT 1 + #define RULE_CONTINUE 2 + #define DEF_DATE_COLOR CYAN #define DEF_HOST_COLOR MAGENTA *************** *** 43,44 **** --- 47,49 ---- #define DEF_OUT_FILE "-" #define DEF_CREATE_FIFO YES + #define DEF_ACTION_RULE RULE_CONTINUE |
|
From: Artur R. C. <ar...@us...> - 2009-03-23 21:01:20
|
Update of /cvsroot/lwatch/files/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13649 Modified Files: lwatch.sgml Log Message: Formatting. Index: lwatch.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** lwatch.sgml 23 Mar 2009 20:30:19 -0000 1.22 --- lwatch.sgml 23 Mar 2009 21:00:59 -0000 1.23 *************** *** 166,170 **** To do it, put a line: <literallayout> ! *.* |&infile; </literallayout> in your syslog.conf. Create appropriate fifo and restart syslog, then run --- 166,170 ---- To do it, put a line: <literallayout> ! *.* |&infile; </literallayout> in your syslog.conf. Create appropriate fifo and restart syslog, then run |
|
From: Artur R. C. <ar...@us...> - 2009-03-23 20:30:32
|
Update of /cvsroot/lwatch/files/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2219 Modified Files: lwatch.sgml Log Message: Updated URL. Index: lwatch.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** lwatch.sgml 21 Mar 2009 10:54:34 -0000 1.21 --- lwatch.sgml 23 Mar 2009 20:30:19 -0000 1.22 *************** *** 78,82 **** and real message. Each part has its own default color. You can redefine them in configuration file. Default colors as the same as in loco(1) ! [see: http://zjuul.net/~jules/loco/]. But lwatch is not only a static log colorizer. It is something more. It can colorize your logs any way you wish. You are able to set a new color for any part (date, host, --- 78,82 ---- and real message. Each part has its own default color. You can redefine them in configuration file. Default colors as the same as in loco(1) ! [see: http://www.zjuul.net/~jules/loco/]. But lwatch is not only a static log colorizer. It is something more. It can colorize your logs any way you wish. You are able to set a new color for any part (date, host, |
|
From: Artur R. C. <ar...@us...> - 2009-03-22 17:21:40
|
Update of /cvsroot/lwatch/files/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28194 Modified Files: Makefile.am Log Message: No need to remove yparse.c - it is removet automagically by autotools. Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/src/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 7 Jul 2007 19:56:24 -0000 1.9 --- Makefile.am 22 Mar 2009 17:21:28 -0000 1.10 *************** *** 3,7 **** lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(xh) dist_sysconf_DATA = lwatch.conf - MAINTAINERCLEANFILES = yparse.c CLEANFILES = stamp-h.in *~ --- 3,6 ---- |
|
From: Artur R. C. <ar...@us...> - 2009-03-21 10:54:40
|
Update of /cvsroot/lwatch/files/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13293/files/src Modified Files: acolors.c acolors.h control.c control.h defaults.h lwatch.c lwatch.conf settings.c settings.h strpcre.c strpcre.h yparse.h yparse.l Log Message: Update (C) Copyright notices. Index: yparse.h =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** yparse.h 10 Nov 2003 01:15:05 -0000 1.2 --- yparse.h 21 Mar 2009 10:54:34 -0000 1.3 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** settings.c 28 Feb 2009 16:40:23 -0000 1.34 --- settings.c 21 Mar 2009 10:54:34 -0000 1.35 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or *************** *** 59,63 **** char *usage[]={ "Log Watcher, the log colourize tool, version " VERSION, ! "Copyright (C) 2002-2003 by Artur R. Czechowski <ar...@he...>", "http://sourceforge.net/projects/lwatch", "", --- 59,63 ---- char *usage[]={ "Log Watcher, the log colourize tool, version " VERSION, ! "Copyright (C) 2002-2009 by Artur R. Czechowski <ar...@he...>", "http://sourceforge.net/projects/lwatch", "", Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** yparse.l 26 Jun 2005 21:49:54 -0000 1.29 --- yparse.l 21 Mar 2009 10:54:34 -0000 1.30 *************** *** 7,11 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 7,11 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** settings.h 28 Feb 2009 16:18:39 -0000 1.14 --- settings.h 21 Mar 2009 10:54:34 -0000 1.15 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: lwatch.c =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** lwatch.c 28 Feb 2009 16:18:39 -0000 1.27 --- lwatch.c 21 Mar 2009 10:54:34 -0000 1.28 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: strpcre.c =================================================================== RCS file: /cvsroot/lwatch/files/src/strpcre.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** strpcre.c 28 Feb 2009 16:18:39 -0000 1.29 --- strpcre.c 21 Mar 2009 10:54:34 -0000 1.30 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: acolors.h =================================================================== RCS file: /cvsroot/lwatch/files/src/acolors.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** acolors.h 7 Apr 2003 14:51:41 -0000 1.6 --- acolors.h 21 Mar 2009 10:54:34 -0000 1.7 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: control.h =================================================================== RCS file: /cvsroot/lwatch/files/src/control.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** control.h 28 Feb 2009 16:18:39 -0000 1.9 --- control.h 21 Mar 2009 10:54:34 -0000 1.10 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: strpcre.h =================================================================== RCS file: /cvsroot/lwatch/files/src/strpcre.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** strpcre.h 10 Nov 2003 01:15:05 -0000 1.6 --- strpcre.h 21 Mar 2009 10:54:34 -0000 1.7 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: control.c =================================================================== RCS file: /cvsroot/lwatch/files/src/control.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** control.c 28 Feb 2009 16:18:39 -0000 1.20 --- control.c 21 Mar 2009 10:54:34 -0000 1.21 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: lwatch.conf =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** lwatch.conf 17 Aug 2004 07:40:52 -0000 1.27 --- lwatch.conf 21 Mar 2009 10:54:34 -0000 1.28 *************** *** 4,7 **** --- 4,9 ---- # $Source$ # Format of this file is described in manual + # That file is public domain. You can use, copy, modify, distribute + # and sell it. # This configuration file has syntax version 1. Index: acolors.c =================================================================== RCS file: /cvsroot/lwatch/files/src/acolors.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** acolors.c 13 Jan 2004 14:10:33 -0000 1.11 --- acolors.c 21 Mar 2009 10:54:34 -0000 1.12 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: defaults.h =================================================================== RCS file: /cvsroot/lwatch/files/src/defaults.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** defaults.h 7 Apr 2003 14:51:41 -0000 1.8 --- defaults.h 21 Mar 2009 10:54:34 -0000 1.9 *************** *** 3,7 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 3,7 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or |
|
From: Artur R. C. <ar...@us...> - 2009-03-21 10:54:39
|
Update of /cvsroot/lwatch/files/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13293/files/doc Modified Files: conf.ent.in lwatch.conf.sgml lwatch.sgml Log Message: Update (C) Copyright notices. Index: conf.ent.in =================================================================== RCS file: /cvsroot/lwatch/files/doc/conf.ent.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** conf.ent.in 11 Aug 2004 11:01:07 -0000 1.6 --- conf.ent.in 21 Mar 2009 10:54:34 -0000 1.7 *************** *** 2,6 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 2,6 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: lwatch.conf.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.conf.sgml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lwatch.conf.sgml 28 Feb 2009 16:40:23 -0000 1.8 --- lwatch.conf.sgml 21 Mar 2009 10:54:34 -0000 1.9 *************** *** 9,13 **** This file is a part of the LogWatcher tool. ! Copyright (C) 2002,2003,2004 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 9,13 ---- This file is a part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or Index: lwatch.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** lwatch.sgml 17 Aug 2004 07:36:58 -0000 1.20 --- lwatch.sgml 21 Mar 2009 10:54:34 -0000 1.21 *************** *** 9,13 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002,2003,2004 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 9,13 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or |
|
From: Artur R. C. <ar...@us...> - 2009-03-21 10:34:09
|
Update of /cvsroot/lwatch/files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8700 Modified Files: README.cvs Log Message: Typos, language. Index: README.cvs =================================================================== RCS file: /cvsroot/lwatch/files/README.cvs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README.cvs 18 Aug 2004 07:52:48 -0000 1.4 --- README.cvs 21 Mar 2009 10:34:00 -0000 1.5 *************** *** 23,30 **** http://www.oasis-open.org/docbook/tools/dtm/docbook-to-man.tar.gz ! docbook2man from docbook-utils is not supported and I am not sure ! if I will. ! If you have all above installed on you box just run following sequence: aclocal && automake && autoconf --- 23,30 ---- http://www.oasis-open.org/docbook/tools/dtm/docbook-to-man.tar.gz ! docbook2man from docbook-utils is not supported. And, most probably, wont be ! unless necessary. ! If you have all above installed on your box just run following sequence: aclocal && automake && autoconf |
|
From: Artur R. C. <ar...@us...> - 2009-03-21 10:27:35
|
Update of /cvsroot/lwatch/files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv311 Modified Files: INSTALL Log Message: Removed --enable-resize from building documentation. Index: INSTALL =================================================================== RCS file: /cvsroot/lwatch/files/INSTALL,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** INSTALL 7 Jul 2007 16:48:48 -0000 1.7 --- INSTALL 21 Mar 2009 10:27:29 -0000 1.8 *************** *** 239,246 **** Specify default input file instead /var/lwatch/syslog.fifo - `--enable-resize' - Cut output line to terminal width. This feature is broken now, use it on - your own risk - `--with-libpcre=PATH' Specify directory with pcre development files --- 239,242 ---- |
|
From: Artur R. C. <ar...@us...> - 2009-02-28 16:43:33
|
Update of /cvsroot/lwatch/files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7445 Modified Files: TODO Log Message: I am not convinced that support for growing file is really needed. tail -f | lwatch -i- works good. So, moving it to the end of the TODO list. Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** TODO 28 Feb 2009 16:40:23 -0000 1.48 --- TODO 28 Feb 2009 16:43:29 -0000 1.49 *************** *** 5,9 **** - optional syslog support - debug/error messages should be optionally printed to syslog - - support for growing regular files (like tail -f) - signal handling (reload configuration, reexec program) - run as daemon --- 5,8 ---- *************** *** 22,25 **** --- 21,25 ---- - multiple sources - multiple types of pattern + - support for growing regular files (like tail -f) Won't do: |
|
From: Artur R. C. <ar...@us...> - 2009-02-28 16:40:35
|
Update of /cvsroot/lwatch/files/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7157/src Modified Files: settings.c Log Message: cfg_ver is obligatory now Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** settings.c 28 Feb 2009 16:18:39 -0000 1.33 --- settings.c 28 Feb 2009 16:40:23 -0000 1.34 *************** *** 237,242 **** #endif ! if(!lw_conf.cfg_ver) fprintf(stderr,"\nWARNING! Not versioned configuration file!\n" ! "In the next version it shall be a fatal error.\n\n"); } --- 237,242 ---- #endif ! if(!lw_conf.cfg_ver) die("\nERROR! Not versioned configuration file!\n" ! "Read about cfg_ver in lwatch.conf(5).\n\n"); } |
|
From: Artur R. C. <ar...@us...> - 2009-02-28 16:40:29
|
Update of /cvsroot/lwatch/files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7157 Modified Files: ChangeLog TODO Log Message: cfg_ver is obligatory now Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** TODO 28 Feb 2009 16:18:39 -0000 1.47 --- TODO 28 Feb 2009 16:40:23 -0000 1.48 *************** *** 5,9 **** - optional syslog support - debug/error messages should be optionally printed to syslog - - throw error if config file is without version - support for growing regular files (like tail -f) - signal handling (reload configuration, reexec program) --- 5,8 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** ChangeLog 28 Feb 2009 16:18:39 -0000 1.37 --- ChangeLog 28 Feb 2009 16:40:23 -0000 1.38 *************** *** 7,10 **** --- 7,11 ---- superfluous, however I would be glad to accept a working patch if you find this functionality vital for you + - cfg_ver is obligatory now, consult lwatch.conf(5) 0.4.1: - manual typos (arturcz) |
|
From: Artur R. C. <ar...@us...> - 2009-02-28 16:40:27
|
Update of /cvsroot/lwatch/files/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7157/doc Modified Files: lwatch.conf.sgml Log Message: cfg_ver is obligatory now Index: lwatch.conf.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.conf.sgml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** lwatch.conf.sgml 26 Jun 2005 21:49:54 -0000 1.7 --- lwatch.conf.sgml 28 Feb 2009 16:40:23 -0000 1.8 *************** *** 65,69 **** <refsect2> <title>General options</title> ! <para><option>cfg_ver</option> - this is obligatory variable and it must be placed as the first option in config file (note: although it is not enforced now, it shall be in next release of lwatch). This variable contains version of configuration file syntax. Current manual describes version 1.</para> <para><option>use_syslog</option> - if set to yes some messages will be logged through syslog, default is yes</para> <para><option>log_level</option> - how verbose log messages should produce lwatch</para> --- 65,69 ---- <refsect2> <title>General options</title> ! <para><option>cfg_ver</option> - this is obligatory variable and it must be placed as the first option in config file. This variable contains version of configuration file syntax. Current manual describes version 1.</para> <para><option>use_syslog</option> - if set to yes some messages will be logged through syslog, default is yes</para> <para><option>log_level</option> - how verbose log messages should produce lwatch</para> |
|
From: Artur R. C. <ar...@us...> - 2009-02-28 16:18:46
|
Update of /cvsroot/lwatch/files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4009/files Modified Files: ChangeLog TODO configure.ac Log Message: Remove support for resized window - this is simply b0rken. So, I can close now SF#914518. Index: configure.ac =================================================================== RCS file: /cvsroot/lwatch/files/configure.ac,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** configure.ac 16 Feb 2005 15:42:44 -0000 1.52 --- configure.ac 28 Feb 2009 16:18:39 -0000 1.53 *************** *** 41,47 **** [Default input file]) - AH_TEMPLATE([RESIZE], - [Define to 1 if you want to compile with resize support.]) - AC_MSG_CHECKING(for platform dependent directories) case $target in --- 41,44 ---- *************** *** 148,162 **** fi - AC_MSG_CHECKING(for compile with terminal resizing support) - AC_ARG_ENABLE(resize, - AC_HELP_STRING([--enable-resize],[Compile with terminal resizing support (broken, use on your own risk)]), , - [enable_resize="no"]) - AC_MSG_RESULT($enable_resize) - if test "$enable_resize" = "yes"; then - AC_DEFINE(RESIZE) - dnl LDFLAGS="${LDFLAGS} -lcurses" - fi - - arc_sysconfdir=`eval echo $sysconfdir` AC_DEFINE_UNQUOTED(SYSCONFDIR,"$arc_sysconfdir") --- 145,148 ---- Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** TODO 16 Feb 2005 14:52:35 -0000 1.46 --- TODO 28 Feb 2009 16:18:39 -0000 1.47 *************** *** 9,14 **** - signal handling (reload configuration, reexec program) - run as daemon - - enable cut line to $COLUMNS to fit in xterm (it requires some work - to make it usable) (arc: is this feature really needed?) - dealing with ip's in logs --- 9,12 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ChangeLog 11 Jun 2005 16:08:36 -0000 1.36 --- ChangeLog 28 Feb 2009 16:18:39 -0000 1.37 *************** *** 3,6 **** --- 3,10 ---- - added contrib/lwatch.jl for sawfish, thanks to Jakub Turski - order of rules is important, note in lwatch.conf(5) (sf#910332) + - purge support for cutting line to fit in width in resized xterm, + current patch is broken, personally I think the feature is + superfluous, however I would be glad to accept a working patch + if you find this functionality vital for you 0.4.1: - manual typos (arturcz) |
|
From: Artur R. C. <ar...@us...> - 2009-02-28 16:18:46
|
Update of /cvsroot/lwatch/files/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4009/files/src Modified Files: config.h.in control.c control.h lwatch.c settings.c settings.h strpcre.c Log Message: Remove support for resized window - this is simply b0rken. So, I can close now SF#914518. Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** settings.c 26 Jun 2005 21:49:54 -0000 1.32 --- settings.c 28 Feb 2009 16:18:39 -0000 1.33 *************** *** 106,113 **** " -s, --show-unparsed", "\tshow unparsed lines (like `last message repeated X times')", - #ifdef RESIZE - " -t, --term-cut", - "\tcut lines to terminal width", - #endif " -O, --omit-rc", "\tdo not read values from config file", --- 106,109 ---- *************** *** 131,137 **** {"show-unparsed",0,0,'s'}, {"omit-rc",0,0,'O'}, - #ifdef RESIZE - {"term-cut",0,0,'t'}, - #endif {"help",0,0,'h'}, {0,0,0,0} --- 127,130 ---- *************** *** 193,204 **** #endif break; - #ifdef RESIZE - case 't': - lw_conf.term_cut=1; - #ifdef DEBUG - fprintf(stderr,"Term-cut\n"); - #endif - break; - #endif case 'v': show_licence(); --- 186,189 ---- Index: lwatch.c =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** lwatch.c 19 Aug 2004 10:23:43 -0000 1.26 --- lwatch.c 28 Feb 2009 16:18:39 -0000 1.27 *************** *** 57,63 **** checkeof=0; - #ifdef RESIZE - win_width=get_term_width(); - #endif parse_options(argc,argv); parse_config(); --- 57,60 ---- Index: config.h.in =================================================================== RCS file: /cvsroot/lwatch/files/src/config.h.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** config.h.in 16 Feb 2005 14:52:35 -0000 1.17 --- config.h.in 28 Feb 2009 16:18:39 -0000 1.18 *************** *** 111,117 **** #undef PACKAGE_VERSION - /* Define to 1 if you want to compile with resize support. */ - #undef RESIZE - /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE --- 111,114 ---- Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** settings.h 26 Jun 2005 21:49:54 -0000 1.13 --- settings.h 28 Feb 2009 16:18:39 -0000 1.14 *************** *** 42,48 **** int log_level; int cfg_ver; /* wersja formatu pliku konfiguracyjnego */ - #ifdef RESIZE - int term_cut; - #endif }; --- 42,45 ---- Index: control.h =================================================================== RCS file: /cvsroot/lwatch/files/src/control.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** control.h 11 Mar 2004 23:43:43 -0000 1.8 --- control.h 28 Feb 2009 16:18:39 -0000 1.9 *************** *** 46,53 **** void show_poll_res(int res, struct pollfd *ufds, int n); #endif - #ifdef RESIZE - unsigned short int get_term_width(void); - extern unsigned short int win_width; /* Window width */ - #endif extern int loop; --- 46,49 ---- Index: strpcre.c =================================================================== RCS file: /cvsroot/lwatch/files/src/strpcre.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** strpcre.c 19 Aug 2004 10:30:01 -0000 1.28 --- strpcre.c 28 Feb 2009 16:18:39 -0000 1.29 *************** *** 165,200 **** } - #ifdef RESIZE - char* cut_line(char *output, char *input,int real_len) - { - int to_cut=real_len-win_width, n=strlen(input), m=0; - strncpy(output,input,strlen(input)); - output[strlen(input)]=0; - if (to_cut<1) return output; - while (to_cut>0) { - switch (output[n]) { - case '\n': - case '\0': break; - case '0' ... '9': if (m<2) m++; - else {to_cut--; } - break; - case '^': if (m!=2) to_cut-=m+1; - m=0; - break; - default: to_cut-=m+1; m=0; - break; - } - n--; - } - n+=m; - output[n+1]='^'; - output[n+2]='0'; - output[n+3]='1'; - output[n+4]='\n'; - output[n+5]=0; - return output; - } - #endif - void showline(char *input) { int i,n,ignore; --- 165,168 ---- *************** *** 255,266 **** if(!ignore) { char *cstr; - #ifdef RESIZE - char *cutstr; - #endif int len=strlen(date_s)+strlen(host_s)+strlen(serv_s)+strlen(mesg_s)+17; cstr=(char*)malloc(len); - #ifdef RESIZE - cutstr=(char*)malloc(len); - #endif sprintf(cstr,"^%02i%s^%02i%s^%02i%s^%02i%s^01\n", DATE_COLOR,date_s, --- 223,228 ---- *************** *** 268,280 **** SERV_COLOR,serv_s, MESG_COLOR,mesg_s); - #ifdef RESIZE - if (lw_conf.term_cut) { - cutstr=cut_line(cutstr,cstr,len-hl_num*6-17); - cprintf(cutstr); - } else cprintf(cstr); - free((void*)cutstr); - #else cprintf(cstr); - #endif free((void*)cstr); } --- 230,234 ---- Index: control.c =================================================================== RCS file: /cvsroot/lwatch/files/src/control.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** control.c 12 Jan 2004 21:19:41 -0000 1.19 --- control.c 28 Feb 2009 16:18:39 -0000 1.20 *************** *** 41,62 **** int loop; - #ifdef RESIZE - #include <sys/ioctl.h> - #include <termios.h> - - unsigned short int win_width; /* Window width */ - - unsigned short int get_term_width() { - struct winsize wsz; - unsigned short int retval; - if (ioctl(fileno(stdout),TIOCGWINSZ,&wsz)) wsz.ws_col=80; /* Defaults to 80, if it's not a tty and other errors */ - retval=wsz.ws_col; - #ifdef DEBUG - fprintf(stderr,"Terminal width=%d\n",retval); - #endif - return retval; - } - - #endif void die(const char *s, ...) { --- 41,44 ---- *************** *** 82,91 **** loop=0; break; - #ifdef RESIZE - case SIGWINCH: /* Window resize */ - loop=1; - win_width=get_term_width(); - break; - #endif } #ifdef DEBUG --- 64,67 ---- *************** *** 103,109 **** sig_check(signal(i,&signal_handle),""); } - #ifdef RESIZE - sig_check(signal(SIGWINCH,&signal_handle),""); /* Window resize support */ - #endif } --- 79,82 ---- |
|
From: Artur R. C. <ar...@us...> - 2007-07-07 19:56:27
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20848 Modified Files: Makefile.am Log Message: yparse.c should not be deleted by clean and distclean target as we want to make it buildable without flex for anyone using tarball Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/src/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 14 Aug 2004 17:52:51 -0000 1.8 --- Makefile.am 7 Jul 2007 19:56:24 -0000 1.9 *************** *** 3,7 **** lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(xh) dist_sysconf_DATA = lwatch.conf ! CLEANFILES = yparse.c stamp-h.in *~ install-data-hook: --- 3,8 ---- lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(xh) dist_sysconf_DATA = lwatch.conf ! MAINTAINERCLEANFILES = yparse.c ! CLEANFILES = stamp-h.in *~ install-data-hook: |
|
From: Artur R. C. <ar...@us...> - 2007-07-07 16:48:52
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4787 Modified Files: INSTALL depcomp install-sh missing mkinstalldirs Added Files: ylwrap Log Message: Update to automake 1.10 and autoconf 2.61 Index: mkinstalldirs =================================================================== RCS file: /cvsroot/lwatch/files/mkinstalldirs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mkinstalldirs 3 Feb 2003 14:07:25 -0000 1.4 --- mkinstalldirs 7 Jul 2007 16:48:48 -0000 1.5 *************** *** 1,13 **** #! /bin/sh # mkinstalldirs --- make directory hierarchy ! # Author: Noah Friedman <fri...@pr...> # Created: 1993-05-16 ! # Public domain errstatus=0 ! dirmode="" usage="\ ! Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." # process command line arguments --- 1,28 ---- #! /bin/sh # mkinstalldirs --- make directory hierarchy ! ! scriptversion=2006-05-11.19 ! ! # Original author: Noah Friedman <fri...@pr...> # Created: 1993-05-16 ! # Public domain. ! # ! # This file is maintained in Automake, please report ! # bugs to <bug...@gn...> or send patches to ! # <aut...@gn...>. + nl=' + ' + IFS=" "" $nl" errstatus=0 ! dirmode= usage="\ ! Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ! ! Create each directory DIR (with mode MODE, if specified), including all ! leading file name components. ! ! Report bugs to <bug...@gn...>." # process command line arguments *************** *** 15,20 **** case $1 in -h | --help | --h*) # -h for help ! echo "$usage" 1>&2 ! exit 0 ;; -m) # -m PERM arg --- 30,35 ---- case $1 in -h | --help | --h*) # -h for help ! echo "$usage" ! exit $? ;; -m) # -m PERM arg *************** *** 24,27 **** --- 39,46 ---- shift ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; --) # stop option processing shift *************** *** 51,65 **** esac case $dirmode in '') ! if mkdir -p -- . 2>/dev/null; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" fi ;; *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" fi ;; --- 70,104 ---- esac + # Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and + # mkdir -p a/c at the same time, both will detect that a is missing, + # one will create a, then the other will try to create a and die with + # a "File exists" error. This is a problem when calling mkinstalldirs + # from a parallel make. We use --version in the probe to restrict + # ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') ! if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) ! if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ! test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; *************** *** 68,78 **** for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift - pathcomp= for d do ! pathcomp="$pathcomp$d" case $pathcomp in -*) pathcomp=./$pathcomp ;; --- 107,125 ---- for file do ! case $file in ! /*) pathcomp=/ ;; ! *) pathcomp= ;; ! esac ! oIFS=$IFS ! IFS=/ ! set fnord $file shift + IFS=$oIFS for d do ! test "x$d" = x && continue ! ! pathcomp=$pathcomp$d case $pathcomp in -*) pathcomp=./$pathcomp ;; *************** *** 85,103 **** if test ! -d "$pathcomp"; then ! errstatus=$lasterr else ! if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi fi fi ! pathcomp="$pathcomp/" done done --- 132,150 ---- if test ! -d "$pathcomp"; then ! errstatus=$lasterr else ! if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" ! lasterr= ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi fi fi ! pathcomp=$pathcomp/ done done *************** *** 108,111 **** # mode: shell-script # sh-indentation: 2 # End: - # mkinstalldirs ends here --- 155,161 ---- # mode: shell-script # sh-indentation: 2 + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" # End: --- NEW FILE: ylwrap --- #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. scriptversion=2005-05-14.22 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # # Written by Tom Tromey <tr...@cy...>. # # 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 # the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program 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 this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # This file is maintained in Automake, please report # bugs to <bug...@gn...> or send patches to # <aut...@gn...>. case "$1" in '') echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 exit 1 ;; --basedir) basedir=$2 shift 2 ;; -h|--h*) cat <<\EOF Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... Wrapper for lex/yacc invocations, renaming files as desired. INPUT is the input file OUTPUT is one file PROG generates DESIRED is the file we actually want instead of OUTPUT PROGRAM is program to run ARGS are passed to PROG Any number of OUTPUT,DESIRED pairs may be used. Report bugs to <bug...@gn...>. EOF exit $? ;; -v|--v*) echo "ylwrap $scriptversion" exit $? ;; esac # The input. input="$1" shift case "$input" in [\\/]* | ?:[\\/]*) # Absolute path; do nothing. ;; *) # Relative path. Make it absolute. input="`pwd`/$input" ;; esac pairlist= while test "$#" -ne 0; do if test "$1" = "--"; then shift break fi pairlist="$pairlist $1" shift done # The program to run. prog="$1" shift # Make any relative path in $prog absolute. case "$prog" in [\\/]* | ?:[\\/]*) ;; *[\\/]*) prog="`pwd`/$prog" ;; esac # FIXME: add hostname here for parallel makes that run commands on # other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 mkdir $dirname || exit 1 cd $dirname case $# in 0) $prog "$input" ;; *) $prog "$@" "$input" ;; esac ret=$? if test $ret -eq 0; then set X $pairlist shift first=yes # Since DOS filename conventions don't allow two dots, # the DOS version of Bison writes out y_tab.c instead of y.tab.c # and y_tab.h instead of y.tab.h. Test to see if this is the case. y_tab_nodot="no" if test -f y_tab.c || test -f y_tab.h; then y_tab_nodot="yes" fi # The directory holding the input. input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` # Quote $INPUT_DIR so we can use it in a regexp. # FIXME: really we should care about more than `.' and `\'. input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'` while test "$#" -ne 0; do from="$1" # Handle y_tab.c and y_tab.h output by DOS if test $y_tab_nodot = "yes"; then if test $from = "y.tab.c"; then from="y_tab.c" else if test $from = "y.tab.h"; then from="y_tab.h" fi fi fi if test -f "$from"; then # If $2 is an absolute path name, then just use that, # otherwise prepend `../'. case "$2" in [\\/]* | ?:[\\/]*) target="$2";; *) target="../$2";; esac # We do not want to overwrite a header file if it hasn't # changed. This avoid useless recompilations. However the # parser itself (the first file) should always be updated, # because it is the destination of the .y.c rule in the # Makefile. Divert the output of all other files to a temporary # file so we can compare them to existing versions. if test $first = no; then realtarget="$target" target="tmp-`echo $target | sed s/.*[\\/]//g`" fi # Edit out `#line' or `#' directives. # # We don't want the resulting debug information to point at # an absolute srcdir; it is better for it to just mention the # .y file with no path. # # We want to use the real output file name, not yy.lex.c for # instance. # # We want the include guards to be adjusted too. FROM=`echo "$from" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` TARGET=`echo "$2" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? # Check whether header files must be updated. if test $first = no; then if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then echo "$2" is unchanged rm -f "$target" else echo updating "$2" mv -f "$target" "$realtarget" fi fi else # A missing file is only an error for the first file. This # is a blatant hack to let us support using "yacc -d". If -d # is not specified, we don't want an error when the header # file is "missing". if test $first = yes; then ret=1 fi fi shift shift first=no done else ret=$? fi # Remove the directory. cd .. rm -rf $dirname exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-end: "$" # End: Index: missing =================================================================== RCS file: /cvsroot/lwatch/files/missing,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** missing 3 Feb 2003 14:07:25 -0000 1.4 --- missing 7 Jul 2007 16:48:48 -0000 1.5 *************** *** 1,5 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. --- 1,9 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! ! scriptversion=2006-05-10.23 ! ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ! # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. *************** *** 16,21 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. # As a special exception to the GNU General Public License, if you --- 20,25 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ! # 02110-1301, USA. # As a special exception to the GNU General Public License, if you *************** *** 30,33 **** --- 34,39 ---- run=: + sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' + sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the *************** *** 39,43 **** fi ! case "$1" in --run) # Try to run requested program, and just exit if it succeeds. --- 45,51 ---- fi ! msg="missing on your system" ! ! case $1 in --run) # Try to run requested program, and just exit if it succeeds. *************** *** 45,54 **** shift "$@" && exit 0 ;; - esac - - # If it does not exist, or fails to run (possibly an outdated version), - # try to emulate it. - case "$1" in -h|--h|--he|--hel|--help) --- 53,66 ---- shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -h|--h|--he|--hel|--help) *************** *** 68,71 **** --- 80,84 ---- autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] *************** *** 75,83 **** makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing 0.4 - GNU automake" ;; --- 88,100 ---- makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch] ! ! Send bug reports to <bug...@gn...>." ! exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing $scriptversion (GNU Automake)" ! exit $? ;; *************** *** 88,99 **** ;; ! aclocal*) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 fi echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from --- 105,146 ---- ;; ! esac ! ! # Now exit if we have it, but it failed. Also exit now if we ! # don't have it and --version was passed (most likely to detect ! # the program). ! case $1 in ! lex|yacc) ! # Not GNU programs, they don't have --version. ! ;; ! ! tar) ! if test -n "$run"; then ! echo 1>&2 "ERROR: \`tar' requires --run" ! exit 1 ! elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ! exit 1 ! fi ! ;; ! ! *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; + esac + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case $1 in + aclocal*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from *************** *** 103,113 **** autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU --- 150,155 ---- autoconf) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU *************** *** 117,127 **** autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them --- 159,164 ---- autoheader) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them *************** *** 131,135 **** touch_files= for f in $files; do ! case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; --- 168,172 ---- touch_files= for f in $files; do ! case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *************** *** 141,151 **** automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. --- 178,183 ---- automake*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. *************** *** 157,174 **** autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. ! You can get \`$1Help2man' as part of \`Autoconf' from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` ! test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` if test -f "$file"; then touch $file --- 189,201 ---- autom4te) echo 1>&2 "\ ! WARNING: \`$1' is needed, but is $msg. ! You might have modified some files without having the proper tools for further handling them. ! You can get \`$1' as part of \`Autoconf' from any GNU archive site." ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file *************** *** 186,204 **** bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi --- 213,231 ---- bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi *************** *** 206,213 **** esac fi ! if [ ! -f y.tab.h ]; then echo >y.tab.h fi ! if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi --- 233,240 ---- esac fi ! if test ! -f y.tab.h; then echo >y.tab.h fi ! if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi *************** *** 216,230 **** lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi --- 243,257 ---- lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi *************** *** 232,236 **** esac fi ! if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi --- 259,263 ---- esac fi ! if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi *************** *** 238,257 **** help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ! if test -z "$file"; then ! file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` ! fi ! if [ -f "$file" ]; then touch $file else --- 265,277 ---- help2man) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ! if test -f "$file"; then touch $file else *************** *** 263,273 **** makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious --- 283,288 ---- makeinfo) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious *************** *** 275,283 **** DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` fi touch $file ;; --- 290,311 ---- DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! # The file to touch is that specified with -o ... ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then ! # ... or it is the one specified with @setfilename ... ! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n ' ! /^@setfilename/{ ! s/.* \([^ ]*\) *$/\1/ ! p ! q ! }' $infile` ! # ... or it is derived from the source name (dir/f.texi becomes f.info) ! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; *************** *** 285,292 **** tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. --- 313,316 ---- *************** *** 301,305 **** firstarg="$1" if shift; then ! case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` --- 325,329 ---- firstarg="$1" if shift; then ! case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` *************** *** 307,311 **** ;; esac ! case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` --- 331,335 ---- ;; esac ! case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` *************** *** 324,331 **** *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequirements for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." --- 348,355 ---- *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and is $msg. ! You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." *************** *** 335,336 **** --- 359,367 ---- exit 0 + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: Index: depcomp =================================================================== RCS file: /cvsroot/lwatch/files/depcomp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** depcomp 3 Feb 2003 14:07:25 -0000 1.2 --- depcomp 7 Jul 2007 16:48:48 -0000 1.3 *************** *** 1,6 **** #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects ! # Copyright 1999, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 1,9 ---- #! /bin/sh # depcomp - compile a program generating dependencies as side-effects ! ! scriptversion=2006-10-15.18 ! ! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software ! # Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 16,21 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. # As a special exception to the GNU General Public License, if you --- 19,24 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ! # 02110-1301, USA. # As a special exception to the GNU General Public License, if you *************** *** 26,45 **** # Originally written by Alexandre Oliva <ol...@dc...>. if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi - # `libtool' can also be set to `yes' or `no'. - - if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" - fi tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} --- 29,71 ---- # Originally written by Alexandre Oliva <ol...@dc...>. + case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF + Usage: depcomp [--help] [--version] PROGRAM [ARGS] + + Run PROGRAMS ARGS to compile a file, generating dependencies + as side-effects. + + Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + + Report bugs to <bug...@gn...>. + EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; + esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi + # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. + depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} *************** *** 67,71 **** ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. ! "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : --- 93,110 ---- ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. ! ## Unfortunately, FreeBSD c89 acceptance of flags depends upon ! ## the command line argument order; so add the flags where they ! ## appear in depend2.am. Note that the slowdown incurred here ! ## affects only configure: in makefiles, %FASTDEP% shortcuts this. ! for arg ! do ! case $arg in ! -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ! *) set fnord "$@" "$arg" ;; ! esac ! shift # fnord ! shift # $arg ! done ! "$@" stat=$? if test $stat -eq 0; then : *************** *** 173,182 **** aix) # The C for AIX Compiler uses -M and outputs the dependencies ! # in a .u file. This file always lives in the current directory. ! # Also, the AIX compiler puts `$object:' at the start of each line; ! # $object doesn't have directory information. ! stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" - outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M --- 212,221 ---- aix) # The C for AIX Compiler uses -M and outputs the dependencies ! # in a .u file. In older versions, this file always lives in the ! # current directory. Also, the AIX compiler puts `$object:' at the ! # start of each line; $object doesn't have directory information. ! # Version 6 uses the directory in both cases. ! stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" if test "$libtool" = yes; then "$@" -Wc,-M *************** *** 184,189 **** "$@" -M fi - stat=$? if test $stat -eq 0; then : else --- 223,234 ---- "$@" -M fi stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else *************** *** 193,196 **** --- 238,242 ---- if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to *************** *** 207,210 **** --- 253,334 ---- ;; + icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + + hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side *************** *** 218,227 **** if test "$libtool" = yes; then ! tmpdepfile1="$dir.libs/$base.lo.d" ! tmpdepfile2="$dir.libs/$base.d" "$@" -Wc,-MD else ! tmpdepfile1="$dir$base.o.d" ! tmpdepfile2="$dir$base.d" "$@" -MD fi --- 342,368 ---- if test "$libtool" = yes; then ! # With Tru64 cc, shared objects can also be used to make a ! # static library. This mechanism is used in libtool 1.4 series to ! # handle both shared and static libraries in a single compilation. ! # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ! # ! # With libtool 1.5 this exception was removed, and libtool now ! # generates 2 separate objects for the 2 libraries. These two ! # compilations output dependencies in $dir.libs/$base.o.d and ! # in $dir$base.o.d. We have to check for both files, because ! # one of the two compilations can be disabled. We should prefer ! # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ! # automatically cleaned when .libs/ is deleted, while ignoring ! # the former would cause a distcleancheck panic. ! tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ! tmpdepfile2=$dir$base.o.d # libtool 1.5 ! tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ! tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else ! tmpdepfile1=$dir$base.o.d ! tmpdepfile2=$dir$base.d ! tmpdepfile3=$dir$base.d ! tmpdepfile4=$dir$base.d "$@" -MD fi *************** *** 230,246 **** if test $stat -eq 0; then : else ! rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi ! if test -f "$tmpdepfile1"; then ! tmpdepfile="$tmpdepfile1" ! else ! tmpdepfile="$tmpdepfile2" ! fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ! # That's a space and a tab in the []. ! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" --- 371,386 ---- if test $stat -eq 0; then : else ! rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi ! for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ! do ! test -f "$tmpdepfile" && break ! done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ! # That's a tab and a space in the []. ! sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" *************** *** 255,259 **** dashmstdout) # Important note: in order to support this mode, a compiler *must* ! # always write the proprocessed file to stdout, regardless of -o. "$@" || exit $? --- 395,399 ---- dashmstdout) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? *************** *** 266,272 **** fi ! # Remove `-o $object'. We will use -o /dev/null later, ! # however we can't do the remplacement now because ! # `-o $object' might simply not be used IFS=" " for arg --- 406,410 ---- fi ! # Remove `-o $object'. IFS=" " for arg *************** *** 288,292 **** test -z "$dashmflag" && dashmflag=-M ! "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" --- 426,434 ---- test -z "$dashmflag" && dashmflag=-M ! # Require at least two characters before searching for `:' ! # in the target name. This is to cope with DOS-style filenames: ! # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. ! "$@" $dashmflag | ! sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" *************** *** 307,310 **** --- 449,459 ---- makedepend) "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi # X makedepend shift *************** *** 319,323 **** -D*|-I*) set fnord "$@" "$arg"; shift ;; ! -*) ;; *) --- 468,474 ---- -D*|-I*) set fnord "$@" "$arg"; shift ;; ! # Strip any option that makedepend may not understand. Remove ! # the object too, otherwise makedepend will parse it as a source file. ! -*|$object) ;; *) *************** *** 340,344 **** cpp) # Important note: in order to support this mode, a compiler *must* ! # always write the proprocessed file to stdout. "$@" || exit $? --- 491,495 ---- cpp) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout. "$@" || exit $? *************** *** 371,375 **** "$@" -E | ! sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" --- 522,527 ---- "$@" -E | ! sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ! -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" *************** *** 382,386 **** msvisualcpp) # Important note: in order to support this mode, a compiler *must* ! # always write the proprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? --- 534,538 ---- msvisualcpp) # Important note: in order to support this mode, a compiler *must* ! # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? *************** *** 422,423 **** --- 574,584 ---- exit 0 + + # Local Variables: + # mode: shell-script + # sh-indentation: 2 + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: Index: INSTALL =================================================================== RCS file: /cvsroot/lwatch/files/INSTALL,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** INSTALL 14 Aug 2004 15:30:20 -0000 1.6 --- INSTALL 7 Jul 2007 16:48:48 -0000 1.7 *************** *** 1,9 **** ! $Id$ ! $Source$ ! Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software ! Foundation, Inc. ! This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. --- 1,9 ---- ! Installation Instructions ! ************************* ! Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ! 2006 Free Software Foundation, Inc. ! This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. *************** *** 11,15 **** ================== ! These are generic installation instructions. The `configure' shell script attempts to guess correct values for --- 11,18 ---- ================== ! Briefly, the shell commands `./configure; make; make install' should ! configure, build, and install this package. The following ! more-detailed instructions are generic; see the `README' file for ! instructions specific to this package. The `configure' shell script attempts to guess correct values for *************** *** 24,30 **** It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves ! the results of its tests to speed up reconfiguring. (Caching is disabled by default to prevent problems with accidental use of stale ! cache files.) If you need to do unusual things to compile the package, please try --- 27,33 ---- It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves ! the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale ! cache files. If you need to do unusual things to compile the package, please try *************** *** 36,53 **** The file `configure.ac' (or `configure.in') is used to create ! `configure' by a program called `autoconf'. You only need ! `configure.ac' if you want to change it or regenerate `configure' using ! a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type ! `./configure' to configure the package for your system. If you're ! using `csh' on an old version of System V, you might need to type ! `sh ./configure' instead to prevent `csh' from trying to execute ! `configure' itself. ! Running `configure' takes awhile. While running, it prints some ! messages telling which features it is checking for. 2. Type `make' to compile the package. --- 39,53 ---- The file `configure.ac' (or `configure.in') is used to create ! `configure' by a program called `autoconf'. You need `configure.ac' if ! you want to change it or regenerate `configure' using a newer version ! of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type ! `./configure' to configure the package for your system. ! Running `configure' might take a while. While running, it prints ! some messages telling which features it is checking for. 2. Type `make' to compile the package. *************** *** 71,77 **** ===================== ! Some systems require unusual options for compilation or linking that ! the `configure' script does not know about. Run `./configure --help' ! for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters --- 71,77 ---- ===================== ! Some systems require unusual options for compilation or linking that the ! `configure' script does not know about. Run `./configure --help' for ! details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters *************** *** 79,83 **** is an example: ! ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix *Note Defining Variables::, for more details. --- 79,83 ---- is an example: ! ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. *************** *** 86,119 **** ==================================== ! You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their ! own directory. To do this, you must use a version of `make' that ! supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. ! If you have to use a `make' that does not support the `VPATH' ! variable, you have to compile the package for one architecture at a ! time in the source code directory. After you have installed the ! package for one architecture, use `make distclean' before reconfiguring ! for another architecture. Installation Names ================== ! By default, `make install' will install the package's files in ! `/usr/local/bin', `/usr/local/man', etc. You can specify an ! installation prefix other than `/usr/local' by giving `configure' the ! option `--prefix=PATH'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you ! give `configure' the option `--exec-prefix=PATH', the package will use ! PATH as the prefix for installing programs and libraries. ! Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give ! options like `--bindir=PATH' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. --- 86,117 ---- ==================================== ! You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their ! own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. ! With a non-GNU `make', it is safer to compile the package for one ! architecture at a time in the source code directory. After you have ! installed the package for one architecture, use `make distclean' before ! reconfiguring for another architecture. Installation Names ================== ! By default, `make install' installs the package's commands under ! `/usr/local/bin', include files under `/usr/local/include', etc. You ! can specify an installation prefix other than `/usr/local' by giving ! `configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you ! pass the option `--exec-prefix=PREFIX' to `configure', the package uses ! PREFIX as the prefix for installing programs and libraries. ! Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give ! options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. *************** *** 126,130 **** ================= ! Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE --- 124,128 ---- ================= ! Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE *************** *** 141,149 **** ========================== ! There may be some features `configure' cannot figure out ! automatically, but needs to determine by the type of machine the package ! will run on. Usually, assuming the package is built to be run on the ! _same_ architectures, `configure' can figure that out, but if it prints ! a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: --- 139,147 ---- ========================== ! There may be some features `configure' cannot figure out automatically, ! but needs to determine by the type of machine the package will run on. ! Usually, assuming the package is built to be run on the _same_ ! architectures, `configure' can figure that out, but if it prints a ! message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: *************** *** 160,164 **** If you are _building_ compiler tools for cross-compiling, you should ! use the `--target=TYPE' option to select the type of system they will produce code for. --- 158,162 ---- If you are _building_ compiler tools for cross-compiling, you should ! use the option `--target=TYPE' to select the type of system they will produce code for. *************** *** 171,177 **** ================ ! If you want to set default values for `configure' scripts to share, ! you can create a site shell script called `config.site' that gives ! default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the --- 169,175 ---- ================ ! If you want to set default values for `configure' scripts to share, you ! can create a site shell script called `config.site' that gives default ! values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the *************** *** 182,186 **** ================== ! Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these --- 180,184 ---- ================== ! Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these *************** *** 190,201 **** ./configure CC=/usr/local2/bin/gcc ! will cause the specified gcc to be used as the C compiler (unless it is overridden in the site shell script). `configure' Invocation ====================== ! `configure' recognizes the following options to control how it ! operates. `--help' --- 188,203 ---- ./configure CC=/usr/local2/bin/gcc ! causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). + Unfortunately, this technique does not work for `CONFIG_SHELL' due to + an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + `configure' Invocation ====================== ! `configure' recognizes the following options to control how it operates. `--help' Index: install-sh =================================================================== RCS file: /cvsroot/lwatch/files/install-sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install-sh 3 Feb 2003 14:07:25 -0000 1.4 --- install-sh 7 Jul 2007 16:48:48 -0000 1.5 *************** *** 1,18 **** #!/bin/sh - # # install - install a program, script, or datafile ! # This comes from X11R5 (mit/util/scripts/install.sh). # ! # Copyright 1991 by the Massachusetts Institute of Technology # ! # Permission to use, copy, modify, distribute, and sell this software and its ! # documentation for any purpose is hereby granted without fee, provided that ! # the above copyright notice appear in all copies and that both that ! # copyright notice and this permission notice appear in supporting ! # documentation, and that the name of M.I.T. not be used in advertising or ! # publicity pertaining to distribution of the software without specific, ! # written prior permission. M.I.T. makes no representations about the ! # suitability of this software for any purpose. It is provided "as is" ! # without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent --- 1,37 ---- #!/bin/sh # install - install a program, script, or datafile ! ! scriptversion=2006-10-14.15 ! ! # This originates from X11R5 (mit/util/scripts/install.sh), which was ! # later released in X11R6 (xc/config/util/install.sh) with the ! # following copyright and license. # ! # Copyright (C) 1994 X Consortium ! # ! # Permission is hereby granted, free of charge, to any person obtaining a copy ! # of this software and associated documentation files (the "Software"), to ! # deal in the Software without restriction, including without limitation the ! # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ! # sell copies of the Software, and to permit persons to whom the Software is ! # furnished to do so, subject to the following conditions: ! # ! # The above copyright notice and this permission notice shall be included in ! # all copies or substantial portions of the Software. ! # ! # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ! # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ! # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ! # ! # Except as contained in this notice, the name of the X Consortium shall not ! # be used in advertising or otherwise to promote the sale, use or other deal- ! # ings in this Software without prior written authorization from the X Consor- ! # tium. # ! # ! # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent *************** *** 21,27 **** # # This script is compatible with the BSD install script, but was written ! # from scratch. It can only install one file at a time, a restriction ! # shared with many OS's install programs. # set DOITPROG to echo to test this script --- 40,48 ---- # # This script is compatible with the BSD install script, but was written ! # from scratch. + nl=' + ' + IFS=" "" $nl" # set DOITPROG to echo to test this script *************** *** 29,35 **** # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" ! ! # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" --- 50,61 ---- # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" + if test -z "$doit"; then + doit_exec=exec + else + doit_exec=$doit + fi ! # Put in absolute file names if you don't have them in your path; ! # or use environment vars. mvprog="${MVPROG-mv}" *************** *** 42,276 **** mkdirprog="${MKDIRPROG-mkdir}" ! transformbasename="" ! transform_arg="" ! instcmd="$mvprog" ! chmodcmd="$chmodprog 0755" ! chowncmd="" ! chgrpcmd="" ! stripcmd="" rmcmd="$rmprog -f" mvcmd="$mvprog" ! src="" ! dst="" ! dir_arg="" ! while [ x"$1" != x ]; do ! case $1 in ! -c) instcmd=$cpprog ! shift ! continue;; ! -d) dir_arg=true ! shift ! continue;; ! -m) chmodcmd="$chmodprog $2" ! shift ! shift ! continue;; ! -o) chowncmd="$chownprog $2" ! shift ! ... [truncated message content] |
|
From: Artur R. C. <ar...@us...> - 2007-07-07 16:36:11
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9033 Modified Files: config.guess config.sub Log Message: Updated config.guess & config.sub Index: config.guess =================================================================== RCS file: /cvsroot/lwatch/files/config.guess,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.guess 10 Aug 2004 07:57:52 -0000 1.6 --- config.guess 7 Jul 2007 15:37:55 -0000 1.7 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-07-19' # This file is free software; you can redistribute it and/or modify it --- 2,9 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, [...1829 lines suppressed...] c4*) echo c4-convex-bsd ! exit ;; esac fi *************** *** 1410,1414 **** download the most up to date version of the config scripts from ! ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please --- 1475,1481 ---- download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ! and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please Index: config.sub =================================================================== RCS file: /cvsroot/lwatch/files/config.sub,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.sub 10 Aug 2004 07:57:52 -0000 1.6 --- config.sub 7 Jul 2007 15:37:55 -0000 1.7 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. --- 2,9 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ! # Inc. ! timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. *************** *** 22,28 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. ! # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a --- 23,29 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ! # 02110-1301, USA. ! # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a *************** *** 30,33 **** --- 31,35 ---- # the same distribution terms that you use for the rest of that program. + # Please send patches to <con...@gn...>. Submit a context # diff and a properly formatted ChangeLog entry. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. --- 73,77 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 84,92 **** case $1 in --time-stamp | --time* | -t ) ! echo "$timestamp" ; exit 0 ;; --version | -v ) ! echo "$version" ; exit 0 ;; --help | --h* | -h ) ! echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; --- 86,94 ---- case $1 in --time-stamp | --time* | -t ) ! echo "$timestamp" ; exit ;; --version | -v ) ! echo "$version" ; exit ;; --help | --h* | -h ) ! echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; *************** *** 100,104 **** # First pass through any local machine types. echo $1 ! exit 0;; * ) --- 102,106 ---- # First pass through any local machine types. echo $1 ! exit ;; * ) *************** *** 119,124 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` --- 121,127 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ! uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ! storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 171,174 **** --- 174,181 ---- os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 *************** *** 187,190 **** --- 194,201 ---- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 *************** *** 231,242 **** | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 242,255 ---- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ! | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ ! | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 247,250 **** --- 260,264 ---- | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ *************** *** 255,272 **** | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | msp430 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ ! | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown --- 269,290 ---- | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ ! | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | score \ ! | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ! | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown *************** *** 279,282 **** --- 297,303 ---- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' *************** *** 298,315 **** | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ ! | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ ! | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ --- 319,336 ---- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* | avr32-* \ ! | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ ! | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ *************** *** 320,323 **** --- 341,345 ---- | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ *************** *** 328,332 **** --- 350,356 ---- | mipstx39-* | mipstx39el-* \ | mmix-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ *************** *** 335,342 **** | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ --- 359,367 ---- | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ! | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ *************** *** 344,349 **** | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) --- 369,374 ---- | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) *************** *** 458,461 **** --- 483,489 ---- basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis *************** *** 487,490 **** --- 515,522 ---- os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull *************** *** 677,680 **** --- 709,715 ---- os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm *************** *** 752,758 **** os=-proelf ;; ! or32 | or32-*) basic_machine=or32-unknown - os=-coff ;; os400) --- 787,792 ---- os=-proelf ;; ! openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) *************** *** 785,788 **** --- 819,828 ---- basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc *************** *** 841,844 **** --- 881,888 ---- os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k *************** *** 867,870 **** --- 911,918 ---- basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei *************** *** 878,881 **** --- 926,932 ---- os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown *************** *** 1027,1030 **** --- 1078,1085 ---- os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell *************** *** 1076,1086 **** basic_machine=we32k-att ;; ! sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; ! sh64) ! basic_machine=sh64-unknown ! ;; ! sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; --- 1131,1138 ---- basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; ! sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; *************** *** 1155,1159 **** | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ --- 1207,1212 ---- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ! | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ *************** *** 1162,1166 **** | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- 1215,1220 ---- | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ! | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ *************** *** 1168,1172 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1222,1227 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1186,1190 **** ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ! | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; --- 1241,1245 ---- ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ! | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; *************** *** 1295,1298 **** --- 1350,1356 ---- os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *************** *** 1317,1320 **** --- 1375,1384 ---- case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 *************** *** 1326,1332 **** os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) --- 1390,1396 ---- os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) *************** *** 1354,1357 **** --- 1418,1424 ---- os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf *************** *** 1372,1375 **** --- 1439,1445 ---- os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix *************** *** 1543,1547 **** echo $basic_machine$os ! exit 0 # Local variables: --- 1613,1617 ---- echo $basic_machine$os ! exit # Local variables: |
|
From: Artur R. C. <ar...@us...> - 2005-06-26 21:50:06
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29599/src Modified Files: settings.c settings.h yparse.l Log Message: First step for syslog support - setting configuration variables. Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** settings.c 16 Feb 2005 14:52:35 -0000 1.31 --- settings.c 26 Jun 2005 21:49:54 -0000 1.32 *************** *** 35,38 **** --- 35,39 ---- #include <stdlib.h> #include <string.h> + #include <syslog.h> #include <unistd.h> *************** *** 146,149 **** --- 147,152 ---- #endif memset(&lw_conf,0,sizeof(lw_conf)); + lw_conf.use_syslog=1; + lw_conf.log_level=LOG_NOTICE; while((c=getopt_long(argc,argv,"vC:f:i:o:Osht",opt,&idx))!=EOF) { switch(c) { Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** settings.h 10 Aug 2004 12:15:20 -0000 1.12 --- settings.h 26 Jun 2005 21:49:54 -0000 1.13 *************** *** 39,42 **** --- 39,44 ---- char out_file[MAXPATHLEN+1]; int show_unparsed; + int use_syslog; + int log_level; int cfg_ver; /* wersja formatu pliku konfiguracyjnego */ #ifdef RESIZE Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** yparse.l 16 Feb 2005 13:55:08 -0000 1.28 --- yparse.l 26 Jun 2005 21:49:54 -0000 1.29 *************** *** 72,76 **** %option noyywrap nounput ! M_KEYWORD input_file|output_file|show_unparsed|cfg_ver R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight R_KEYWORD match_service|match_host|ignore|exit --- 72,76 ---- %option noyywrap nounput ! M_KEYWORD input_file|output_file|show_unparsed|cfg_ver|use_syslog|log_level R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight R_KEYWORD match_service|match_host|ignore|exit *************** *** 105,134 **** <*>{COMMENT} ; /* Skip comments */ <INITIAL>input_file= { yypch=lw_conf.in_file; #ifdef DEBUG strcpy(mymsg,"input_file"); #endif - PUSH(TEXT); } <INITIAL>output_file= { yypch=lw_conf.out_file; #ifdef DEBUG strcpy(mymsg,"output_file"); #endif - PUSH(TEXT); } <INITIAL>show_unparsed= { yyip=&lw_conf.show_unparsed; #ifdef DEBUG strcpy(mymsg,"show_unparsed"); #endif - PUSH(BOOLEAN); } <INITIAL>cfg_ver= { yyip=&lw_conf.cfg_ver; #ifdef DEBUG strcpy(mymsg,"cfg_ver"); #endif ! PUSH(INTEGER); } <INITIAL>date_color= { --- 105,148 ---- <*>{COMMENT} ; /* Skip comments */ <INITIAL>input_file= { + PUSH(TEXT); yypch=lw_conf.in_file; #ifdef DEBUG strcpy(mymsg,"input_file"); #endif } <INITIAL>output_file= { + PUSH(TEXT); yypch=lw_conf.out_file; #ifdef DEBUG strcpy(mymsg,"output_file"); #endif } <INITIAL>show_unparsed= { + PUSH(BOOLEAN); yyip=&lw_conf.show_unparsed; #ifdef DEBUG strcpy(mymsg,"show_unparsed"); #endif } <INITIAL>cfg_ver= { + PUSH(INTEGER); yyip=&lw_conf.cfg_ver; #ifdef DEBUG strcpy(mymsg,"cfg_ver"); #endif ! } ! <INITIAL>use_syslog= { ! PUSH(BOOLEAN); ! yyip=&lw_conf.use_syslog; ! #ifdef DEBUG ! strcpy(mymsg,"use_syslog"); ! #endif ! } ! <INITIAL>log_level= { ! PUSH(INTEGER) ! yyip=&lw_conf.log_level; ! #ifdef DEBUG ! strcpy(mymsg,"log_level"); ! #endif } <INITIAL>date_color= { |
|
From: Artur R. C. <ar...@us...> - 2005-06-26 21:50:06
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29599/doc Modified Files: lwatch.conf.sgml Log Message: First step for syslog support - setting configuration variables. Index: lwatch.conf.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.conf.sgml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lwatch.conf.sgml 11 Jun 2005 16:08:36 -0000 1.6 --- lwatch.conf.sgml 26 Jun 2005 21:49:54 -0000 1.7 *************** *** 66,69 **** --- 66,71 ---- <title>General options</title> <para><option>cfg_ver</option> - this is obligatory variable and it must be placed as the first option in config file (note: although it is not enforced now, it shall be in next release of lwatch). This variable contains version of configuration file syntax. Current manual describes version 1.</para> + <para><option>use_syslog</option> - if set to yes some messages will be logged through syslog, default is yes</para> + <para><option>log_level</option> - how verbose log messages should produce lwatch</para> <para><option>date_color</option> - default color of date part</para> <para><option>host_color</option> - default color of hostname part</para> *************** *** 78,82 **** <refsect2> <title>Available colors</title> ! <para>To specify color you can use following strings: black red green brown blue magenta cyan lightgray darkgray brightred brightgreen yellow brightblue purple brightcyan white.</para> </refsect2> --- 80,84 ---- <refsect2> <title>Available colors</title> ! <para>To specify color you can use following strings: black, red, green, brown, blue, magenta, cyan, lightgray, darkgray, brightred, brightgreen, yellow, brightblue, purple, brightcyan, white.</para> </refsect2> |
|
From: Artur R. C. <ar...@us...> - 2005-06-04 23:26:26
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2880/files Modified Files: AUTHORS ChangeLog Makefile.am Log Message: - contrib/ directory for contributors - added contrib/lwatch.jl for sawfish, thanks to Jakub Turski Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 18 Mar 2003 16:28:45 -0000 1.5 --- Makefile.am 4 Jun 2005 23:26:17 -0000 1.6 *************** *** 1 **** --- 1,3 ---- SUBDIRS = src doc + + EXTRA_DIST = contrib/lwatch.jl Index: AUTHORS =================================================================== RCS file: /cvsroot/lwatch/files/AUTHORS,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AUTHORS 27 Aug 2003 23:43:57 -0000 1.7 --- AUTHORS 4 Jun 2005 23:26:17 -0000 1.8 *************** *** 5,8 **** --- 5,11 ---- Andrzej Oszer <os...@po...> - autotools support, beta tester + contrib/ + - lwatch.jl - Jakub Turski <yacoob(at)hell.pl> + I would like to thank to some people who have helped me significantly with this project: - Karolina Gajkowska <ka...@bl...> Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ChangeLog 16 Feb 2005 14:52:35 -0000 1.34 --- ChangeLog 4 Jun 2005 23:26:17 -0000 1.35 *************** *** 1,4 **** ! 0.5: - permanently remove input_fifo, --fifo and -f - dumping ./configure flags when run with -v 0.4.1: - manual typos (arturcz) --- 1,5 ---- ! pre0.5: - permanently remove input_fifo, --fifo and -f - dumping ./configure flags when run with -v + - added contrib/lwatch.jl for sawfish, thanks to Jakub Turski 0.4.1: - manual typos (arturcz) |
|
From: Artur R. C. <ar...@us...> - 2005-06-04 23:26:26
|
Update of /cvsroot/lwatch/files/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2880/files/contrib Added Files: lwatch.jl Log Message: - contrib/ directory for contributors - added contrib/lwatch.jl for sawfish, thanks to Jakub Turski --- NEW FILE: lwatch.jl --- ;; ;; aterm with lwatch inside in background ;; ;; Jakub Turski <yacoob(at)hell.pl> ;; ;; DESCRIPTION: ;; ;; runs semi-transparent aterm in the background, with lwatch inside ;; ;; $Source: /cvsroot/lwatch/files/contrib/lwatch.jl,v $ ;; $Id: lwatch.jl,v 1.1 2005/06/04 23:26:18 arturcz Exp $ ;; SETTINGS ;; the name of the xterm (-T option) (define lwatch-name "__lwatch__") ;; the command to execute (define lwatch-program (concat "aterm +sb -geometry 120x48+30+60 -tr -sh 60 -T " lwatch-name " -e lwatch")) ;; delay to wait after initial launch to hide the window (define lwatch-delay 125) ;; OTHER VARS ;; actual lwatch window (define lwatch-handle nil) (define lwatch-xid nil) ;; is it down, or up? (define lwatch-in #f) (defun lwatch-grab-window (w) (when (= (window-name w) lwatch-name) (setq lwatch-handle w) (setq lwatch-xid (window-id w)) (set-window-depth w -16) (window-put w 'sticky t) (window-put w 'group 'desk) (window-put w 'cycle-skip t) (window-put w 'taskbar-skip t) (window-put w 'window-list-skip t) (window-put w 'window-locked-vertically t) (window-put w 'window-locked-horizontally t) (window-put w 'never-focus t) (set-window-frame w ()) ) ) ;; fade in fade out (define (toggle-lwatch) (catch 'return ;; check if the window is there, if not - spawn it (when (or (not lwatch-xid) (not (get-window-by-id lwatch-xid))) (system (concat lwatch-program " &")) (setq lwatch-in #t) (throw 'return nil) ) ;; pull console up or roll it down (if lwatch-in ;; hide it (iconify-window lwatch-handle) ;; show it (uniconify-window lwatch-handle) ) ;; negate the flag (setq lwatch-in (not lwatch-in)) ) ) ;; make it a command available for binding (define-command 'toggle-lwatch toggle-lwatch) ;; put a hook to catch newly spawned window (add-hook 'after-add-window-hook lwatch-grab-window) ;; actually run the command (toggle-lwatch) (make-timer (lambda () (toggle-lwatch) ) 0 lwatch-delay) ;; voila! (provide 'lwatch) |
|
From: Artur R. C. <ar...@us...> - 2005-06-04 23:07:23
|
Update of /cvsroot/lwatch/files/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24858/contrib Log Message: Directory /cvsroot/lwatch/files/contrib added to the repository |
|
From: Artur R. C. <ar...@us...> - 2005-02-16 15:43:01
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24678 Modified Files: configure.ac Log Message: Better (really?) procedure for ./configure parameters. Index: configure.ac =================================================================== RCS file: /cvsroot/lwatch/files/configure.ac,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** configure.ac 16 Feb 2005 15:09:16 -0000 1.51 --- configure.ac 16 Feb 2005 15:42:44 -0000 1.52 *************** *** 11,16 **** AC_CONFIG_SRCDIR(src/lwatch.c) - ALL_PARAMS="$*" - AC_CANONICAL_BUILD AC_CANONICAL_HOST --- 11,14 ---- *************** *** 182,186 **** dnl AC_DEFINE([ALLPARAMS],[],[Parameters from ./configure]) ! ALLPARAMS="${ALL_PARAMS}" AC_SUBST(ALLPARAMS) AC_DEFINE_UNQUOTED(ALLPARAMS,"${ALLPARAMS}") --- 180,184 ---- dnl AC_DEFINE([ALLPARAMS],[],[Parameters from ./configure]) ! ALLPARAMS="${ac_configure_args}" AC_SUBST(ALLPARAMS) AC_DEFINE_UNQUOTED(ALLPARAMS,"${ALLPARAMS}") |
|
From: Artur R. C. <ar...@us...> - 2005-02-16 15:09:25
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15576 Modified Files: configure.ac Log Message: removed politically incorect :> stuff Index: configure.ac =================================================================== RCS file: /cvsroot/lwatch/files/configure.ac,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** configure.ac 16 Feb 2005 14:52:35 -0000 1.50 --- configure.ac 16 Feb 2005 15:09:16 -0000 1.51 *************** *** 12,16 **** ALL_PARAMS="$*" - echo dupa AC_CANONICAL_BUILD --- 12,15 ---- |
|
From: Artur R. C. <ar...@us...> - 2005-02-16 14:52:44
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11079/src Modified Files: config.h.in settings.c Log Message: dumping ./configure flags when run with -v Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** settings.c 16 Feb 2005 14:05:40 -0000 1.30 --- settings.c 16 Feb 2005 14:52:35 -0000 1.31 *************** *** 50,53 **** --- 50,57 ---- int omit_config=0; + void show_configure_options() { + printf("\nCompiled with following ./configure options:\n" ALLPARAMS "\n"); + } + void show_licence() { int i; *************** *** 83,93 **** printf("%s\n",usage[i++]); } exit(0); } - void show_configure_options() { - printf("\nCompiled with some weird ./configure options\n"); - } - void show_usage() { int i; --- 87,94 ---- printf("%s\n",usage[i++]); } + show_configure_options(); exit(0); } void show_usage() { int i; *************** *** 95,99 **** "Options:", " -v, --version", ! "\tshow version and copyright notices", " -C, --config filename", "\tread config from filename instead of " DEF_CONF_FILE ",", --- 96,100 ---- "Options:", " -v, --version", ! "\tshow version, copyright notices and ./configure options", " -C, --config filename", "\tread config from filename instead of " DEF_CONF_FILE ",", Index: config.h.in =================================================================== RCS file: /cvsroot/lwatch/files/src/config.h.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** config.h.in 12 Jan 2004 11:17:55 -0000 1.16 --- config.h.in 16 Feb 2005 14:52:35 -0000 1.17 *************** *** 1,4 **** --- 1,7 ---- /* src/config.h.in. Generated from configure.ac by autoheader. */ + /* ./configure options */ + #undef ALLPARAMS + /* Define to 1 if you want to compile with debug support. */ #undef DEBUG |
