OSSP CVS Repository

ossp - Check-in [2446]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 2446
Date: 2002-Jul-31 14:58:03 (local)
2002-Jul-31 12:58:03 (UTC)
User:thl
Branch:
Comment: now logging FSL version
Tickets:
Inspections:
Files:
ossp-pkg/fsl/Makefile.in      1.6 -> 1.7     5 inserted, 5 deleted
ossp-pkg/fsl/README      1.14 -> 1.15     1 inserted, 1 deleted
ossp-pkg/fsl/VERSION      1.13->removed
ossp-pkg/fsl/configure.ac      1.9 -> 1.10     7 inserted, 1 deleted
ossp-pkg/fsl/devtool.conf      1.8 -> 1.9     7 inserted, 8 deleted
ossp-pkg/fsl/fsl.c      1.42 -> 1.43     4 inserted, 1 deleted
ossp-pkg/fsl/fsl_version.c      added-> 1.1

ossp-pkg/fsl/Makefile.in 1.6 -> 1.7

--- Makefile.in  2002/07/27 18:13:51     1.6
+++ Makefile.in  2002/07/31 12:58:03     1.7
@@ -101,14 +101,14 @@
         @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(TST_NAME) $(TST_OBJS) $(LIB_NAME) $(LIBS)
 
 man: $(MAN_NAME)
-$(MAN_NAME): fsl.pod
-        V1=`$(SHTOOL) version -l txt -d short VERSION`; \
-        V2=`$(SHTOOL) version -l txt -d long VERSION`; \
+$(MAN_NAME): fsl.pod fsl_version.c
+        VS=`$(SHTOOL) version -lc -dshort fsl_version.c`; \
+        VL=`$(SHTOOL) version -lc -dlong fsl_version.c`; \
         D=`$(SHTOOL) version -l txt -d long VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \
         $(POD2MAN) --quotes=none \
                    --section=3 --center="Faking/Flexible Syslog Library" \
-                   --release="$$D" --date="OSSP fsl $$V1" fsl.pod | \
-        sed -e "s;FSL_VERSION_STR;$$V2;" -e "s;FSL_CFGDIR;$(FSL_CFGDIR);g" >fsl.3
+                   --release="$$D" --date="OSSP fsl $$VS" fsl.pod | \
+        sed -e "s;FSL_VERSION_STR;$$VL;" -e "s;FSL_CFGDIR;$(FSL_CFGDIR);g" >fsl.3
 
 check: $(TST_NAME)
         @$(LIBTOOL) --mode=execute ./$(TST_NAME)


ossp-pkg/fsl/README 1.14 -> 1.15

--- README       2002/07/30 18:50:36     1.14
+++ README       2002/07/31 12:58:03     1.15
@@ -5,7 +5,7 @@
   |_| |___/_|
              
   OSSP fsl - Faking/Flexible Syslog Library
-  Version 0.1.12 (30-Jul-2002)
+  Version 0.1.14 (31-Jul-2002)
 
   ABSTRACT
 


ossp-pkg/fsl/VERSION 1.13 -> 1.14



ossp-pkg/fsl/configure.ac 1.9 -> 1.10

--- configure.ac 2002/07/30 09:42:54     1.9
+++ configure.ac 2002/07/31 12:58:03     1.10
@@ -30,8 +30,14 @@
 
 AC_PREREQ(2.53)
 AC_INIT
+
+dnl #   announce our version
+V=`./shtool version -lc -dlong fsl_version.c`
+./shtool echo -e "Configuring %BOSSP fsl%b (Faking/Flexible Syslog Library), Version %B${V}%b"
+echo "Copyright (c) 2002 The OSSP Project <http://www.ossp.org/>"
+echo "Copyright (c) 2002 Cable & Wireless Deutschland <http://www.cw.com/de/>"
+
 FSL_VERSION_STR=`./shtool version -l txt -d long VERSION`
-./shtool echo -e "Configuring %BOSSP fsl%b (Faking/Flexible Syslog Library), version %B${FSL_VERSION_STR}%b"
 AC_SUBST(FSL_VERSION_STR)
 
 AC_PROG_MAKE_SET


ossp-pkg/fsl/devtool.conf 1.8 -> 1.9

--- devtool.conf 2002/07/28 08:04:25     1.8
+++ devtool.conf 2002/07/31 12:58:03     1.9
@@ -46,14 +46,13 @@
     ./devtool upload
 
 %version
-    ./shtool version -l txt -n "OSSP fsl" -e VERSION
-    V=`./shtool version -l txt -d long VERSION`
-    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n 
-    mv README.n README
-    cvs commit -m'bump version for release' VERSION README
+    ./shtool version -l c -n "OSSP fsl" -p "fsl_" -e fsl_version.c
+        V=`./shtool version -lc -dlong fsl_version.c`
+        sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
+    #cvs commit -m'bump version for release' README fsl_version.c
 
 %tag
-    V=`./shtool version -l txt -d short VERSION | sed -e 's;\.;_;g'`
+        V=`./shtool version -lc -dshort fsl_version.c` | sed -e 's;\.;_;g'`
     echo "+++ tagging CVS sources as FSL_${V}"
     cvs tag FSL_${V}
 
@@ -72,7 +71,7 @@
     echo "+++ fixing"
     ./shtool fixperm -v .
     echo "+++ rolling"
-    V=`./shtool version -l txt -d short VERSION`
+        V=`./shtool version -lc -dshort fsl_version.c`
     ./shtool tarball -o fsl-${V}.tar.gz -d fsl-${V} -u ossp -g ossp \
                      -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' .
     ls -l fsl-${V}.tar.gz
@@ -83,6 +82,6 @@
 
 %upload
     echo "+++ copying to ftp://ftp.ossp.org/pkg/lib/fsl/"
-    V=`./shtool version -l txt -d short VERSION`
+        V=`./shtool version -lc -dshort fsl_version.c`
     scp fsl-${V}.tar.gz master.ossp.org:/e/ossp/ftp/pkg/lib/fsl/
 


ossp-pkg/fsl/fsl.c 1.42 -> 1.43

--- fsl.c        2002/07/31 11:39:13     1.42
+++ fsl.c        2002/07/31 12:58:03     1.43
@@ -53,6 +53,9 @@
 /* autoconfiguration */
 #include "config.h"
 
+/* version */
+#include "fsl_version.c"
+
 /* pcre static vector size */
 #define OVECSIZE 30
 
@@ -693,7 +696,7 @@
     openfsldebug();
 
     /* tracing */
-    fsldebug(L2_LEVEL_TRACE, "openlog() ident=\"%s\", logopt=0x%.8lx, facility=0x%.8lx)", ident, logopt, facility);
+    fsldebug(L2_LEVEL_TRACE, "openlog() ident=\"%s\", logopt=0x%.8lx, facility=0x%.8lx; caught by FSL %s", ident, logopt, facility, fsl_version.v_gnu);
 
     /* remember logopt and handle unsupported values */
     ctx.logopt = logopt;


ossp-pkg/fsl/fsl_version.c -> 1.1

*** /dev/null    Mon Apr 29 11:45:10 2024
--- -    Mon Apr 29 11:45:10 2024
***************
*** 0 ****
--- 1,46 ----
+ /*
+ **  fsl_version.c -- Version Information for OSSP fsl (syntax: C/C++)
+ **  [automatically generated and maintained by GNU shtool]
+ */
+ 
+ #ifdef _FSL_VERSION_C_AS_HEADER_
+ 
+ #ifndef _FSL_VERSION_C_
+ #define _FSL_VERSION_C_
+ 
+ #define FSL_VERSION 0x00120E
+ 
+ typedef struct {
+     const int   v_hex;
+     const char *v_short;
+     const char *v_long;
+     const char *v_tex;
+     const char *v_gnu;
+     const char *v_web;
+     const char *v_sccs;
+     const char *v_rcs;
+ } fsl_version_t;
+ 
+ extern fsl_version_t fsl_version;
+ 
+ #endif /* _FSL_VERSION_C_ */
+ 
+ #else /* _FSL_VERSION_C_AS_HEADER_ */
+ 
+ #define _FSL_VERSION_C_AS_HEADER_
+ #include "fsl_version.c"
+ #undef  _FSL_VERSION_C_AS_HEADER_
+ 
+ fsl_version_t fsl_version = {
+     0x00120E,
+     "0.1.14",
+     "0.1.14 (31-Jul-2002)",
+     "This is OSSP fsl, Version 0.1.14 (31-Jul-2002)",
+     "OSSP fsl 0.1.14 (31-Jul-2002)",
+     "OSSP fsl/0.1.14",
+     "@(#)OSSP fsl 0.1.14 (31-Jul-2002)",
+     "$Id: fsl_version.c,v 1.1 2002/07/31 12:58:03 thl Exp $"
+ };
+ 
+ #endif /* _FSL_VERSION_C_AS_HEADER_ */
+ 

CVSTrac 2.0.1