adaptations for rcs

diff --git a/Makefile.in b/Makefile.in
index f8289deff917eb0411c24f8dbd88cb0d7b623569..5edd3a627544808818d39d885494a987d3f3d1bc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,6 +2,8 @@
 # fcron's Makefile  ########
 ############################
 
+# $Id: Makefile.in,v 1.2 2000-05-15 18:28:58 thib Exp $
+
 # ********************************************************* #
 # *** Begin of configurable stuffs ************************ #
 
@@ -83,6 +85,9 @@ allow.o:  allow.c $(HEADERS)
        $(CC) $(CFLAGS) -c $<
 
 install: all
+
+       @echo -e "\ninstalling ...\n"
+
        $(INSTALL) -m 111 -o root -s fcron $(DESTSBIN)/
        $(INSTALL) -m 4111 -o root -s fcrontab $(DESTBIN)/
        $(INSTALL) -m 700 -o root files/fcron.allow $(ETC)/
@@ -91,40 +96,60 @@ install: all
        $(INSTALL) -m 644 -o root man/fcrontab.1 $(DESTMAN)/man1/
        $(INSTALL) -m 644 -o root man/fcrontab.5 $(DESTMAN)/man5/
        $(INSTALL) -m 644 -o root man/bitstring.3 $(DESTMAN)/man3/
-       ./sysVinit-install "$(CFLAGS)" $(INSTALL)
+       script/sysVinit-install "$(CFLAGS)" $(INSTALL)
        mkdir -p /usr/doc/fcron-$(VERSION)
-       $(INSTALL) -m 644 -o root doc/* /usr/doc/fcron-$(VERSION)/
+       cd doc; $(INSTALL) -m 644 -o root README LICENSE CHANGES *.html \
+                /usr/doc/fcron-$(VERSION)/
        mkdir -p $(FCRONTABS)
        chmod 700 $(FCRONTABS)
 
+       @echo -e "\n...done\n"
+
+
 uninstall:
        rm -f $(DESTSBIN)/fcron
-       ./sysVinit-uninstall
+       script/sysVinit-uninstall
 
 clean:
+       @echo -e "\ncleaning up ...\n"
+
        rm -f *.o
        rm -f fcron fcrontab
 
+       @echo -e "\n...done\n"
+
 vclean: clean
        find ./ -name "*~" -exec rm -f {} \;
        rm -f fcron*tar.gz
 
-doc-changes: doc/ man/
-       touch doc-changes
+need_make_doc:
+# force to do a part each time it is called if placed in its depencies.
+
+doc: need_make_doc
+       @echo -e "\nupdating docs ...\n"
+
+       ./script/gen-doc $(VERSION)
+
+       @echo -e "\n...done\n"
 
-doc: doc-changes
-       ./gen-doc $(VERSION)
-       touch doc-changes
 
 tar: vclean doc
 
-       @(find ./ -type f | sed -e "s:^\./:fcron-$(VERSION)/:" > MANIFEST)
+       @echo -e "\ncreating archive ...\n"
+
+       echo $(VERSION) > ./VERSION
+
+       @(find ./ -type f ! -regex '.*RCS.*' -exec ci -l {} \;)
+
+       @(find ./ -type f ! -regex '.*RCS.*' | sed -e "s:^\./:fcron-$(VERSION)/:" > MANIFEST)
        @(cd ..; ln -s fcron fcron-$(VERSION))
        (cd ..; tar -czvf fcron-$(VERSION).src.tar.gz `cat fcron/MANIFEST`)
        @(cd ..; rm -f fcron-$(VERSION))
 
        @(cd ..; cp -f fcron-$(VERSION).src.tar.gz old-fcron-pkg/)
-       @(cd ..; mv -f fcron-$(VERSION).src.tar.gz fcron/)
+
+       @echo -e "\n...done\n"
+
 
 
 

diff --git a/allow.c b/allow.c
index a8b0c737ef2a45dbc8f4219f6e6c1e6533a5f49c..4ad98dd0fd97ace6e4914117257e29b415dbd5d4 100644 (file)
--- a/allow.c
+++ b/allow.c
@@ -22,11 +22,10 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* ALLOW.C */
+ /* $Id: allow.c,v 1.2 2000-05-15 18:28:31 thib Exp $ */
 
 #include "fcrontab.h"
 
-
 int
 in_file(char *str, char *file)
     /* return -1 if file can't be opened

diff --git a/conf.c b/conf.c
index b8e7cc8a2bde4ad9926eb35a09ce2564b64f45ef..5cac124b5da1a921f2b935dcbf6fb1f8503622d2 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* CONF.C */
+ /* $Id: conf.c,v 1.2 2000-05-15 18:28:33 thib Exp $ */
 
 #include "fcron.h"
 

diff --git a/config.h.in b/config.h.in
index ca6298088c26ac4f87c4712beead20f5b4a5e97e..2e8b3fa007e8cf021752c432af1494f55bce5444 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* config.h */
+ /* $Id: config.h.in,v 1.2 2000-05-15 18:28:34 thib Exp $ */
 
 
 /* *********************************************************** */

diff --git a/database.c b/database.c
index 7e89314f78ddba2461b45a99010865674cc395df..d8ecf4b89de74ccb981a3f6d3621f0473f12eda4 100644 (file)
--- a/database.c
+++ b/database.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* DATABASE.C */
+ /* $Id: database.c,v 1.2 2000-05-15 18:28:36 thib Exp $ */
 
 #include "fcron.h"
 

diff --git a/fcron.c b/fcron.c
index 1cabd5e3f3e8cfd425ccc514207c4e748eba7d95..999b70ccff7f7b30580e8c21d7e2bd665f2d8d7d 100644 (file)
--- a/fcron.c
+++ b/fcron.c
@@ -21,10 +21,12 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* fcron.c */
+ /* $Id: fcron.c,v 1.2 2000-05-15 18:28:38 thib Exp $ */
 
 #include "fcron.h"
 
+char rcs_info[] = "$Id: fcron.c,v 1.2 2000-05-15 18:28:38 thib Exp $";
+
 void main_loop(void);
 void info(void);
 void usage(void);
@@ -56,12 +58,12 @@ info(void)
      * version, license */
 {
     fprintf(stderr,
+           "$Id: fcron.c,v 1.2 2000-05-15 18:28:38 thib Exp $\n"
            "fcron " VERSION " - periodic command scheduler\n"
            "Copyright 2000 Thibault Godouet <sphawk@free.fr>\n"
-           "This program is free software; you can redistribute it\n"
-           " and/or modify it under the terms of the GNU General Public\n"
-           " License. See file LICENSE distributed with this program\n"
-           " for more informations\n"
+           "This program is free software distributed\n"
+           "WITHOUT ANY WARRANTY.\n"
+            "See the GNU General Public License for more details.\n"
        );
 
     exit(EXIT_OK);

diff --git a/fcron.h b/fcron.h
index 80ab70e727a9841397a3eb316ab8f03f46625964..b67c6215588ddc98af1603c9b49d98bda6d75cb5 100644 (file)
--- a/fcron.h
+++ b/fcron.h
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* fcron.h */
+ /* $Id: fcron.h,v 1.2 2000-05-15 18:28:39 thib Exp $ */
 
 #ifndef __FCRONH__
 #define __FCRONH__

diff --git a/fcrontab.c b/fcrontab.c
index 3135d8b24b52f794ab9d991200b9831975808ac6..b3da212ca462901f3c6da96c93cdb30792a5c483 100644 (file)
--- a/fcrontab.c
+++ b/fcrontab.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* FCRONTAB.C */
+ /* $Id: fcrontab.c,v 1.2 2000-05-15 18:28:41 thib Exp $ */
 
 /* 
  * The goal of this program is simple : giving a user interface to fcron
@@ -42,6 +42,7 @@
 
 #include "fcrontab.h"
 
+char rcs_info[] = "$Id: fcrontab.c,v 1.2 2000-05-15 18:28:41 thib Exp $";
 
 void info(void);
 void usage(void);
@@ -78,12 +79,12 @@ info(void)
      * version, license */
 {
     fprintf(stderr,
+           "$Id: fcrontab.c,v 1.2 2000-05-15 18:28:41 thib Exp $\n"
            "fcrontab " VERSION " - user interface to daemon fcron\n"
            "Copyright 2000 Thibault Godouet <sphawk@free.fr>\n"
-           "This program is free software; you can redistribute it\n"
-           " and/or modify it under the terms of the GNU General Public\n"
-           " License. See file LICENSE distributed with this program\n"
-           " for more informations\n"
+           "This program is free software distributed\n"
+           "WITHOUT ANY WARRANTY.\n"
+            "See the GNU General Public License for more details.\n"
        );
 
     exit(EXIT_OK);

diff --git a/fcrontab.h b/fcrontab.h
index 0ddc3f4f5212f4c8250cce6d34a1e376ee1c7afc..57edce7bbc98ea9264eb598d55011e31d7d77f15 100644 (file)
--- a/fcrontab.h
+++ b/fcrontab.h
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* fcrontab.h */
+ /* $Id: fcrontab.h,v 1.2 2000-05-15 18:28:42 thib Exp $ */
 
 #ifndef __FCRONTABH__
 #define __FCRONTABH__

diff --git a/fileconf.c b/fileconf.c
index f5771af9bbbc10d06f54c20f8e13761526255f50..e50d6d754ac0d1d8cdf9561459505bec4e7c9a5d 100644 (file)
--- a/fileconf.c
+++ b/fileconf.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* FILECONF.C */
+ /* $Id: fileconf.c,v 1.2 2000-05-15 18:28:44 thib Exp $ */
 
 #include "fcrontab.h"
 

diff --git a/global.h b/global.h
index cab04f3329c2d8ef37063c4ba19ea31a0a55ef90..de8c78a5f84c67fa82324fca480bb5ac56e75d9c 100644 (file)
--- a/global.h
+++ b/global.h
@@ -21,8 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* global.h */
-
+ /* $Id: global.h,v 1.2 2000-05-15 18:28:53 thib Exp $ */
 
 #ifndef __GLOBALH__
 #define __GLOBALH__

diff --git a/job.c b/job.c
index 64537fa33c89486d802c034bba09e86a984d2d97..48e608595b03b51143e57f34560641797c093875 100644 (file)
--- a/job.c
+++ b/job.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* JOB.C */
+ /* $Id: job.c,v 1.2 2000-05-15 18:28:55 thib Exp $ */
 
 #include "fcron.h"
 

diff --git a/log.c b/log.c
index 19b4a78126a93412f6b1fd9ad064f3a53ed0846c..1e54c755fd8c5e524798f2eb8603ea3ea92bc76e 100644 (file)
--- a/log.c
+++ b/log.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* log.c */
+ /* $Id: log.c,v 1.2 2000-05-15 18:28:56 thib Exp $ */
 
 /* This code is inspired by Anacron's sources of
    Itai Tzur <itzur@actcom.co.il> ( thanks to him ) */

diff --git a/script/boot-install b/script/boot-install
index 1fefbf1b1e61342a6ed62c9acadb2b002f016451..6663c4c6567a7b471da9ef95557c64ae019fb442 100755 (executable)
--- a/script/boot-install
+++ b/script/boot-install
@@ -2,6 +2,8 @@
 # Install fcron under SysV system.
 #
 
+# $Id: boot-install,v 1.2 2000-05-15 18:28:24 thib Exp $
+
 # take two arguments : first is the compilation line arguments, in order
 #    to determine if fcron should be installed with debugs options,
 #    and the second is the name of the BSD-like install program
@@ -21,9 +23,9 @@ if test -f /etc/rc.d/rc.M; then
 else
 
     if echo $1 > grep "-DDEBUG"; then
-      $2 -m 755 -o root sysVinit-launcher-debug /etc/rc.d/init.d/fcron
+      $2 -m 755 -o root script/sysVinit-launcher-debug /etc/rc.d/init.d/fcron
     else
-      $2 -m 755 -o root sysVinit-launcher /etc/rc.d/init.d/fcron
+      $2 -m 755 -o root script/sysVinit-launcher /etc/rc.d/init.d/fcron
     fi
     
     cd /etc/rc.d/rc3.d/

diff --git a/script/boot-uninstall b/script/boot-uninstall
index 2b5e5e0c7b722b901f1d99650abe709a2c9412d3..623584b6588f5066b9544f2ad264897d539f6d0b 100755 (executable)
--- a/script/boot-uninstall
+++ b/script/boot-uninstall
@@ -2,6 +2,8 @@
 # Uninstall fcron under SysV system.
 #
 
+# $Id: boot-uninstall,v 1.2 2000-05-15 18:28:25 thib Exp $
+
 PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
 
 rm -f /etc/rc.d/init.d/fcron-debug

diff --git a/script/gen-doc b/script/gen-doc
index f543c6f97494dae10d1f538cfe4f6d257ae61a00..d5885198112087ce8094a1cfb61624d5228f00bd 100755 (executable)
--- a/script/gen-doc
+++ b/script/gen-doc
@@ -1,23 +1,49 @@
 #!/bin/sh
 
-cd man
-for i in *
-do
-  echo $i
-  sed -e "s:\"fcron version .* - .*\":\"fcron version $1 - `date +%D`\":" < $i > tmp
-  mv -f tmp $i
-  chown $USER $i
-  rm -f tmp
-  groff -Thtml -mandoc $i > ../doc/$i.html  
-done
+# $Id: gen-doc,v 1.2 2000-05-15 18:28:22 thib Exp $
+
+if test $UID -eq 0; then
+  su $USER
+fi
+
+PREVIOUS=`cat ./VERSION`
 
-cd ../doc
+
+if test $PREVIOUS != $1; then
+    cd man
+    for i in *
+    do
+    if test $i != RCS; then
+       echo $i
+       sed -e "s:fcron version .* :fcron version $1 :" < $i > tmp
+       mv -f tmp $i
+       rm -f tmp
+    fi
+    done
+    
+
+    cd ../doc
+    for i in *
+    do
+    if test $i != RCS; then
+       echo $i
+       sed -e "s:fcron version .* :fcron version $1 :" < $i > tmp
+       mv -f tmp $i
+       rm -f tmp
+    fi
+    done
+fi
+
+
+cd man
 for i in *
 do
-  echo $i
-  sed -e "s:<-- fcron version .* - .* -->:<-- fcron version $1 - `date +%D` -->:" < $i > tmp
-  mv -f tmp $i
-  chown $USER $i
-  rm -f tmp
+    if test $i != RCS; then
+       echo $i
+       groff -Thtml -mandoc $i > ./tmp
+       sed "s:<body>:<body BGCOLOR="\#000000" TEXT="\#FFFFFF">\
+           <h1>$i</h1><br>:I" < ./tmp > ../doc/$i.html
+       rm -f ./tmp
+    fi
 done
 

diff --git a/script/sysVinit-launcher b/script/sysVinit-launcher
index 211ad30b93efbf9ee626dd1d634085c77017656d..1249ced29c05829d9f61c5643cf11e503e7daa5f 100755 (executable)
--- a/script/sysVinit-launcher
+++ b/script/sysVinit-launcher
@@ -5,6 +5,8 @@
 # processname: fcron
 # config: /var/spool/fcron/*
 
+# $Id: sysVinit-launcher,v 1.2 2000-05-15 18:28:27 thib Exp $
+
 FUNCTION=0
 
 # Source function library.

diff --git a/subs.c b/subs.c
index e2bce1231d94b772bc481b88e4260b26d7537742..310ca2cf0faa73f5616b12cd597e45188a010677 100644 (file)
--- a/subs.c
+++ b/subs.c
@@ -22,7 +22,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
-/* SUBS.C */
+ /* $Id: subs.c,v 1.2 2000-05-15 18:28:59 thib Exp $ */
 
 #include "global.h"