Menu
▾
▴
bobs-cvs — CVS commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
(26) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(3) |
Feb
(38) |
Mar
(11) |
Apr
(38) |
May
(21) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2004 |
Jan
(8) |
Feb
(1) |
Mar
(21) |
Apr
(16) |
May
(9) |
Jun
(20) |
Jul
|
Aug
(19) |
Sep
|
Oct
(1) |
Nov
(2) |
Dec
|
| 2005 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(14) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:38
|
Update of /cvsroot/bobs/bobs/inc/templates In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/inc/templates Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- htmldir = $(myWEBDIR)/inc/templates dist_html_DATA = *.php *.sh uninstall-local: rmdir $(htmldir) |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:37
|
Update of /cvsroot/bobs/bobs/inc/servers In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/inc/servers Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- htmldir = $(myWEBDIR)/inc/servers dist_html_DATA = *.ini uninstall-local: rmdir $(htmldir) |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:37
|
Update of /cvsroot/bobs/bobs/inc In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/inc Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- SUBDIRS = excludes servers templates htmldir = $(myWEBDIR)/inc dist_html_DATA = *.php *.pinc *.ini uninstall-local: rmdir $(htmldir) |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:37
|
Update of /cvsroot/bobs/bobs/images/menu In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/images/menu Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- htmldir = $(myWEBDIR)/images/menu dist_html_DATA = *.gif *.png uninstall-local: rmdir $(htmldir) ## END |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:37
|
Update of /cvsroot/bobs/bobs/winc In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/winc Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- htmldir = $(myWEBDIR)/winc dist_html_DATA = *.html *.php uninstall-local: rmdir $(htmldir) |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:35
|
Update of /cvsroot/bobs/bobs/cron In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/cron Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- # install to cron directory crondir = $(myCRONDIR) dist_cron_SCRIPTS = backup.php # install to bobs script directory processdir = $(myBOBSDATA)/current/process dist_process_SCRIPTS = check_loop |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:35
|
Update of /cvsroot/bobs/bobs/images In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/images Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- SUBDIRS = bar menu htmldir = $(myWEBDIR)/images dist_html_DATA = *.gif uninstall-local: rmdir $(htmldir) ## END |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:35
|
Update of /cvsroot/bobs/bobs/doc In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/doc Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- # Also include these files in the distribution EXTRA_DIST = assign.php fileformat list.php |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:35
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs
Modified Files:
Makefile.am Makefile.in configure configure.in
Log Message:
Rewrite makefiles to use as much default processing as possible and
remove much custom code. There is now a Makefile.am in each subdirectory.
'make dist' now works.
Added option --with-crondir to help with rpm build. It uses DESTDIR
variable that rpm needs. The regular file backup.php is now put in the
cron directory instead of a link.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am 1 Dec 2002 03:14:37 -0000 1.7
+++ Makefile.am 22 Dec 2002 02:30:31 -0000 1.8
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
## (this file is processed with 'automake' to produce Makefile.in)
## The '##' comments will not appear in the Makefile
@@ -10,34 +10,24 @@
## a fresh build.
## This is how I am currently building it:
## aclocal;automake --add-missing;autoconf;./configure
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+## 12-18-2002 Joe Zacky
+## Use the pre-defined variables and such as much as possible.
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Install these directories and files in the html dir.
-## Any new directories or files to be included in the
-## distribution must be specified here.
+# Subdirectories to also be built
+# Each subdirectory has it's own Makefile.am
-HTMLDIRS = cron htmlinc \
- images images/bar images/menu \
- inc inc/excludes inc/servers \
- inc/templates \
- js winc
+SUBDIRS = bash doc cron images inc js winc
-HTMLDOCS = *.php *.css \
- cron/backup.php \
- images/*.gif \
- images/bar/*.gif \
- images/menu/*.gif \
- images/menu/*.png \
- inc/*.php \
- inc/*.pinc \
- inc/*.ini \
- inc/excludes/default.excludelist \
- inc/servers/*.ini \
- inc/templates/*.php \
- inc/templates/*.sh \
- js/*.js \
- winc/*.php \
- winc/*.html
+# Install html documents.
+# By using a variable htmldir, ending in 'dir'
+# I can use variable html_DATA to install data to that directory
+
+htmldir = $(myWEBDIR)
+
+# The 'dist_' prefix tells 'make dist' to distribute these files.
+
+dist_html_DATA = *.php *.css
#
# Other files to be removed for maintainer (me)
@@ -51,11 +41,7 @@
install-sh \
aclocal.m4
-cvs-clean: distclean
- rm -rf auto*.cache
-
-maintainer-clean-local:
- rm -rf auto*.cache
+.PHONY: uninstall-all
install-data-local:
@@ -63,35 +49,9 @@
# This section contains things to do during 'make install'
#
-# Create html documents directory
-
- ./mkinstalldirs $(myWEBDIR)
-
-# Create the html directories in the location
-# specified by '--with-webdir=DIR'
-
- for dir in $(HTMLDIRS); do \
- ./mkinstalldirs $(myWEBDIR)/$$dir; \
- done
-
-# Copy the html documents to their final destination
-
- for file in $(HTMLDOCS); do \
- $(INSTALL_PROGRAM) $$file $(myWEBDIR)/$$file; \
- done
-
-# Put a link to backup.php in /etc/cron.daily
-
- ln -s $(myWEBDIR)/cron/backup.php /etc/cron.daily/backup.php
-
# Create bobs data directories
- ./mkinstalldirs $(myBOBSDATA)
- ./mkinstalldirs $(myBOBSDATA)/current
- ./mkinstalldirs $(myBOBSDATA)/current/process
- ./mkinstalldirs $(myBOBSDATA)/current/process/cmd
- ./mkinstalldirs $(myBOBSDATA)/current/process/mounts
- ./mkinstalldirs $(myBOBSDATA)/current/process/session
+ ./mkinstalldirs $(myBOBSDATA)/current/process/{cmd,mounts,session}
# httpd process must be able to write to bobs data dirs
# and some html directories,
@@ -102,60 +62,28 @@
chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
-# Install command processing program and check_loop
-
- $(INSTALL_PROGRAM) bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
- $(INSTALL_PROGRAM) cron/check_loop $(myBOBSDATA)/current/process/check_loop
+# Remove some other crap for 'make distclean'
+distclean-local:
+ rm -rf auto*.cache
+# not enuf auth rm -rf $(PACKAGE)-$(VERSION)
+ rm -f $(PACKAGE)-$(VERSION).tar.gz
#
-# This will remove all the install directories - empty or not.
+# Extra stuff to uninstall
#
-uninstall-all: uninstall
- rm -rf $(myWEBDIR)
- rm -rf $(myBOBSDATA)
-
uninstall-local:
-
-#
-# This section contains things to do during 'make uninstall'
-#
-
-# Remove the cron backup job
-
- rm -f /etc/cron.daily/backup.php
-
-# Remove the html documents by name
-# so I don't delete something unintentionally.
-
- for file in $(HTMLDOCS); do \
- rm -f $(myWEBDIR)/$$file; \
- done
-
-# Remove the html directories if they're empty.
-# Reverse sort dir names to remove lowest branches first.
-
- for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
- rmdir $(myWEBDIR)/$$dir; \
- done
-
-# Now remove the 'bobs' html directory
-
- rmdir $(myWEBDIR)
-
-# Remove the bobs data files
-# Only remove the ones that 'make install' put there
-
- rm -f $(myBOBSDATA)/current/process/cmdloop
- rm -f $(myBOBSDATA)/current/process/check_loop
-
-# Remove the bobs data directories if empty
-
- rmdir $(myBOBSDATA)/current/process/session
- rmdir $(myBOBSDATA)/current/process/mounts
- rmdir $(myBOBSDATA)/current/process/cmd
+ rmdir $(htmldir)
+ rmdir $(myBOBSDATA)/current/process/{cmd,mounts,session}
rmdir $(myBOBSDATA)/current/process
rmdir $(myBOBSDATA)/current
rmdir $(myBOBSDATA)
+
+#
+# This will remove all the install directories - empty or not.
+#
+uninstall-all:
+ rm -rf $(myWEBDIR)
+ rm -rf $(myBOBSDATA)
## END
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.in 1 Dec 2002 03:14:37 -0000 1.4
+++ Makefile.in 22 Dec 2002 02:30:31 -0000 1.5
@@ -14,11 +14,12 @@
@SET_MAKE@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Install these directories and files in the html dir.
+# Subdirectories to also be built
+# Each subdirectory has it's own Makefile.am
SHELL = @SHELL@
srcdir = @srcdir@
@@ -80,34 +81,22 @@
am__quote = @am__quote@
install_sh = @install_sh@
myBOBSDATA = @myBOBSDATA@
+myCRONDIR = @myCRONDIR@
myHTTPDUSER = @myHTTPDUSER@
myPASS = @myPASS@
myWEBDIR = @myWEBDIR@
-HTMLDIRS = cron htmlinc \
- images images/bar images/menu \
- inc inc/excludes inc/servers \
- inc/templates \
- js winc
+SUBDIRS = bash doc cron images inc js winc
-HTMLDOCS = *.php *.css \
- cron/backup.php \
- images/*.gif \
- images/bar/*.gif \
- images/menu/*.gif \
- images/menu/*.png \
- inc/*.php \
- inc/*.pinc \
- inc/*.ini \
- inc/excludes/default.excludelist \
- inc/servers/*.ini \
- inc/templates/*.php \
- inc/templates/*.sh \
- js/*.js \
- winc/*.php \
- winc/*.html
+# Install html documents.
+# By using a variable htmldir, ending in 'dir'
+# I can use variable html_DATA to install data to that directory
+htmldir = $(myWEBDIR)
+
+# The 'dist_' prefix tells 'make dist' to distribute these files.
+dist_html_DATA = *.php *.css
#
@@ -124,12 +113,20 @@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = inc/config.php cron/backup.php cron/check_loop
+CONFIG_CLEAN_FILES =
DIST_SOURCES =
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS TODO aclocal.m4 configure configure.in \
- install-sh missing mkinstalldirs
-all: all-am
+DATA = $(dist_html_DATA)
+
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ uninstall-info-recursive all-recursive install-data-recursive \
+ install-exec-recursive installdirs-recursive install-recursive \
+ uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README $(dist_html_DATA) AUTHORS COPYING ChangeLog \
+ INSTALL Makefile.am Makefile.in NEWS TODO aclocal.m4 configure \
+ configure.in install-sh missing mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
.SUFFIXES:
@@ -148,16 +145,121 @@
$(ACLOCAL_M4): configure.in
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-inc/config.php: $(top_builddir)/config.status $(top_srcdir)/inc/config.php.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-cron/backup.php: $(top_builddir)/config.status $(top_srcdir)/cron/backup.php.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-cron/check_loop: $(top_builddir)/config.status $(top_srcdir)/cron/check_loop.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
uninstall-info-am:
+dist_htmlDATA_INSTALL = $(INSTALL_DATA)
+install-dist_htmlDATA: $(dist_html_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(htmldir)
+ @list='$(dist_html_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(dist_htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f"; \
+ $(dist_htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f; \
+ done
+
+uninstall-dist_htmlDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_html_DATA)'; for p in $$list; do \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
+ rm -f $(DESTDIR)$(htmldir)/$$f; \
+ done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+
+ETAGS = etags
+ETAGSFLAGS =
+
tags: TAGS
-TAGS:
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .
@@ -195,6 +297,19 @@
|| exit 1; \
fi; \
done
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" \
+ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -248,20 +363,21 @@
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+ $(mkinstalldirs) $(DESTDIR)$(htmldir)
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
@@ -278,60 +394,64 @@
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-local distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-info: info-am
+info: info-recursive
info-am:
-install-data-am: install-data-local
+install-data-am: install-data-local install-dist_htmlDATA
install-exec-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf autom4te.cache
-maintainer-clean-am: distclean-am maintainer-clean-generic \
- maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-dist_htmlDATA uninstall-info-am uninstall-local
-.PHONY: all all-am check check-am clean clean-generic dist dist-all \
- dist-gzip distcheck distclean distclean-generic distcleancheck \
- distdir dvi dvi-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic maintainer-clean-local mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am \
- uninstall-local
+uninstall-info: uninstall-info-recursive
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-recursive dist dist-all dist-gzip distcheck \
+ distclean distclean-generic distclean-local distclean-recursive \
+ distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \
+ info info-am info-recursive install install-am install-data \
+ install-data-am install-data-local install-data-recursive \
+ install-dist_htmlDATA install-exec install-exec-am \
+ install-exec-recursive install-info install-info-am \
+ install-info-recursive install-man install-recursive \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am installdirs-recursive maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+ mostlyclean-generic mostlyclean-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-dist_htmlDATA \
+ uninstall-info-am uninstall-info-recursive uninstall-local \
+ uninstall-recursive
-cvs-clean: distclean
- rm -rf auto*.cache
-maintainer-clean-local:
- rm -rf auto*.cache
+.PHONY: uninstall-all
install-data-local:
@@ -339,35 +459,9 @@
# This section contains things to do during 'make install'
#
-# Create html documents directory
-
- ./mkinstalldirs $(myWEBDIR)
-
-# Create the html directories in the location
-# specified by '--with-webdir=DIR'
-
- for dir in $(HTMLDIRS); do \
- ./mkinstalldirs $(myWEBDIR)/$$dir; \
- done
-
-# Copy the html documents to their final destination
-
- for file in $(HTMLDOCS); do \
- $(INSTALL_PROGRAM) $$file $(myWEBDIR)/$$file; \
- done
-
-# Put a link to backup.php in /etc/cron.daily
-
- ln -s $(myWEBDIR)/cron/backup.php /etc/cron.daily/backup.php
-
# Create bobs data directories
- ./mkinstalldirs $(myBOBSDATA)
- ./mkinstalldirs $(myBOBSDATA)/current
- ./mkinstalldirs $(myBOBSDATA)/current/process
- ./mkinstalldirs $(myBOBSDATA)/current/process/cmd
- ./mkinstalldirs $(myBOBSDATA)/current/process/mounts
- ./mkinstalldirs $(myBOBSDATA)/current/process/session
+ ./mkinstalldirs $(myBOBSDATA)/current/process/{cmd,mounts,session}
# httpd process must be able to write to bobs data dirs
# and some html directories,
@@ -378,60 +472,29 @@
chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
-# Install command processing program and check_loop
+# Remove some other crap for 'make distclean'
- $(INSTALL_PROGRAM) bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
- $(INSTALL_PROGRAM) cron/check_loop $(myBOBSDATA)/current/process/check_loop
+distclean-local:
+ rm -rf auto*.cache
+# not enuf auth rm -rf $(PACKAGE)-$(VERSION)
+ rm -f $(PACKAGE)-$(VERSION).tar.gz
#
-# This will remove all the install directories - empty or not.
+# Extra stuff to uninstall
#
-uninstall-all: uninstall
- rm -rf $(myWEBDIR)
- rm -rf $(myBOBSDATA)
-
uninstall-local:
-
-#
-# This section contains things to do during 'make uninstall'
-#
-
-# Remove the cron backup job
-
- rm -f /etc/cron.daily/backup.php
-
-# Remove the html documents by name
-# so I don't delete something unintentionally.
-
- for file in $(HTMLDOCS); do \
- rm -f $(myWEBDIR)/$$file; \
- done
-
-# Remove the html directories if they're empty.
-# Reverse sort dir names to remove lowest branches first.
-
- for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
- rmdir $(myWEBDIR)/$$dir; \
- done
-
-# Now remove the 'bobs' html directory
-
- rmdir $(myWEBDIR)
-
-# Remove the bobs data files
-# Only remove the ones that 'make install' put there
-
- rm -f $(myBOBSDATA)/current/process/cmdloop
- rm -f $(myBOBSDATA)/current/process/check_loop
-
-# Remove the bobs data directories if empty
-
- rmdir $(myBOBSDATA)/current/process/session
- rmdir $(myBOBSDATA)/current/process/mounts
- rmdir $(myBOBSDATA)/current/process/cmd
+ rmdir $(htmldir)
+ rmdir $(myBOBSDATA)/current/process/{cmd,mounts,session}
rmdir $(myBOBSDATA)/current/process
rmdir $(myBOBSDATA)/current
rmdir $(myBOBSDATA)
+
+#
+# This will remove all the install directories - empty or not.
+#
+uninstall-all:
+ rm -rf $(myWEBDIR)
+ rm -rf $(myBOBSDATA)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: configure
===================================================================
RCS file: /cvsroot/bobs/bobs/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure 1 Dec 2002 03:10:29 -0000 1.3
+++ configure 22 Dec 2002 02:30:31 -0000 1.4
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
+# Generated by GNU Autoconf 2.53 for bobs 0.5.1.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@@ -252,11 +252,11 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='bobs'
+PACKAGE_TARNAME='bobs'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='bobs 0.5.1'
+PACKAGE_BUGREPORT=''
ac_unique_file="admin.php"
@@ -703,7 +703,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures bobs 0.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -764,14 +764,17 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of bobs 0.5.1:";;
+ esac
cat <<\_ACEOF
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-webdir=DIR Place the bobs web pages in DIR
- --with-bobsdata=DIR Place the bobs data (backups) in DIR
+ --with-webdir=DIR Place the bobs web pages in DIR
+ --with-bobsdata=DIR Place the bobs data (backups) in DIR
+ --with-crondir=DIR Location of cron.daily directory
_ACEOF
fi
@@ -835,6 +838,8 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+bobs configure 0.5.1
+generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
@@ -848,7 +853,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by bobs $as_me 0.5.1, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -1118,6 +1123,15 @@
+
+
+
+
+
+
+
+
+
am__api_version="1.6"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1499,6 +1513,36 @@
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+all:
+ @echo 'ac_maketemp="${MAKE}"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+else
+ eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
WARNCOUNT=0
@@ -1575,6 +1619,16 @@
fi;
+
+# Check whether --with-crondir or --without-crondir was given.
+if test "${with_crondir+set}" = set; then
+ withval="$with_crondir"
+ myCRONDIR=${DESTDIR}${with_crondir}
+else
+ myCRONDIR=${DESTDIR}/etc/cron.daily
+fi;
+
+
echo "$as_me:$LINENO: checking for web server user id" >&5
echo $ECHO_N "checking for web server user id... $ECHO_C" >&6
@@ -1602,7 +1656,13 @@
-ac_config_files="$ac_config_files Makefile inc/config.php cron/backup.php cron/check_loop"
+
+
+
+ac_config_files="$ac_config_files Makefile bash/Makefile cron/Makefile doc/Makefile images/Makefile images/bar/Makefile images/menu/Makefile inc/Makefile inc/Makefile inc/excludes/Makefile inc/servers/Makefile inc/templates/Makefile js/Makefile winc/Makefile"
+
+
+ac_config_files="$ac_config_files inc/config.php cron/backup.php cron/check_loop"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -1959,7 +2019,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by bobs $as_me 0.5.1, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2013,7 +2073,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+bobs config.status 0.5.1
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -2101,6 +2161,19 @@
case "$ac_config_target" in
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "bash/Makefile" ) CONFIG_FILES="$CONFIG_FILES bash/Makefile" ;;
+ "cron/Makefile" ) CONFIG_FILES="$CONFIG_FILES cron/Makefile" ;;
+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "images/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
+ "images/bar/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/bar/Makefile" ;;
+ "images/menu/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/menu/Makefile" ;;
+ "inc/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/Makefile" ;;
+ "inc/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/Makefile" ;;
+ "inc/excludes/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/excludes/Makefile" ;;
+ "inc/servers/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/servers/Makefile" ;;
+ "inc/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/templates/Makefile" ;;
+ "js/Makefile" ) CONFIG_FILES="$CONFIG_FILES js/Makefile" ;;
+ "winc/Makefile" ) CONFIG_FILES="$CONFIG_FILES winc/Makefile" ;;
"inc/config.php" ) CONFIG_FILES="$CONFIG_FILES inc/config.php" ;;
"cron/backup.php" ) CONFIG_FILES="$CONFIG_FILES cron/backup.php" ;;
"cron/check_loop" ) CONFIG_FILES="$CONFIG_FILES cron/check_loop" ;;
@@ -2203,6 +2276,7 @@
s,@SET_MAKE@,$SET_MAKE,;t t
s,@myWEBDIR@,$myWEBDIR,;t t
s,@myBOBSDATA@,$myBOBSDATA,;t t
+s,@myCRONDIR@,$myCRONDIR,;t t
s,@myPASS@,$myPASS,;t t
s,@myHTTPDUSER@,$myHTTPDUSER,;t t
CEOF
@@ -2439,6 +2513,7 @@
Your configuration:
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ cron directory = $myCRONDIR
admin password = $myPASS
*** $WARNCOUNT warning(s)
Index: configure.in
===================================================================
RCS file: /cvsroot/bobs/bobs/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.in 1 Dec 2002 03:10:29 -0000 1.5
+++ configure.in 22 Dec 2002 02:30:32 -0000 1.6
@@ -5,6 +5,11 @@
dnl> 11-30-2002 Remove program checks. They no longer work right.
dnl> They should be done in 'make check' anyway.
dnl> 11-30-2002 Default admin password to 'admin'.
+dnl> 12-21-2002 Rewrite Makefiles to use SUBDIRS and as much
+dnl> default processing as possible.
+dnl> Get 'make dist' to work.
+dnl> This is how I am currently building the package:
+dnl> aclocal;autoconf;automake --add-missing;./configure
PACKAGE=bobs
VERSION=0.5.1
@@ -13,8 +18,12 @@
dnl> Verify we're in the right directory by looking for a unique file.
dnl>
-AC_INIT(admin.php)
-AM_INIT_AUTOMAKE(bobs, 0.5.1)
+AC_INIT(bobs, 0.5.1)
+AC_CONFIG_SRCDIR(admin.php)
+AM_INIT_AUTOMAKE
+
+dnl> Needed for SUBDIRS variable in Makefile.in
+AC_PROG_MAKE_SET
WARNCOUNT=0
@@ -23,7 +32,7 @@
dnl> If not specified --with-webdir, then look for the http root.
dnl>
-AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
+AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
myWEBDIR=${DESTDIR}$with_webdir/bobs,
[
AC_CHECK_FILE(/home/httpd/html,myDOCUMENTROOT=/home/httpd/html)
@@ -43,10 +52,19 @@
dnl> then default to /var/bobsdata.
dnl>
-AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
+AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
myBOBSDATA=${DESTDIR}${with_bobsdata}/bobsdata, myBOBSDATA=${DESTDIR}/var/bobsdata )
dnl>
+dnl> Set the location of the cron.daily directory
+dnl> If not specified with '--with-crondir=DIR',
+dnl> then default to /etc/cron.daily
+dnl>
+
+AC_ARG_WITH(crondir,[ --with-crondir=DIR Location of cron.daily directory ],
+ myCRONDIR=${DESTDIR}${with_crondir}, myCRONDIR=${DESTDIR}/etc/cron.daily )
+
+dnl>
dnl> Try to determine the user id of the web server.
dnl>
@@ -75,15 +93,34 @@
AC_SUBST(myWEBDIR)
AC_SUBST(myBOBSDATA)
+AC_SUBST(myCRONDIR)
AC_SUBST(myPASS)
AC_SUBST(myHTTPDUSER)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
dnl>
dnl> These are the files that will be created from their '.in' versions.
dnl>
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
+bash/Makefile
+cron/Makefile
+doc/Makefile
+images/Makefile
+images/bar/Makefile
+images/menu/Makefile
+inc/Makefile
+inc/Makefile
+inc/excludes/Makefile
+inc/servers/Makefile
+inc/templates/Makefile
+js/Makefile
+winc/Makefile
+])
+
+AC_OUTPUT([
inc/config.php
cron/backup.php
cron/check_loop
@@ -98,6 +135,7 @@
Your configuration:
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ cron directory = $myCRONDIR
admin password = $myPASS
*** $WARNCOUNT warning(s)
|
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:35
|
Update of /cvsroot/bobs/bobs/images/bar In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/images/bar Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- htmldir = $(myWEBDIR)/images/bar dist_html_DATA = *.gif uninstall-local: rmdir $(htmldir) ## END |
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:35
|
Update of /cvsroot/bobs/bobs/bash In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs/bash Added Files: Makefile.am Log Message: Rewrite makefiles to use as much default processing as possible and remove much custom code. There is now a Makefile.am in each subdirectory. 'make dist' now works. Added option --with-crondir to help with rpm build. It uses DESTDIR variable that rpm needs. The regular file backup.php is now put in the cron directory instead of a link. --- NEW FILE: Makefile.am --- # install to to bobs script directory processdir = $(myBOBSDATA)/current/process dist_process_SCRIPTS = cmdloop |
|
From: Joe Z. <jz...@us...> - 2002-12-22 01:56:08
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv4683/inc
Modified Files:
class_backup.php
Log Message:
Change relative links to template directory to use $siteroot instead.
Index: class_backup.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_backup.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- class_backup.php 2 Dec 2002 00:26:25 -0000 1.6
+++ class_backup.php 22 Dec 2002 01:56:05 -0000 1.7
@@ -224,7 +224,7 @@
}
$t = new rFastTemplate('.');
- $t->define (array('content' => '../inc/templates/backup_smb_mount_server.sh'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_smb_mount_server.sh'));
$t->assign ('MOUNTDIR', $mountdir);
$t->assign ('MOUNT_CMD', $mnt_command);
$t->assign ('SESSION_ID', $this->session_id);
@@ -245,7 +245,7 @@
$backup_cmd = 'rsync --archive --delete --backup --backup-dir="' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '" ';
$backup_cmd .= ' "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '/" "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"';
- $t->define (array('content' => '../inc/templates/backup_smb_backup_files.sh'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_smb_backup_files.sh'));
$t->assign ('MOUNTDIR', $mountdir);
$t->assign ('BACKUP_CMD', $backup_cmd);
$t->assign ('SESSION_ID', $this->session_id);
@@ -264,7 +264,7 @@
// if false delete lock file and report error to bobs.log
- $t->define (array('content' => '../inc/templates/backup_smb_unmount_server.sh'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_smb_unmount_server.sh'));
$t->assign ('MOUNTDIR', $mountdir);
$t->assign ('LOCKFILE', $lockfile);
$t->parse ('CONTENT', 'content');
@@ -305,7 +305,7 @@
}
$t = new rFastTemplate('.');
- $t->define (array('content' => '../inc/templates/backup_nfs_mount_server.sh'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_nfs_mount_server.sh'));
$t->assign ('MOUNTDIR', $mountdir);
$t->assign ('MOUNT_CMD', $mnt_command);
$t->assign ('SESSION_ID', $this->session_id);
@@ -328,7 +328,7 @@
$backup_cmd = 'rsync --archive --delete --backup --backup-dir="' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '" ';
$backup_cmd .= ' "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '/" "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"' . "\n";
- $t->define (array('content' => '../inc/templates/backup_nfs_backup_files.sh'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_nfs_backup_files.sh'));
$t->assign ('MOUNTDIR', $mountdir);
$t->assign ('BACKUP_CMD', $backup_cmd);
$t->assign ('SESSION_ID', $this->session_id);
@@ -347,7 +347,7 @@
// if false delete lock file and report error to bobs.log
- $t->define (array('content' => '../inc/templates/backup_smb_unmount_server.sh'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_smb_unmount_server.sh'));
$t->assign ('MOUNTDIR', $mountdir);
$t->assign ('LOCKFILE', $lockfile);
$t->parse ('CONTENT', 'content');
@@ -382,7 +382,7 @@
}
$t = new rFastTemplate('.');
- $t->define (array('content' => '../inc/templates/backup_increment_files.sh'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_increment_files.sh'));
$t->assign ('SRCDIR', $srcdir);
$t->assign ('DSTDIR', $dstdir);
$t->assign ('DATE', $date);
@@ -434,7 +434,7 @@
$root_dir = $filedir;
$t = new rFastTemplate('.');
- $t->define (array('content' => '../inc/templates/backup_create_databases.php'));
+ $t->define (array('content' => $this->siteroot . '/inc/templates/backup_create_databases.php'));
$t->assign ('FILE_DB', $file_db);
$t->assign ('DIR_DB', $dir_db);
$t->assign ('ROOT_DIR', $root_dir);
|
|
From: Joe Z. <jz...@us...> - 2002-12-22 01:54:55
|
Update of /cvsroot/bobs/bobs/cron In directory sc8-pr-cvs1:/tmp/cvs-serv4429/cron Modified Files: backup.php.in Log Message: Included class rfastemplate. Didn't work for me without it. Index: backup.php.in =================================================================== RCS file: /cvsroot/bobs/bobs/cron/backup.php.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- backup.php.in 1 Sep 2002 02:23:08 -0000 1.3 +++ backup.php.in 22 Dec 2002 01:54:51 -0000 1.4 @@ -11,6 +11,7 @@ require($siteroot . '/inc/class_server.php'); require($siteroot . '/inc/class_backup.php'); require($siteroot . '/inc/config.php'); +require($siteroot . '/inc/class_rfasttemplate.php'); session_start(); |
|
From: Rene R. <ren...@us...> - 2002-12-06 10:16:53
|
Update of /cvsroot/bobs/bobs/cron In directory sc8-pr-cvs1:/tmp/cvs-serv2503 Removed Files: check_loop Log Message: removed to make room for its configure counterpart --- check_loop DELETED --- |
|
From: Rene R. <ren...@us...> - 2002-12-06 10:15:44
|
Update of /cvsroot/bobs/bobs/cron In directory sc8-pr-cvs1:/tmp/cvs-serv344 Added Files: check_loop.in Log Message: Conigure needs this file --- NEW FILE: check_loop.in --- #!/bin/bash # # This script checks if the cmdloop script is running. If not it starts it. # This is a path that needs to be set! CMDLOOP_DIR='@myBOBSDATA@/current/process' CMDLOOP_PID=`/sbin/pidof -x $CMDLOOP_DIR/cmdloop` if [ "$CMDLOOP_PID" == "" ] then exec $CMDLOOP_DIR/cmdloop & fi exit 0 |
|
From: Rene R. <ren...@us...> - 2002-12-02 00:33:11
|
Update of /cvsroot/bobs/CVSROOT
In directory sc8-pr-cvs1:/tmp/cvs-serv29240
Modified Files:
loginfo
Log Message:
Change cvs mails to use unified diffs
Index: loginfo
===================================================================
RCS file: /cvsroot/bobs/CVSROOT/loginfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** loginfo 22 Oct 2002 18:46:46 -0000 1.4
--- loginfo 2 Dec 2002 00:33:06 -0000 1.5
***************
*** 25,27 ****
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
! DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} bob...@li...
--- 25,27 ----
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
! DEFAULT $CVSROOT/CVSROOT/syncmail -u %{sVv} bob...@li...
|
|
From: Rene R. <ren...@us...> - 2002-12-02 00:26:28
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv25180
Modified Files:
class_backup.php
Log Message:
Fix smb shares with spaces in the share name
Index: class_backup.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_backup.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class_backup.php 29 Oct 2002 03:15:41 -0000 1.5
--- class_backup.php 2 Dec 2002 00:26:25 -0000 1.6
***************
*** 219,225 ****
$mnt_command = 'mount -t smbfs -o username=' . $this->login . ',password=' . $this->password . ' ';
if ( $this->server_ip == '' ) {
! $mnt_command .= '//' . $this->server . '/' . $this->smb_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share;
} else {
! $mnt_command .= '//' . $this->server_ip . '/' . $this->smb_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share;
}
--- 219,225 ----
$mnt_command = 'mount -t smbfs -o username=' . $this->login . ',password=' . $this->password . ' ';
if ( $this->server_ip == '' ) {
! $mnt_command .= '"//' . $this->server . '/' . $this->smb_share . '" "' . $mountdir . '"';
} else {
! $mnt_command .= '"//' . $this->server_ip . '/' . $this->smb_share . '" "' . $mountdir . '"';
}
|
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:14:40
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv1550
Modified Files:
Makefile.am Makefile.in
Log Message:
Added more targets and tried to improve compatability.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am 29 Sep 2002 01:59:38 -0000 1.6
--- Makefile.am 1 Dec 2002 03:14:37 -0000 1.7
***************
*** 1,3 ****
!
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
--- 1,3 ----
! ## Process this file with automake to produce Makefile.in
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
***************
*** 5,16 ****
## The '##' comments will not appear in the Makefile
## Created June 2002, Joe Zacky
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- ## I want 'make clean' to remove the cached options to ./configure
-
- CLEANFILES = config.cache \
- cron/backup.php \
- inc/config.php
-
# Install these directories and files in the html dir.
## Any new directories or files to be included in the
--- 5,16 ----
## The '##' comments will not appear in the Makefile
## Created June 2002, Joe Zacky
+ ##
+ ## 11-30-2002 Joe Zacky
+ ## Added maintainer-clean section to remove all files for
+ ## a fresh build.
+ ## This is how I am currently building it:
+ ## aclocal;automake --add-missing;autoconf;./configure
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# Install these directories and files in the html dir.
## Any new directories or files to be included in the
***************
*** 20,23 ****
--- 20,24 ----
images images/bar images/menu \
inc inc/excludes inc/servers \
+ inc/templates \
js winc
***************
*** 33,52 ****
inc/excludes/default.excludelist \
inc/servers/*.ini \
js/*.js \
winc/*.php \
winc/*.html
install-data-local:
! #
! # This section contains things to do during 'make install'
! #
! # Create html documents directory
./mkinstalldirs $(myWEBDIR)
! # Create the html directories in the location
! # specified by '--with-webdir=DIR'
for dir in $(HTMLDIRS); do \
--- 34,73 ----
inc/excludes/default.excludelist \
inc/servers/*.ini \
+ inc/templates/*.php \
+ inc/templates/*.sh \
js/*.js \
winc/*.php \
winc/*.html
+ #
+ # Other files to be removed for maintainer (me)
+ #
+
+ MAINTAINERCLEANFILES = \
+ configure \
+ Makefile.in \
+ mkinstalldirs \
+ missing \
+ install-sh \
+ aclocal.m4
+
+ cvs-clean: distclean
+ rm -rf auto*.cache
+
+ maintainer-clean-local:
+ rm -rf auto*.cache
+
install-data-local:
! #
! # This section contains things to do during 'make install'
! #
! # Create html documents directory
./mkinstalldirs $(myWEBDIR)
! # Create the html directories in the location
! # specified by '--with-webdir=DIR'
for dir in $(HTMLDIRS); do \
***************
*** 54,68 ****
done
! # Copy the html documents to their final destination
for file in $(HTMLDOCS); do \
! cp $$file $(myWEBDIR)/$$file; \
done
! # backup.php must be executable
! chmod 755 $(myWEBDIR)/cron/backup.php
! # Create bobs data directories
./mkinstalldirs $(myBOBSDATA)
--- 75,89 ----
done
! # Copy the html documents to their final destination
for file in $(HTMLDOCS); do \
! $(INSTALL_PROGRAM) $$file $(myWEBDIR)/$$file; \
done
! # Put a link to backup.php in /etc/cron.daily
! ln -s $(myWEBDIR)/cron/backup.php /etc/cron.daily/backup.php
! # Create bobs data directories
./mkinstalldirs $(myBOBSDATA)
***************
*** 73,101 ****
./mkinstalldirs $(myBOBSDATA)/current/process/session
! # httpd process must be able to write to bobs data dirs
! # and some html directories,
! # so make the httpd process own the directory
if test -n "$(myHTTPDUSER)"; then \
! chown $(myHTTPDUSER) $(myBOBSDATA); \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process; \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process/cmd; \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process/mounts; \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process/session; \
! chown $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
! # Install command processing program
! cp bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
uninstall-local:
! #
! # This section contains things to do during 'make uninstall'
! #
! # Remove the html documents by name
! # so I don't delete something unintentionally.
for file in $(HTMLDOCS); do \
--- 94,131 ----
./mkinstalldirs $(myBOBSDATA)/current/process/session
! # httpd process must be able to write to bobs data dirs
! # and some html directories,
! # so make the httpd process own the directory
if test -n "$(myHTTPDUSER)"; then \
! chown -R $(myHTTPDUSER) $(myBOBSDATA); \
! chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
! # Install command processing program and check_loop
! $(INSTALL_PROGRAM) bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
! $(INSTALL_PROGRAM) cron/check_loop $(myBOBSDATA)/current/process/check_loop
!
!
! #
! # This will remove all the install directories - empty or not.
! #
! uninstall-all: uninstall
! rm -rf $(myWEBDIR)
! rm -rf $(myBOBSDATA)
uninstall-local:
! #
! # This section contains things to do during 'make uninstall'
! #
! # Remove the cron backup job
!
! rm -f /etc/cron.daily/backup.php
!
! # Remove the html documents by name
! # so I don't delete something unintentionally.
for file in $(HTMLDOCS); do \
***************
*** 103,108 ****
done
! # Remove the html directories if they're empty.
! # Reverse sort dir names to remove lowest branches first.
for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
--- 133,138 ----
done
! # Remove the html directories if they're empty.
! # Reverse sort dir names to remove lowest branches first.
for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
***************
*** 110,123 ****
done
! # Now remove the 'bobs' html directory
rmdir $(myWEBDIR)
! # Remove the bobs data files
! # Only remove the ones that 'make install' put there
rm -f $(myBOBSDATA)/current/process/cmdloop
! # Remove the bobs data directories if empty
rmdir $(myBOBSDATA)/current/process/session
--- 140,154 ----
done
! # Now remove the 'bobs' html directory
rmdir $(myWEBDIR)
! # Remove the bobs data files
! # Only remove the ones that 'make install' put there
rm -f $(myBOBSDATA)/current/process/cmdloop
+ rm -f $(myBOBSDATA)/current/process/check_loop
! # Remove the bobs data directories if empty
rmdir $(myBOBSDATA)/current/process/session
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in 29 Sep 2002 01:59:39 -0000 1.3
--- Makefile.in 1 Dec 2002 03:14:37 -0000 1.4
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,19 ****
# PARTICULAR PURPOSE.
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
!
SHELL = @SHELL@
--- 13,23 ----
# PARTICULAR PURPOSE.
+ @SET_MAKE@
+
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
! # Install these directories and files in the html dir.
SHELL = @SHELL@
***************
*** 36,46 ****
includedir = @includedir@
oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
--- 40,46 ----
***************
*** 50,59 ****
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 50,63 ----
AUTOHEADER = @AUTOHEADER@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 62,90 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_alias = @build_alias@
! build_triplet = @build@
! host_alias = @host_alias@
! host_triplet = @host@
! target_alias = @target_alias@
! target_triplet = @target@
myBOBSDATA = @myBOBSDATA@
- myHTTPD = @myHTTPD@
myHTTPDUSER = @myHTTPDUSER@
myPASS = @myPASS@
- myPHP = @myPHP@
- myPORTMAP = @myPORTMAP@
- myRSYNC = @myRSYNC@
myWEBDIR = @myWEBDIR@
- CLEANFILES = config.cache \
- cron/backup.php \
- inc/config.php
-
-
- # Install these directories and files in the html dir.
-
HTMLDIRS = cron htmlinc \
images images/bar images/menu \
inc inc/excludes inc/servers \
js winc
--- 66,92 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
!
! EXEEXT = @EXEEXT@
! OBJEXT = @OBJEXT@
! PATH_SEPARATOR = @PATH_SEPARATOR@
! AMTAR = @AMTAR@
! AWK = @AWK@
! DEPDIR = @DEPDIR@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
! PACKAGE = @PACKAGE@
! STRIP = @STRIP@
! VERSION = @VERSION@
! am__include = @am__include@
! am__quote = @am__quote@
! install_sh = @install_sh@
myBOBSDATA = @myBOBSDATA@
myHTTPDUSER = @myHTTPDUSER@
myPASS = @myPASS@
myWEBDIR = @myWEBDIR@
HTMLDIRS = cron htmlinc \
images images/bar images/menu \
inc inc/excludes inc/servers \
+ inc/templates \
js winc
***************
*** 101,142 ****
inc/excludes/default.excludelist \
inc/servers/*.ini \
js/*.js \
winc/*.php \
winc/*.html
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
- DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS TODO config.guess config.sub configure configure.in \
- install-sh missing mkinstalldirs
! PACKAGE = @PACKAGE@
! VERSION = @VERSION@
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- TAR = gtar
- GZIP_ENV = --best
- all: all-redirect
.SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
tags: TAGS
TAGS:
distdir = $(PACKAGE)-$(VERSION)
! top_distdir = $(distdir)
# This target untars the dist file and tries a VPATH configuration. Then
--- 103,211 ----
inc/excludes/default.excludelist \
inc/servers/*.ini \
+ inc/templates/*.php \
+ inc/templates/*.sh \
js/*.js \
winc/*.php \
winc/*.html
! #
! # Other files to be removed for maintainer (me)
! #
! MAINTAINERCLEANFILES = \
! configure \
! Makefile.in \
! mkinstalldirs \
! missing \
! install-sh \
! aclocal.m4
! subdir = .
! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES = inc/config.php cron/backup.php cron/check_loop
! DIST_SOURCES =
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS TODO aclocal.m4 configure configure.in \
! install-sh missing mkinstalldirs
! all: all-am
.SUFFIXES:
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
+
+ $(ACLOCAL_M4): configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ inc/config.php: $(top_builddir)/config.status $(top_srcdir)/inc/config.php.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ cron/backup.php: $(top_builddir)/config.status $(top_srcdir)/cron/backup.php.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ cron/check_loop: $(top_builddir)/config.status $(top_srcdir)/cron/check_loop.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ uninstall-info-am:
tags: TAGS
TAGS:
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ top_distdir = .
distdir = $(PACKAGE)-$(VERSION)
!
! am__remove_distdir = \
! { test ! -d $(distdir) \
! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
! && rm -fr $(distdir); }; }
!
! GZIP_ENV = --best
! distcleancheck_listfiles = find . -type f -print
!
! distdir: $(DISTFILES)
! $(am__remove_distdir)
! mkdir $(distdir)
! $(mkinstalldirs) $(distdir)/cron $(distdir)/inc
! @list='$(DISTFILES)'; for file in $$list; do \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
! if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
! else \
! test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
! fi; \
! done
! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
***************
*** 144,154 ****
# tarfile.
distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
--- 213,226 ----
# tarfile.
distcheck: dist
! $(am__remove_distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
! chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
! && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
***************
*** 156,269 ****
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! distdir: $(DISTFILES)
! -rm -rf $(distdir)
! mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
! if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
! else \
! test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
! fi; \
! done
! info-am:
! info: info-am
! dvi-am:
! dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am:
! install-exec: install-exec-am
! install-data-am: install-data-local
! install-data: install-data-am
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
! uninstall-am: uninstall-local
uninstall: uninstall-am
- all-am: Makefile
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-generic clean-am
! distclean: distclean-am
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! -rm -f config.status
! .PHONY: tags distdir info-am info dvi-am dvi check check-am \
! installcheck-am installcheck install-exec-am install-exec \
! install-data-local install-data-am install-data install-am install \
! uninstall-local uninstall-am uninstall all-redirect all-am all \
! installdirs mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
install-data-local:
! #
! # This section contains things to do during 'make install'
! #
! # Create html documents directory
./mkinstalldirs $(myWEBDIR)
! # Create the html directories in the location
! # specified by '--with-webdir=DIR'
for dir in $(HTMLDIRS); do \
--- 228,349 ----
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || { echo "ERROR: files left after uninstall:" ; \
! find $$dc_install_base -type f -print ; \
! exit 1; } >&2 ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! && rm -f $(distdir).tar.gz \
! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! $(am__remove_distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
! distcleancheck: distclean
! if test '$(srcdir)' = . ; then \
! echo "ERROR: distcleancheck can only run from a VPATH build" ; \
! exit 1 ; \
! fi
! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! || { echo "ERROR: files left after distclean:" ; \
! $(distcleancheck_listfiles) ; \
! exit 1; } >&2
check-am: all-am
check: check-am
! all-am: Makefile
! installdirs:
install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
uninstall: uninstall-am
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
! clean: clean-am
! clean-am: clean-generic mostlyclean-am
! distclean: distclean-am
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! distclean-am: clean-am distclean-generic
! dvi: dvi-am
! dvi-am:
! info: info-am
! info-am:
!
! install-data-am: install-data-local
!
! install-exec-am:
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf autom4te.cache
! maintainer-clean-am: distclean-am maintainer-clean-generic \
! maintainer-clean-local
! mostlyclean: mostlyclean-am
+ mostlyclean-am: mostlyclean-generic
+
+ uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic dist dist-all \
+ dist-gzip distcheck distclean distclean-generic distcleancheck \
+ distdir dvi dvi-am info info-am install install-am install-data \
+ install-data-am install-data-local install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic maintainer-clean-local mostlyclean \
+ mostlyclean-generic uninstall uninstall-am uninstall-info-am \
+ uninstall-local
+
+
+ cvs-clean: distclean
+ rm -rf auto*.cache
+
+ maintainer-clean-local:
+ rm -rf auto*.cache
install-data-local:
! #
! # This section contains things to do during 'make install'
! #
! # Create html documents directory
./mkinstalldirs $(myWEBDIR)
! # Create the html directories in the location
! # specified by '--with-webdir=DIR'
for dir in $(HTMLDIRS); do \
***************
*** 271,285 ****
done
! # Copy the html documents to their final destination
for file in $(HTMLDOCS); do \
! cp $$file $(myWEBDIR)/$$file; \
done
! # backup.php must be executable
! chmod 755 $(myWEBDIR)/cron/backup.php
! # Create bobs data directories
./mkinstalldirs $(myBOBSDATA)
--- 351,365 ----
done
! # Copy the html documents to their final destination
for file in $(HTMLDOCS); do \
! $(INSTALL_PROGRAM) $$file $(myWEBDIR)/$$file; \
done
! # Put a link to backup.php in /etc/cron.daily
! ln -s $(myWEBDIR)/cron/backup.php /etc/cron.daily/backup.php
! # Create bobs data directories
./mkinstalldirs $(myBOBSDATA)
***************
*** 290,318 ****
./mkinstalldirs $(myBOBSDATA)/current/process/session
! # httpd process must be able to write to bobs data dirs
! # and some html directories,
! # so make the httpd process own the directory
if test -n "$(myHTTPDUSER)"; then \
! chown $(myHTTPDUSER) $(myBOBSDATA); \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process; \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process/cmd; \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process/mounts; \
! chown $(myHTTPDUSER) $(myBOBSDATA)/current/process/session; \
! chown $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
! # Install command processing program
! cp bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
uninstall-local:
! #
! # This section contains things to do during 'make uninstall'
! #
! # Remove the html documents by name
! # so I don't delete something unintentionally.
for file in $(HTMLDOCS); do \
--- 370,406 ----
./mkinstalldirs $(myBOBSDATA)/current/process/session
! # httpd process must be able to write to bobs data dirs
! # and some html directories,
! # so make the httpd process own the directory
if test -n "$(myHTTPDUSER)"; then \
! chown -R $(myHTTPDUSER) $(myBOBSDATA); \
! chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
! # Install command processing program and check_loop
! $(INSTALL_PROGRAM) bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
! $(INSTALL_PROGRAM) cron/check_loop $(myBOBSDATA)/current/process/check_loop
!
! #
! # This will remove all the install directories - empty or not.
! #
! uninstall-all: uninstall
! rm -rf $(myWEBDIR)
! rm -rf $(myBOBSDATA)
uninstall-local:
! #
! # This section contains things to do during 'make uninstall'
! #
! # Remove the cron backup job
!
! rm -f /etc/cron.daily/backup.php
!
! # Remove the html documents by name
! # so I don't delete something unintentionally.
for file in $(HTMLDOCS); do \
***************
*** 320,325 ****
done
! # Remove the html directories if they're empty.
! # Reverse sort dir names to remove lowest branches first.
for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
--- 408,413 ----
done
! # Remove the html directories if they're empty.
! # Reverse sort dir names to remove lowest branches first.
for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
***************
*** 327,340 ****
done
! # Now remove the 'bobs' html directory
rmdir $(myWEBDIR)
! # Remove the bobs data files
! # Only remove the ones that 'make install' put there
rm -f $(myBOBSDATA)/current/process/cmdloop
! # Remove the bobs data directories if empty
rmdir $(myBOBSDATA)/current/process/session
--- 415,429 ----
done
! # Now remove the 'bobs' html directory
rmdir $(myWEBDIR)
! # Remove the bobs data files
! # Only remove the ones that 'make install' put there
rm -f $(myBOBSDATA)/current/process/cmdloop
+ rm -f $(myBOBSDATA)/current/process/check_loop
! # Remove the bobs data directories if empty
rmdir $(myBOBSDATA)/current/process/session
***************
*** 344,348 ****
rmdir $(myBOBSDATA)/current
rmdir $(myBOBSDATA)
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- 433,436 ----
|
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:13:22
|
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1:/tmp/cvs-serv1055 Modified Files: INSTALL Log Message: Changed notes on admin password. Index: INSTALL =================================================================== RCS file: /cvsroot/bobs/bobs/INSTALL,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** INSTALL 14 Sep 2002 14:24:29 -0000 1.15 --- INSTALL 1 Dec 2002 03:13:19 -0000 1.16 *************** *** 213,217 **** --with-webdir=DIR Place the bobs web pages in DIR ! --with-bobsdata=DIR Place the bobs data (backups) in DIR For example, if you want your web pages placed in /home/fred/public_html, --- 213,217 ---- --with-webdir=DIR Place the bobs web pages in DIR ! --with-bobsdata=DIR Place the bobs data (backups) in DIR For example, if you want your web pages placed in /home/fred/public_html, *************** *** 226,234 **** on your distribution. ! The default data directory is /usr/local/share. ! ./configure will also ask you for an admin password. This password will control ! access to the bobs/admin.php web page and will be stored in plain text ! in bobs/inc/config.php. Type the password you want to use. 3. After running ./configure, run --- 226,234 ---- on your distribution. ! The default data directory is /var/bobsdata. ! FIXME: ! ./configure will also store a plain text password in inc/config.php. ! This password will control access to the bobs/admin.php web page. 3. After running ./configure, run *************** *** 238,241 **** --- 238,246 ---- This will copy the web pages and create the backup data directories. + FIXME: + You should now change the bobs admin password. The password defaults + to 'admin'. Open the file inc/config.php and change the value of the + admin_pwd variable. + 4. If you want to uninstall bobs, or change your configuration: *************** *** 249,254 **** these commands from the bobs distribution directory: ! rm config.status ! rm config.cache autoconf automake --add-missing --- 254,259 ---- these commands from the bobs distribution directory: ! make distclean ! aclocal autoconf automake --add-missing |
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:11:23
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv32016
Modified Files:
install-sh missing mkinstalldirs
Log Message:
Newest 'make' files.
Index: install-sh
===================================================================
RCS file: /cvsroot/bobs/bobs/install-sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install-sh 15 Jun 2002 07:00:52 -0000 1.1
--- install-sh 1 Dec 2002 03:11:19 -0000 1.2
***************
*** 110,114 ****
exit 1
else
! true
fi
--- 110,114 ----
exit 1
else
! :
fi
***************
*** 121,125 ****
chmodcmd=""
else
! instcmd=mkdir
fi
else
--- 121,125 ----
chmodcmd=""
else
! instcmd=$mkdirprog
fi
else
***************
*** 129,135 ****
# if $src (and thus $dsttmp) contains '*'.
! if [ -f $src -o -d $src ]
then
! true
else
echo "install: $src does not exist"
--- 129,135 ----
# if $src (and thus $dsttmp) contains '*'.
! if [ -f "$src" ] || [ -d "$src" ]
then
! :
else
echo "install: $src does not exist"
***************
*** 142,146 ****
exit 1
else
! true
fi
--- 142,146 ----
exit 1
else
! :
fi
***************
*** 152,156 ****
dst="$dst"/`basename $src`
else
! true
fi
fi
--- 152,156 ----
dst="$dst"/`basename $src`
else
! :
fi
fi
***************
*** 164,169 ****
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
! defaultIFS='
! '
IFS="${IFS-${defaultIFS}}"
--- 164,169 ----
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
! defaultIFS='
! '
IFS="${IFS-${defaultIFS}}"
***************
*** 184,188 ****
$mkdirprog "${pathcomp}"
else
! true
fi
--- 184,188 ----
$mkdirprog "${pathcomp}"
else
! :
fi
***************
*** 195,202 ****
$doit $instcmd $dst &&
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else
--- 195,202 ----
$doit $instcmd $dst &&
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
else
***************
*** 217,221 ****
dstfile=`basename $dst`
else
! true
fi
--- 217,221 ----
dstfile=`basename $dst`
else
! :
fi
***************
*** 236,243 ****
# errors from the above "$doit $instcmd $src $dsttmp" command.
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
--- 236,243 ----
# errors from the above "$doit $instcmd $src $dsttmp" command.
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
# Now rename the file to the real destination.
Index: missing
===================================================================
RCS file: /cvsroot/bobs/bobs/missing,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** missing 15 Jun 2002 07:00:52 -0000 1.1
--- missing 1 Dec 2002 03:11:19 -0000 1.2
***************
*** 1,6 ****
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
! # Franc,ois Pinard <pi...@ir...>, 1996.
# This program is free software; you can redistribute it and/or modify
--- 1,6 ----
#! /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.
# This program is free software; you can redistribute it and/or modify
***************
*** 19,22 ****
--- 19,27 ----
# 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
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
***************
*** 24,30 ****
fi
# In the cases where this matters, `missing' is being run in the
# srcdir already.
! if test -f configure.in; then
configure_ac=configure.ac
else
--- 29,37 ----
fi
+ run=:
+
# In the cases where this matters, `missing' is being run in the
# srcdir already.
! if test -f configure.ac; then
configure_ac=configure.ac
else
***************
*** 33,36 ****
--- 40,54 ----
case "$1" in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ 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)
***************
*** 44,47 ****
--- 62,66 ----
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
***************
*** 52,62 ****
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing - GNU libit 0.0"
;;
--- 71,83 ----
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
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"
;;
***************
*** 67,74 ****
;;
! aclocal)
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
any GNU archive site."
--- 88,100 ----
;;
! 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
any GNU archive site."
***************
*** 77,83 ****
autoconf)
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
archive site."
--- 103,114 ----
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
archive site."
***************
*** 86,95 ****
autoheader)
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
from any GNU archive site."
! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
test -z "$files" && files="config.h"
touch_files=
--- 117,131 ----
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
from any GNU archive site."
! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
***************
*** 104,111 ****
;;
! automake)
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.
Grab them from any GNU archive site."
--- 140,152 ----
;;
! 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.
Grab them from any GNU archive site."
***************
*** 115,118 ****
--- 156,187 ----
;;
+ 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
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
bison|yacc)
echo 1>&2 "\
***************
*** 168,172 ****
--- 237,271 ----
;;
+ 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
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
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
***************
*** 182,185 ****
--- 281,323 ----
fi
touch $file
+ ;;
+
+ 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.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+ WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
;;
Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/bobs/bobs/mkinstalldirs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mkinstalldirs 15 Jun 2002 07:00:52 -0000 1.1
--- mkinstalldirs 1 Dec 2002 03:11:19 -0000 1.2
***************
*** 5,11 ****
# Public domain
- # $Id$
-
errstatus=0
for file
--- 5,55 ----
# Public domain
errstatus=0
+ dirmode=""
+
+ usage="\
+ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+ # process command line arguments
+ while test $# -gt 0 ; do
+ case "${1}" in
+ -h | --help | --h* ) # -h for help
+ echo "${usage}" 1>&2; exit 0 ;;
+ -m ) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+ dirmode="${1}"
+ shift ;;
+ -- ) shift; break ;; # stop option processing
+ -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
+ * ) break ;; # first non-opt arg
+ esac
+ done
+
+ for file
+ do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+ done
+
+ case $# in
+ 0) exit 0 ;;
+ 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 ;;
+ esac
for file
***************
*** 23,33 ****
if test ! -d "$pathcomp"; then
! echo "mkdir $pathcomp"
! mkdir "$pathcomp" || lasterr=$?
! if test ! -d "$pathcomp"; then
! errstatus=$lasterr
! fi
fi
--- 67,88 ----
if test ! -d "$pathcomp"; then
! echo "mkdir $pathcomp"
! mkdir "$pathcomp" || lasterr=$?
! 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
***************
*** 38,40 ****
--- 93,99 ----
exit $errstatus
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 3
+ # End:
# mkinstalldirs ends here
|
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:10:32
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv31428
Modified Files:
configure configure.in
Log Message:
Changes to install dirs and more.
Index: configure
===================================================================
RCS file: /cvsroot/bobs/bobs/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure 25 Jun 2002 03:31:59 -0000 1.2
--- configure 1 Dec 2002 03:10:29 -0000 1.3
***************
*** 1,29 ****
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13
! # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
! # Defaults:
[...3814 lines suppressed...]
! # need to make the FD available again.
! if test "$no_create" != yes; then
! ac_cs_success=:
! exec 5>/dev/null
! $SHELL $CONFIG_STATUS || ac_cs_success=false
! exec 5>>config.log
! # Use ||, not &&, to avoid exiting from the if with $? = 1, which
! # would make configure fail if this is the last instruction.
! $ac_cs_success || { (exit 1); exit 1; }
! fi
***************
*** 1536,1539 ****
--- 2440,2444 ----
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ admin password = $myPASS
*** $WARNCOUNT warning(s)
Index: configure.in
===================================================================
RCS file: /cvsroot/bobs/bobs/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.in 24 Jun 2002 03:55:15 -0000 1.4
--- configure.in 1 Dec 2002 03:10:29 -0000 1.5
***************
*** 2,87 ****
dnl> Author: Joe Zacky, June 2002
-
- dnl>
- dnl> Verify we're in the right directory by looking for a unique file.
dnl>
!
! AC_INIT(admin.php)
PACKAGE=bobs
VERSION=0.5.1
- WARNCOUNT=0
-
- echo
- echo "Welcome to $PACKAGE, Version $VERSION"
- echo
-
- dnl>
- dnl> make the system type available to `configure' scripts.
- dnl>
-
- AC_CANONICAL_SYSTEM
-
- dnl>
- dnl> Perform program name transformation
- dnl>
- dnl AC_ARG_PROGRAM
-
dnl>
! dnl> Need AC_PROG_MAKE_SET because package dir is not flat
! dnl>
!
! AC_PROG_MAKE_SET
!
! dnl **
! dnl ** Checks for programs.
! dnl **
!
! AC_PROG_INSTALL
!
! dnl>
! dnl> Determine if an http server is installed
! dnl>
!
! AC_PATH_PROG(myHTTPD, httpd, , $PATH:/sbin:/usr/sbin)
! if test -z "$myHTTPD"; then
! AC_MSG_WARN("*** httpd is not in path $PATH:/sbin:/usr/sbin")
! AC_MSG_WARN("*** I can\'t find your web server.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
!
! dnl>
! dnl> Determine if php is installed
! dnl>
!
! AC_PATH_PROG(myPHP, php, , $PATH)
! if test -z "$myPHP"; then
! AC_MSG_WARN("*** php is not in path $PATH")
! AC_MSG_WARN("*** I can\'t find php.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
!
! dnl>
! dnl> Determine if portmap is installed.
dnl>
! AC_PATH_PROG(myPORTMAP, portmap, , $PATH:/sbin:/usr/sbin)
! if test -z "$myPORTMAP"; then
! AC_MSG_WARN("*** portmap is not in path $PATH:/sbin:/usr/sbin")
! AC_MSG_WARN("*** I can\'t find portmap.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
!
! dnl>
! dnl> Determine if rsync is installed.
! dnl>
! AC_PATH_PROG(myRSYNC, rsync, , $PATH:/sbin:/usr/sbin)
! if test -z "$myRSYNC"; then
! AC_MSG_WARN("*** rsync is not in path $PATH:/sbin:/usr/sbin")
! AC_MSG_WARN("*** I can\'t find rsync.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
dnl>
--- 2,21 ----
dnl> Author: Joe Zacky, June 2002
dnl>
! dnl> 11-30-2002 Remove program checks. They no longer work right.
! dnl> They should be done in 'make check' anyway.
! dnl> 11-30-2002 Default admin password to 'admin'.
PACKAGE=bobs
VERSION=0.5.1
dnl>
! dnl> Verify we're in the right directory by looking for a unique file.
dnl>
! AC_INIT(admin.php)
! AM_INIT_AUTOMAKE(bobs, 0.5.1)
! WARNCOUNT=0
dnl>
***************
*** 91,95 ****
AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
! myWEBDIR=$with_webdir/bobs,
[
AC_CHECK_FILE(/home/httpd/html,myDOCUMENTROOT=/home/httpd/html)
--- 25,29 ----
AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
! myWEBDIR=${DESTDIR}$with_webdir/bobs,
[
AC_CHECK_FILE(/home/httpd/html,myDOCUMENTROOT=/home/httpd/html)
***************
*** 99,103 ****
AC_MSG_ERROR("*** Please use the --with-webdir=DIR configuration option.")
else
! myWEBDIR=${myDOCUMENTROOT}/bobs
fi
]
--- 33,37 ----
AC_MSG_ERROR("*** Please use the --with-webdir=DIR configuration option.")
else
! myWEBDIR=${DESTDIR}${myDOCUMENTROOT}/bobs
fi
]
***************
*** 107,115 ****
dnl> Set the location to store bobs data.
dnl> If not specified with '--with-bobsdata=DIR',
! dnl> then default to /usr/local/share/bobsdata.
dnl>
AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
! myBOBSDATA=${with_bobsdata}/bobsdata, myBOBSDATA=/usr/local/share/bobsdata )
dnl>
--- 41,49 ----
dnl> Set the location to store bobs data.
dnl> If not specified with '--with-bobsdata=DIR',
! dnl> then default to /var/bobsdata.
dnl>
AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
! myBOBSDATA=${DESTDIR}${with_bobsdata}/bobsdata, myBOBSDATA=${DESTDIR}/var/bobsdata )
dnl>
***************
*** 117,121 ****
dnl>
! AC_MSG_CHECKING("for web server user id")
if PSOUTPUT=$(ps -C httpd -o user,rgroup,pid,ucomm --sort pid); then
--- 51,55 ----
dnl>
! AC_MSG_CHECKING(for web server user id)
if PSOUTPUT=$(ps -C httpd -o user,rgroup,pid,ucomm --sort pid); then
***************
*** 133,140 ****
dnl>
! echo ""
! echo "Now you need to set a password for bobs adminstrator."
! while test -z "$myPASS"; do read -s -p "bobs admin password: " myPASS; done
! echo ""
dnl>
--- 67,71 ----
dnl>
! myPASS=admin
dnl>
***************
*** 156,159 ****
--- 87,91 ----
inc/config.php
cron/backup.php
+ cron/check_loop
])
***************
*** 167,170 ****
--- 99,103 ----
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ admin password = $myPASS
*** $WARNCOUNT warning(s)
|
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:08:45
|
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1:/tmp/cvs-serv30078 Removed Files: config.sub Log Message: The new 'make' process doesn't seem to need this file anymore. --- config.sub DELETED --- |
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:08:15
|
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1:/tmp/cvs-serv29248 Removed Files: config.guess Log Message: The new 'make' process doesn't seem to need this file anymore. --- config.guess DELETED --- |
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:06:52
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv27604
Added Files:
aclocal.m4
Log Message:
The 'make' process seems to require this now.
--- NEW FILE: aclocal.m4 ---
# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# Do all the work for Automake. -*- Autoconf -*-
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 8
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
AC_PREREQ([2.52])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
# The call with PACKAGE and VERSION arguments is the old style
# call (pre autoconf-2.50), which is being phased out. PACKAGE
# and VERSION should now be passed to AC_INIT and removed from
# the call to AM_INIT_AUTOMAKE.
# We support both call styles for the transition. After
# the next Automake release, Autoconf can make the AC_INIT
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
_AM_IF_OPTION([no-define],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_MISSING_PROG(AMTAR, tar)
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_][CC],
[_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC],
defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_][CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_][CXX],
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
])
# Copyright 2002 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.6.3])])
# Helper functions for option handling. -*- Autoconf -*-
# Copyright 2001, 2002 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
# ------------------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
#
# Check to make sure that the build environment is sane.
#
# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 3
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
&& test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
alias in your environment])
fi
test "$[2]" = conftest.file
)
then
# Ok.
:
else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
AC_MSG_RESULT(yes)])
# -*- Autoconf -*-
# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 3
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
[AC_REQUIRE([AM_MISSING_HAS_RUN])
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
# AM_MISSING_HAS_RUN
# ------------------
# Define MISSING if not defined so far and test if it supports --run.
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
AC_MSG_WARN([`missing' script is too old or missing])
fi
])
# AM_AUX_DIR_EXPAND
# Copyright 2001 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
# therefore $ac_aux_dir as well) can be either absolute or relative,
# depending on how configure is run. This is pretty annoying, since
# it makes $ac_aux_dir quite unusable in subdirectories: in the top
# source directory, any form will work fine, but in subdirectories a
# relative path needs to be adjusted first.
#
# $ac_aux_dir/missing
# fails when called from a subdirectory if $ac_aux_dir is relative
# $top_srcdir/$ac_aux_dir/missing
# fails if $ac_aux_dir is absolute,
# fails when called from a subdirectory in a VPATH build with
# a relative $ac_aux_dir
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
# harmless because $srcdir is `.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
# and then we would define $MISSING as
# MISSING="\${SHELL} $am_aux_dir/missing"
# This will work as long as MISSING is not called from configure, because
# unfortunately $(top_srcdir) has no meaning in configure.
# However there are other variables, like CC, which are often used in
# configure, and could therefore not use this "fixed" $ac_aux_dir.
#
# Another solution, used here, is to always expand $ac_aux_dir to an
# absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration.
# Rely on autoconf to set up CDPATH properly.
AC_PREREQ([2.50])
AC_DEFUN([AM_AUX_DIR_EXPAND], [
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
])
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
# Copyright 2001 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# AM_PROG_INSTALL_STRIP
# Copyright 2001 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
# always use install-sh in `make install-strip', and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
# will honor the `STRIP' environment variable to overrule this program.
dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# serial 4 -*- Autoconf -*-
# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
# NAME is "CC", "CXX", "GCJ", or "OBJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
# dependency, and given that the user is not expected to run this macro,
# just rely on AC_PROG_CC.
AC_DEFUN([_AM_DEPENDENCIES],
[AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
echo '#include "conftest.h"' > conftest.c
echo 'int i;' > conftest.h
echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
none) break ;;
esac
# We check with `-c' and `-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_$1_dependencies_compiler_type=$depmode
break
fi
done
cd ..
rm -rf conftest.dir
else
am_cv_$1_dependencies_compiler_type=none
fi
])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
])
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[rm -f .deps 2>/dev/null
mkdir .deps 2>/dev/null
if test -d .deps; then
DEPDIR=.deps
else
# MS-DOS does not allow filenames that begin with a dot.
DEPDIR=_deps
fi
rmdir .deps 2>/dev/null
AC_SUBST([DEPDIR])
])
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
[AC_ARG_ENABLE(dependency-tracking,
[ --disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
#serial 2
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[for mf in $CONFIG_FILES; do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
# We used to match only the files named `Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
fi
grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without
# running `make'.
DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
test -z "$DEPDIR" && continue
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n -e '/^U = / s///p' < "$mf"`
test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
# We invoke sed twice because it is the simplest approach to
# changing $(DEPDIR) to its actual value in the expansion.
for file in `sed -n -e '
/^DEP_FILES = .*\\\\$/ {
s/^DEP_FILES = //
:loop
s/\\\\$//
p
n
/\\\\$/ b loop
p
}
/^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
# AM_OUTPUT_DEPENDENCY_COMMANDS
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each `.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
doit:
@echo done
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# We grep out `Entering directory' and `Leaving directory'
# messages which can occur if `w' ends up in MAKEFLAGS.
# In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
am__include=include
am__quote=
_am_result=GNU
fi
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include
am__quote="\""
_am_result=BSD
fi
fi
AC_SUBST(am__include)
AC_SUBST(am__quote)
AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
# 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., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 5
AC_PREREQ(2.52)
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE])
if $2; then
$1_TRUE=
$1_FALSE='#'
else
$1_TRUE='#'
$1_FALSE=
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
AC_MSG_ERROR([conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally.])
fi])])
|
|
From: Rene R. <ren...@us...> - 2002-10-29 03:15:48
|
Update of /cvsroot/bobs/bobs/inc
In directory usw-pr-cvs1:/tmp/cvs-serv14737/inc
Modified Files:
class_backup.php class_files.php class_restore.php
class_tree.php
Log Message:
Rather large patch:
More templates added, so we are almost only using templates now.
class_backup partly cleaned up. Still needs more work.
I removed the .raw file lists and use only php now.
Index: class_backup.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_backup.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class_backup.php 1 Sep 2002 02:24:21 -0000 1.4
--- class_backup.php 29 Oct 2002 03:15:41 -0000 1.5
***************
*** 4,26 ****
description: backup functions
- server
- server_backup ($server, $share)
- server_increment ($server, $share)
- server_create_lists ($server, $share, $folders)
- server_progress ($server, $share)
- server_check_in_progress ()
-
- directory
- dir_check ($server, $share, $folder)
-
*/
-
class backup {
var $siteroot = ''; // root of the http site
! var $server = ''; // the servers name
var $server_ip = ''; // the server ip address
var $backupdir = ''; // base dir to do full current backups
--- 4,15 ----
description: backup functions
*/
class backup {
var $siteroot = ''; // root of the http site
! var $server = ''; // the servers name
var $server_ip = ''; // the server ip address
var $backupdir = ''; // base dir to do full current backups
***************
*** 28,43 ****
var $incrementdir = ''; // base dir to store increment backups
var $processdir = ''; // base for for store processes and sessions
! var $share = ''; // what share to backup (rsync share that is)
var $nfs_share = ''; // the share's nfs mount point
! var $files = ''; // files to do stuff with
var $folders = ''; // folders to do stuff with
! var $size = ''; // size to search for
! var $current_folder = ''; // folder store
var $command = ''; // shell command store
var $session_id = ''; // unique session id
var $filelinks = ''; // files that are linked (depend on each other)
-
-
- // new settings
var $rsync_share = ''; // name of the rsync share
var $smb_share = ''; // name of the smb share
--- 17,29 ----
var $incrementdir = ''; // base dir to store increment backups
var $processdir = ''; // base for for store processes and sessions
! var $share = ''; // descriptive name for the share to backup
var $nfs_share = ''; // the share's nfs mount point
! var $files = ''; // files to do stuff with
var $folders = ''; // folders to do stuff with
! var $size = ''; // size to search for
! var $current_folder = ''; // folder store
var $command = ''; // shell command store
var $session_id = ''; // unique session id
var $filelinks = ''; // files that are linked (depend on each other)
var $rsync_share = ''; // name of the rsync share
var $smb_share = ''; // name of the smb share
***************
*** 45,49 ****
var $restore_method = ''; // restore method (smb/nfs)
var $password = ''; // cleartext password (for smb mounts)
! var $login = ''; // login name (for smb mounts)
--- 31,38 ----
var $restore_method = ''; // restore method (smb/nfs)
var $password = ''; // cleartext password (for smb mounts)
! var $login = ''; // login name (for smb mounts)
! var $magic0 = '__///__0'; // what to use as magic text (you must be sure that no directories use this name)
! var $magic1 = '__///__1'; // what to use as magic text (you must be sure that no directories use this name)
!
***************
*** 66,70 ****
$this->server_ip = $vol_conf["server_ip"];
- // new settings
$this->smb_share = $vol_conf["smb_share"];
$this->backup_method = $vol_conf["backup_method"];
--- 55,58 ----
***************
*** 83,87 ****
$this->session_id = rand();
! // NOTE: It might be a good idea to place a command in the queue to delete sessions older than a week.
// This would be a nice place to call it since it is not an intensive task.
// $this->clean_old_sessions();
--- 71,75 ----
$this->session_id = rand();
! // FIXME: It might be a good idea to place a command in the queue to delete sessions older than a week.
// This would be a nice place to call it since it is not an intensive task.
// $this->clean_old_sessions();
***************
*** 109,112 ****
--- 97,102 ----
$result["curdir_db"] = $this->backupdir . '/' . $this->server . '/' . $this->share . '.dirindex.db';
+ $result["magic0"] = $this->magic0;
+ $result["magic1"] = $this->magic1;
$result["processdir"] = $this->processdir;
$result["session_id"] = $this->session_id;
***************
*** 119,123 ****
$result["filelinks"] = $this->filelinks;
- // new options
$result["smb_share"] = $this->smb_share;
$result["password"] = $this->password;
--- 109,112 ----
***************
*** 183,190 ****
// put together the script we need to execute
$backupcommand = 'rsync -e ssh --archive --verbose --delete --backup ' ;
-
- // enable this to run with without touching any files (except the $share.log)
- //$backupcommand .= ' --dry-run ';
-
$backupcommand .= $exclude_from;
$backupcommand .= '--backup-dir="' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '/"' ;
--- 172,175 ----
***************
*** 197,207 ****
}
! $backupcommand .= '::' . $this->share . ' "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"';
! // $backupcommand .= ' > "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/rsync.log" ';
$shell = "#!/bin/sh\n";
$shell .= "# Description: Backup files from server\n";
$shell .= $backupcommand . "\n";
- // $shell .= 'chown -R apache:apache "' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '/"' . "\n";
--- 182,190 ----
}
! $backupcommand .= '::' . $this->rsync_share . ' "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"';
$shell = "#!/bin/sh\n";
$shell .= "# Description: Backup files from server\n";
$shell .= $backupcommand . "\n";
***************
*** 225,268 ****
! // shell 1: mount the share
! // check for read access
! $shell = "#!/bin/bash\n";
! $shell .= "# Description: Backup files from server\n";
! // create the mount point
! $shell .= 'mkdir -p "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\"\n";
! $shell .= 'if [ -d "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '" ]' . "\n";
! $shell .= 'then'. "\n";
! // check if the server can be mounted
! $shell .= 'mount -t smbfs -o username=' . $this->login . ',password=' . $this->password . ' ';
! if ( $this->server_ip == '' ) {
! $shell .= '//' . $this->server . '/' . $this->smb_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\n";
! } else {
! $shell .= '//' . $this->server_ip . '/' . $this->smb_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\n";
! }
! $shell .= 'if [ $? -eq 0 ]' . "\n";
! $shell .= 'then'. "\n";
! // create a lock file if succesful
! $shell .= 'touch "' . $this->processdir . '/session/' . $this->session_id . ".backup.servmount.lock\"\n";
! $shell .= 'exit' . "\n";
! $shell .= 'fi' . "\n";
! $shell .= 'fi' . "\n";
// add the script to command queue
$this->command = $shell ;
$this->add_queue_command($shell, "bash");
!
! // shell 2:
! // check lock file
! // rsync if true
! // exit if false
! $shell = "#!/bin/bash\n";
! $shell .= 'if [ -e "' . $this->processdir . '/session/' . $this->session_id . '.backup.servmount.lock" ]' . "\n";
! $shell .= 'then'. "\n";
! $shell .= 'rsync --archive --delete --backup --backup-dir="' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '" ';
! $shell .= ' "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '/" "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"' . "\n";
! $shell .= 'exit' . "\n";
! $shell .= 'fi' . "\n";
// add the script to command queue
--- 208,257 ----
! // variable needed by more than one script
! $shstats = $this->processdir . "/shstats";
! $lockfile = $this->processdir . '/session/' . $this->session_id . ".backup.servmount.lock";
! $mountdir = $this->processdir . '/mounts/' . $this->server . '/' . $this->share;
! // shell 1: mount the share
! // check for read access
!
! // prepare the variable we need to fill out
! $mnt_command = 'mount -t smbfs -o username=' . $this->login . ',password=' . $this->password . ' ';
! if ( $this->server_ip == '' ) {
! $mnt_command .= '//' . $this->server . '/' . $this->smb_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share;
! } else {
! $mnt_command .= '//' . $this->server_ip . '/' . $this->smb_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share;
! }
!
! $t = new rFastTemplate('.');
! $t->define (array('content' => '../inc/templates/backup_smb_mount_server.sh'));
! $t->assign ('MOUNTDIR', $mountdir);
! $t->assign ('MOUNT_CMD', $mnt_command);
! $t->assign ('SESSION_ID', $this->session_id);
! $t->assign ('SHSTATS', $shstats);
! $t->assign ('LOCKFILE', $lockfile);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
// add the script to command queue
$this->command = $shell ;
$this->add_queue_command($shell, "bash");
!
! // shell 2:
! // check lock file
! // rsync if true
! // exit if false
! $backup_cmd = 'rsync --archive --delete --backup --backup-dir="' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '" ';
! $backup_cmd .= ' "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '/" "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"';
!
! $t->define (array('content' => '../inc/templates/backup_smb_backup_files.sh'));
! $t->assign ('MOUNTDIR', $mountdir);
! $t->assign ('BACKUP_CMD', $backup_cmd);
! $t->assign ('SESSION_ID', $this->session_id);
! $t->assign ('SHSTATS', $shstats);
! $t->assign ('LOCKFILE', $lockfile);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
// add the script to command queue
***************
*** 270,285 ****
$this->add_queue_command($shell, "bash");
! // shell 3:
! // check smb_status
! // umount if true and delete smb_status
! // if false delete lock file and report error to bobs.log
! $shell = "#!/bin/bash\n";
! $shell .= 'if [ -a "' . $this->processdir . '/session/' . $this->session_id . '.backup.servmount.lock" ]' . "\n";
! $shell .= 'then'. "\n";
! $shell .= 'umount "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\"\n";
! $shell .= 'rm -f "' . $this->processdir . '/session/' . $this->session_id . ".backup.servmount.lock\"\n";
! $shell .= 'exit' . "\n";
! $shell .= 'fi' . "\n";
// add the script to command queue
--- 259,273 ----
$this->add_queue_command($shell, "bash");
! // shell 3:
! // check smb_status
! // umount if true and delete smb_status
! // if false delete lock file and report error to bobs.log
!
! $t->define (array('content' => '../inc/templates/backup_smb_unmount_server.sh'));
! $t->assign ('MOUNTDIR', $mountdir);
! $t->assign ('LOCKFILE', $lockfile);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
// add the script to command queue
***************
*** 299,341 ****
// 3. umount the NFS share again (if mounted in the first place)
- // shell 1: mount the share
- // check for read access
! $shell = "#!/bin/bash\n";
! $shell .= "# Description: Backup files from server\n";
! // create the mount point
! $shell .= 'mkdir -p "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\"\n";
! $shell .= 'if [ -d "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '" ]' . "\n";
! $shell .= 'then'. "\n";
! // check if the server can be mounted
! $shell .= 'mount -t nfs ';
! if ( $this->server_ip == '' ) {
! $shell .= $this->server . ':' . $this->nfs_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\n";
! } else {
! $shell .= $this->server_ip . ':' . $this->nfs_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\n";
! }
! $shell .= 'if [ $? -eq 0 ]' . "\n";
! $shell .= 'then'. "\n";
! $shell .= 'touch "' . $this->processdir . '/session/' . $this->session_id . ".backup.servmount.lock\"\n";
! $shell .= 'exit' . "\n";
! $shell .= 'fi' . "\n";
! $shell .= 'fi' . "\n";
// add the script to command queue
$this->command = $shell ;
$this->add_queue_command($shell, "bash");
! // shell 2:
! // check smb_status
! // rsync if true
! // exit if false
! $shell = "#!/bin/bash\n";
! $shell .= 'if [ -e "' . $this->processdir . '/session/' . $this->session_id . '.backup.servmount.lock" ]' . "\n";
! $shell .= 'then'. "\n";
! $shell .= 'rsync --archive --delete --backup --backup-dir="' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '" ';
! $shell .= ' "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '/" "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"' . "\n";
! $shell .= 'exit' . "\n";
! $shell .= 'fi' . "\n";
// add the script to command queue
--- 287,340 ----
// 3. umount the NFS share again (if mounted in the first place)
! // variable needed by more than one script
! $shstats = $this->processdir . "/shstats";
! $lockfile = $this->processdir . '/session/' . $this->session_id . ".backup.servmount.lock";
! $mountdir = $this->processdir . '/mounts/' . $this->server . '/' . $this->share;
!
!
! // shell 1: mount the share
! // check for read access
!
! // check if the server can be mounted
! $mnt_command = 'mount -t nfs ';
! if ( $this->server_ip == '' ) {
! $mnt_command .= $this->server . ':' . $this->nfs_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\n";
! } else {
! $mnt_command .= $this->server_ip . ':' . $this->nfs_share . ' ' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\n";
! }
!
! $t = new rFastTemplate('.');
! $t->define (array('content' => '../inc/templates/backup_nfs_mount_server.sh'));
! $t->assign ('MOUNTDIR', $mountdir);
! $t->assign ('MOUNT_CMD', $mnt_command);
! $t->assign ('SESSION_ID', $this->session_id);
! $t->assign ('SHSTATS', $shstats);
! $t->assign ('LOCKFILE', $lockfile);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
// add the script to command queue
$this->command = $shell ;
$this->add_queue_command($shell, "bash");
+
+
! // shell 2:
! // check nfs_status
! // rsync if true
! // exit if false
! $backup_cmd = 'rsync --archive --delete --backup --backup-dir="' . $this->incomingdir . '/' . $this->server . '/' . $this->share . '" ';
! $backup_cmd .= ' "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . '/" "' . $this->backupdir . '/' . $this->server . '/' . $this->share . '/"' . "\n";
!
! $t->define (array('content' => '../inc/templates/backup_nfs_backup_files.sh'));
! $t->assign ('MOUNTDIR', $mountdir);
! $t->assign ('BACKUP_CMD', $backup_cmd);
! $t->assign ('SESSION_ID', $this->session_id);
! $t->assign ('SHSTATS', $shstats);
! $t->assign ('LOCKFILE', $lockfile);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
// add the script to command queue
***************
*** 343,358 ****
$this->add_queue_command($shell, "bash");
! // shell 3:
! // check lock file
! // umount if true and delete lock file
! // if false delete lock file and report error to bobs.log
! $shell = "#!/bin/bash\n";
! $shell .= 'if [ -a "' . $this->processdir . '/session/' . $this->session_id . '.backup.servmount.lock" ]' . "\n";
! $shell .= 'then'. "\n";
! $shell .= 'umount "' . $this->processdir . '/mounts/' . $this->server . '/' . $this->share . "\"\n";
! $shell .= 'rm -f "' . $this->processdir . '/session/' . $this->session_id . ".backup.servmount.lock\"\n";
! $shell .= 'exit' . "\n";
! $shell .= 'fi' . "\n";
// add the script to command queue
--- 342,356 ----
$this->add_queue_command($shell, "bash");
! // shell 3:
! // check lock file
! // umount if true and delete lock file
! // if false delete lock file and report error to bobs.log
!
! $t->define (array('content' => '../inc/templates/backup_smb_unmount_server.sh'));
! $t->assign ('MOUNTDIR', $mountdir);
! $t->assign ('LOCKFILE', $lockfile);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
// add the script to command queue
***************
*** 374,435 ****
$escape = "\ \\\*\+\[\]\^\$\(\)\{\}\=\!\<\>\|\:\#";
! $shell = "#!/bin/bash\n";
! $shell .= "# increment files in incoming\n";
! $shell .= 'SRCDIR="' . $this->incomingdir . '/"' . "\n";
! $shell .= 'DSTDIR="' . $this->incrementdir . '/"' . "\n";
!
// get the date in .YYYY.DDD format
$date = sprintf(".%04d.%03d", date("Y"), date("z"));
! $shell .= 'DATE="' . $date . "\"\n";
!
! //# find should output x lines with:
! //# 1: the name of the file
! //# 2: the name of the file the dir relative to the SRCDIR
!
! $tmpfile = $this->processdir . '/session/' . $this->session_id . ".incrementlist";
! $shell .= "# clear the filelist if it exists\n";
! $shell .= 'rm -f "' . $tmpfile . "\"\n";
! $shell .= 'find "$SRCDIR" -type f -printf "%f\n%P\n" >> "' . $tmpfile . "\"\n";
!
! // write and end_of_file identifier
! $shell .= 'echo "END_OF_FILE_LIST_ZXC" >> "' . $tmpfile . "\"\n";
! $shell .= 'echo "END_OF_FILE_LIST_ZXC" >> "' . $tmpfile . "\"\n";
! $shell .= 'filelist="' . $tmpfile . "\"\n";
!
! $shell .= 'move () {' . "\n";
! $shell .= ' if [ -d "$DSTDIR$RELDIR" ]' . "\n";
! $shell .= ' then' . "\n";
! $shell .= ' `mv "$SRCDIR$RELDIR$NAME" "$DSTDIR$RELDIR$NAME$DATE"`' . "\n";
! $shell .= ' else' . "\n";
! //# create dst dir if it doesn't exist
! $shell .= ' `mkdir --parents "$DSTDIR$RELDIR"`' . "\n";
! $shell .= ' `mv "$SRCDIR$RELDIR$NAME" "$DSTDIR$RELDIR$NAME$DATE"`' . "\n";
! $shell .= ' fi' . "\n";
! $shell .= '}' . "\n";
! $shell .= 'count=0' . "\n";
! $shell .= 'while [ "$NAME" != "END_OF_FILE_LIST_ZXC" ]' . "\n";
! $shell .= ' do' . "\n";
! $shell .= ' read NAME' . "\n";
! $shell .= ' let "count += 1"' . "\n";
! $shell .= ' read TMPRELDIR' . "\n";
! $shell .= ' RELDIR=`echo "$TMPRELDIR" | sed -e "s/[^/]*$//"`' . "\n";
! $shell .= ' if [ "$NAME" == "END_OF_FILE_LIST_ZXC" ]' . "\n";
! $shell .= ' then' . "\n";
!
! // a quick check to see if we are in root (which would no be a good thing)
if ( $this->incomingdir != '' || $this->incomingdir != '/' ) {
! $shell .= ' if [ -d "$SRCDIR" ]' . "\n";
! $shell .= ' then' . "\n";
! $shell .= ' rm -rf ' . addcslashes($this->incomingdir, $escape) . '/*' . "\n";
! $shell .= ' rm -f "' . $tmpfile . "\"\n";
! $shell .= ' fi' . "\n";
}
- $shell .= ' exit 0' . "\n";
- $shell .= ' fi' . "\n";
- $shell .= ' move' . "\n";
- $shell .= ' let "count += 1"' . "\n";
- $shell .= 'done <"$filelist"' . "\n";
! $this->command = $shell;
$this->add_queue_command($shell, "bash");
--- 372,397 ----
$escape = "\ \\\*\+\[\]\^\$\(\)\{\}\=\!\<\>\|\:\#";
! $srcdir = '"' . $this->incomingdir . '/"';
! $dstdir = '"' . $this->incrementdir . '/"';
// get the date in .YYYY.DDD format
$date = sprintf(".%04d.%03d", date("Y"), date("z"));
! $inc_list = '"' . $this->processdir . '/session/' . $this->session_id . ".incrementlist" . '"';
! // a quick check to see if we are in root (which would no be a good thing!)
if ( $this->incomingdir != '' || $this->incomingdir != '/' ) {
! $cleancmd = 'rm -rf ' . addcslashes($this->incomingdir, $escape) . '/*';
}
! $t = new rFastTemplate('.');
! $t->define (array('content' => '../inc/templates/backup_increment_files.sh'));
! $t->assign ('SRCDIR', $srcdir);
! $t->assign ('DSTDIR', $dstdir);
! $t->assign ('DATE', $date);
! $t->assign ('INC_LIST', $inc_list);
! $t->assign ('CLEANCMD', $cleancmd);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
!
! // add the script to command queue
! $this->command = $shell ;
$this->add_queue_command($shell, "bash");
***************
*** 443,480 ****
function server_create_index () {
- ///
- /// NOTE: this need error handling
- ///
- ///
-
-
// create file index lists
- $mindepth = ''; // no limit
- $maxdepth = ''; // no limit
-
-
// first we need a directory to work with.
! $this->current_folder = $this->incrementdir . '/' . $this->server . '/' . $this->share;
! $format = '///01';
! // we start with the directories
! $type = "d"; // find directories
! $this->make_index($mindepth, $maxdepth, $type, $format);
! // then we make the file index(es)
! $type = "f"; // find files
! $this->make_index($mindepth, $maxdepth, $type, $format);
!
// now for the current full backup dir
! $this->current_folder = $this->backupdir . '/' . $this->server . '/' . $this->share;
! $format = '///01.%AY.%Aj///02';
! // we start with the directories
! $type = "d"; // find directories
! $this->make_index($mindepth, $maxdepth, $type, $format);
! // then we make the file index(es)
! $type = "f"; // find files
! $this->make_index($mindepth, $maxdepth, $type, $format);
!
!
}
--- 405,420 ----
function server_create_index () {
// create file index lists
// first we need a directory to work with.
! $filedir = $this->incrementdir . '/' . $this->server . '/' . $this->share;
! $date = "";
! // create the db's for incrementals dirs
! $this->make_index($filedir, $date);
// now for the current full backup dir
! $filedir = $this->backupdir . '/' . $this->server . '/' . $this->share;
! $date = "current";
! $this->make_index($filedir, $date);
}
***************
*** 483,713 ****
//////
//////
! function make_index ($mindepth, $maxdepth, $type, $format) {
!
! // this will create a command that:
! // deletes the old index files
! // creates new index files.
! // create a list of file indexes (They will be seperated into 25000 line files)
!
!
! $result = '';
!
! $find_cmd = "#!/bin/sh\n";
! $find_cmd .= "# Automatically generated command\n";
! $find_cmd .= "# Description: Generating index files\n";
! $find_cmd .= "#\n";
!
! /* if ($type == 'f') {
! // delete the old indexes before creating new ones
! $find_cmd .= "rm -f " . $this->current_folder . '.fileinde*' . "\n";
! } else {
! // delete the dir index before creating a new one
! $find_cmd .= "rm -f " . $this->current_folder . '.dirindex*' . "\n";
! }
! */
! // get the file/folder list
! $find_cmd .= 'find "' . $this->current_folder . '/" -depth ';
!
! // include mindepth if set
! if($mindepth) {
! $find_cmd .= " -mindepth $mindepth ";
! }
!
! // include maxdepth if set
! if($maxdepth) {
! $find_cmd .= " -maxdepth $maxdepth ";
! }
!
! // define type to search for
! if($type) {
! $find_cmd .= "-type $type ";
! }
!
! // if type is "directories"
! if($type == 'd'){
! $find_cmd .= ' -printf "%P\n"';
! $find_cmd .= ' > "' . $this->current_folder . '.dirindex.raw"' ;
!
! }
!
! // if type is "file"
! if($type == 'f') {
! $find_cmd .= ' -printf "%h///00%f' . $format . '%s///03///FF\n"';
!
! // pass the output though sed to correct some problem with the outout.
! // I want the files in the "root" dir to give the expected output (no slashes before or after dirname, except delimiters)
! // sed -e 's/^.\{43\}//g' -e '/^\/[^/]/s/^\///g'
! $find_cmd .= ' | sed -e \'s/^.\\{' ;
! $find_cmd .= (string)strlen($this->current_folder);
! $find_cmd .= '\\}//g\' -e \'/^\/[^/]/s/^\///g\'';
!
! // output into indexfile
! $find_cmd .= ' | sort > "' . $this->current_folder . '.fileindex.raw"' . "\n";
!
! // create a list of indexes
! //$find_cmd .= 'find ' . $this->current_folder . '.fileindex.* -maxdepth 0 -type f -printf "%f\n" > "' . $this->current_folder . '.fileindexlist"' . "\n";
!
! }
!
! // add the command to the command queue
! $this->command = $find_cmd;
! $this->add_queue_command($find_cmd, "bash");
!
// database and dir_tree creation
! if ($type == 'f') {
! // create databases for both dir indexes and file indexes
!
! $raw_file = $this->current_folder . ".fileindex.raw";
! $file_db = $this->current_folder . ".fileindex.db";
! $dir_db = $this->current_folder . ".dirindex.db";
! $tree_file = $this->current_folder . ".dirtree.ser";
!
! // ---------- START OF PHP SCRIPT ----------
! $php_db_script = <<<END_OF_HEREDOC
! <?
!
! // create the dirindex and file index databases
!
! // set the max execution time (in seconds, 0 means no limit)
! set_time_limit(600);
!
! \$id = dba_open ('$file_db', "n", "db3");
! if (!\$id) {
! echo "dba_open failed\\n";
! exit;
! }
! // open the restore file index
! \$fp = fopen ('$raw_file',"r");
!
! // empty input buffer
! \$input = '';
! // set the start range
! \$range = 0;
! // read lines from the index file
! // PHP does not handle lines very well. So I read a line (Which in PHP terms is defined by <newline> )
! // I check if it really is the end-of-line and if not, read again until we do.
! while(!feof(\$fp)) {
! \$input .= fgets(\$fp, 4096);
! // check if we have a complete line
! if ( substr(\$input, -6) == "///FF\\n" ) {
! // save results
! // each file get a range of 100
! \$part = preg_split('/\/{3,3}(..)/', \$input, -1, PREG_SPLIT_DELIM_CAPTURE);
! // Now place the fields in an array with correct numbering
! \$i = 0;
! \$n = count(\$part);
! while ( \$n > \$i+3 ) {
! \$num = \$part[\$i+1]+\$range;
! dba_insert (\$num, \$part[\$i], \$id);
! \$i = \$i+2;
! }
! // clear input buffer to hold next line
! \$input = '';
! // incremtent the range
! \$range = \$range+100;
! }
! }
!
! // insert a key to tell how many entries there are
! dba_replace ("index_count", \$counter-1, \$id);
! dba_close (\$id);
!
!
! // Now create the directory database
!
! \$id = dba_open ('$file_db', "r", "db3");
! if (!\$id) {
! echo "dba_open failed\\n";
! exit;
! }
! // create a new database.
! \$dir_id = dba_open ('$dir_db', "n", "db3");
! if (!\$dir_id) {
! echo "dba_open failed\\n";
! exit;
! }
!
! // set the first key
! \$ckey = 0;
! // set a fake prev_path
! \$prev_path = dba_fetch(\$ckey, \$id);
! \$path = \$prev_path;
! \$prev_ckey = 0;
!
! while ( \$ckey < \$range) {
! \$count++;
! \$path = dba_fetch(\$ckey, \$id);
! if ( \$path !== \$prev_path ) {
! dba_insert(\$prev_path, "range:\$prev_ckey:\$ckey|",\$dir_id);
! \$dir_tree[] = \$path;
! \$prev_path = \$path;
! \$prev_ckey = \$ckey;
!
! }
! \$ckey = \$ckey+100;
! }
!
! // insert the last entry which is not matched by the above loop
! \$ckey = \$ckey-100;
! dba_insert(\$prev_path, "range:\$prev_ckey:\$ckey|",\$dir_id);
!
! // close the databases
! dba_close (\$id);
! dba_close (\$dir_id);
! // close the file handle
! fclose(\$fp);
!
! //--------- create dirtree and save it as a serialized object
!
! // this magic marker _must_ be the same as in class_tree.php
! \$magic0 = '__///__0';
! \$filelinks = parse_ini_file('$this->siteroot' . '/inc/filelinks.ini', process_sections);
!
! // $dirs = @file($this->dirtree);
! // sort the dirs (this is effective throughout the tree)
! sort(\$dir_tree);
! // reset the state tree
! \$state = '';
!
! // parse the tree
! foreach (\$dir_tree as \$path ) {
! \$dir = explode('/', \$path);
!
! // check if the dir is a linkdir
! \$dircount = count(\$dir)-1;
! foreach ( \$filelinks as \$filelink ) {
! // if this is a linkdir then skip to next dir
! if ( strcasecmp(\$filelink["linkdir"], \$dir[\$dircount]) == 0 ) {
! continue 2;
! }
! }
!
! \$statestr = '\$state';
! foreach ( \$dir as \$name ) {
! if (\$name != '' ) {
! \$name = addslashes(\$name);
! \$statestr .= '["' . \$name . '"]';
! \$this_str = \$statestr . '["' . \$magic0 . '"] = "' . \$name . '";';
! eval("\$this_str");
! }
! }
! }
!
! // now serialize the dirtree and save it to disk
! \$serialized = serialize(\$state);
! \$fp = fopen('$tree_file',"w");
! fwrite(\$fp, \$serialized, strlen(\$serialized));
! fclose(\$fp);
!
!
! ?>
! END_OF_HEREDOC;
! // ------ END OF PHP SCRIPT -----------
! $this->command = $php_db_script;
! $this->add_queue_command($php_db_script, "php");
! }
--- 423,452 ----
//////
//////
! function make_index ($filedir, $date) {
// database and dir_tree creation
! $file_db = $filedir . ".fileindex.db";
! $dir_db = $filedir . ".dirindex.db";
! $dir_ser = $filedir . ".dirtree.ser";
! $file_links = $this->siteroot . "/inc/filelinks.ini";
! $magic0 = $this->magic0;
! $root_dir = $filedir;
! $t = new rFastTemplate('.');
! $t->define (array('content' => '../inc/templates/backup_create_databases.php'));
! $t->assign ('FILE_DB', $file_db);
! $t->assign ('DIR_DB', $dir_db);
! $t->assign ('ROOT_DIR', $root_dir);
! $t->assign ('DATE', $date);
! $t->assign ('MAGIC0', $magic0);
! $t->assign ('FILE_LINKS', $file_links);
! $t->assign ('DIR_SER', $dir_ser);
! $t->parse ('CONTENT', 'content');
! $shell = $t->fetch();
!
! // add the script to command queue
! $this->command = $shell ;
! $this->add_queue_command($shell, "php");
Index: class_files.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_files.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class_files.php 14 Sep 2002 13:53:24 -0000 1.5
--- class_files.php 29 Oct 2002 03:15:42 -0000 1.6
***************
*** 48,54 ****
// check if we have an empty dir
! if ( $indexes != "" ) {
// fetch the files
! $this->data = $db->db_fetch_entries ( $indexes, $values );
}
// parse the format if needed
--- 48,54 ----
// check if we have an empty dir
! if ( $indexes != '' ) {
// fetch the files
! $this->data = $db->db_fetch_entries ( $where, $indexes, $values );
}
// parse the format if needed
***************
*** 92,150 ****
}
! function sort_files ($type) {
!
! // this will sort the array by name,size or date
!
! // check if the data array is empty
! if ( $this->data == '' ) {
! return;
! }
! switch($type) {
! case "name":
! $this->sort = 1;
! break;
! case "namerev":
! $this->sort = 4;
! break;
! case "date":
! $this->sort = 2;
! break;
! case "daterev":
! $this->sort = 5;
! break;
! case "size":
! $this->sort = 3;
! break;
! case "sizerev":
! $this->sort = 6;
! break;
! }
! // call the sort function
! usort($this->data, array($this,"sort_array"));
! // if we should reverse the sort
! if ( $type == "namerev" || $type == "daterev" || $type == "sizerev" ) {
! $tmp_arr = array_reverse($this->data);
! $this->data = $tmp_arr;
}
- return;
- }
-
- function sort_array ($a, $b) {
! // sort function
! // this will sort the files array by a field number
! $field = $this->sort;
! if ( $field >= 4 ) {
! $field = $field-3;
}
-
- if ( $a[$field] == $b[$field]) return 0;
- return ($a[$field] < $b[$field]) ? -1 : 1 ;
- }
--- 92,150 ----
}
! function sort_files ($type) {
! // this will sort the array by name,size or date
! // check if the data array is empty
! if ( $this->data == '' ) {
! return;
! }
! switch($type) {
! case "name":
! $this->sort = 1;
! break;
! case "namerev":
! $this->sort = 4;
! break;
! case "date":
! $this->sort = 2;
! break;
! case "daterev":
! $this->sort = 5;
! break;
! case "size":
! $this->sort = 3;
! break;
! case "sizerev":
! $this->sort = 6;
! break;
! }
!
! // call the sort function
! usort($this->data, array($this,"sort_array"));
!
! // if we should reverse the sort
! if ( $type == "namerev" || $type == "daterev" || $type == "sizerev" ) {
! $tmp_arr = array_reverse($this->data);
! $this->data = $tmp_arr;
! }
! return;
}
! function sort_array ($a, $b) {
!
! // sort function
! // this will sort the files array by a field number
!
! $field = $this->sort;
! if ( $field >= 4 ) {
! $field = $field-3;
! }
! if ( $a[$field] == $b[$field]) return 0;
! return ($a[$field] < $b[$field]) ? -1 : 1 ;
}
Index: class_restore.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_restore.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class_restore.php 14 Sep 2002 13:53:24 -0000 1.10
--- class_restore.php 29 Oct 2002 03:15:42 -0000 1.11
***************
*** 283,287 ****
// now we need to get the files.
! $filelist = array_merge($filelist, $db->db_fetch_entries($str, $values) );
}
--- 283,287 ----
// now we need to get the files.
! $filelist = array_merge($filelist, $db->db_fetch_entries($where="restore", $str, $values) );
}
***************
*** 358,366 ****
$t->assign ('FILELIST', $fpname);
! foreach ( $dir_cmds as $dir ) {
! $t->assign ('DIR_CMDS', $dir);
$t->parse ('DIRLIST', '.dirlist');
}
-
$t->parse ('CONTENT', 'content');
--- 358,371 ----
$t->assign ('FILELIST', $fpname);
! // check if we need to create any dirs
! if ( count($dir_cmds) > 1 || count($dir_cmds) == 1 ) {
! foreach ( $dir_cmds as $dir ) {
! $t->assign ('DIR_CMDS', $dir);
! $t->parse ('DIRLIST', '.dirlist');
! }
! } else {
! $t->assign ('DIR_CMDS', "");
$t->parse ('DIRLIST', '.dirlist');
}
$t->parse ('CONTENT', 'content');
***************
*** 403,407 ****
// now we need to get the files.
! $filelist = array_merge($filelist, $db->db_fetch_entries($str, $values) );
}
foreach ( $filelist as $file ) {
--- 408,412 ----
// now we need to get the files.
! $filelist = array_merge($filelist, $db->db_fetch_entries($where="restore", $str, $values) );
}
foreach ( $filelist as $file ) {
Index: class_tree.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_tree.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class_tree.php 14 Sep 2002 13:53:24 -0000 1.3
--- class_tree.php 29 Oct 2002 03:15:42 -0000 1.4
***************
*** 19,24 ****
var $where = ''; // where are we (incremental, current .. etc)
var $mtime = ''; // when was the dirindex last modified
! var $magic0 = '__///__0'; // what to use as magic text (you must be sure that no directories use this name)
! var $magic1 = '__///__1'; // what to use as magic text (you must be sure that no directories use this name)
var $filelinks = ''; // list of linked files
var $config;
--- 19,24 ----
var $where = ''; // where are we (incremental, current .. etc)
var $mtime = ''; // when was the dirindex last modified
! var $magic0 = ''; // what to use as magic text (you must be sure that no directories use this name)
! var $magic1 = ''; // what to use as magic text (you must be sure that no directories use this name)
var $filelinks = ''; // list of linked files
var $config;
***************
*** 30,47 ****
switch ($config[where]) {
case "incremental":
! $this->dirtree = $config[incdirindex];
! $this->tree_ser = $config[incdirtree];
break;
case "current":
! $this->dirtree = $config[curdirindex];
! $this->tree_ser = $config[curdirtree];
break;
case "search":
! $this->dirtree = $config[processdir] . '/session/' . $config[session_id] . '.search.dirindex.db';
! $this->tree_ser = $config[processdir] . '/session/' . $config[session_id] . '.search.dirtree.ser';
break;
case "restore":
! $this->dirtree = $config[processdir] . '/session/' . $config[session_id] . '.restore.dirindex.db';
! $this->tree_ser = $config[processdir] . '/session/' . $config[session_id] . '.restore.dirtree.ser';
break;
}
--- 30,47 ----
switch ($config[where]) {
case "incremental":
! $this->dirtree = $config['incdirindex'];
! $this->tree_ser = $config['incdirtree'];
break;
case "current":
! $this->dirtree = $config['curdirindex'];
! $this->tree_ser = $config['curdirtree'];
break;
case "search":
! $this->dirtree = $config['processdir'] . '/session/' . $config['session_id'] . '.search.dirindex.db';
! $this->tree_ser = $config['processdir'] . '/session/' . $config['session_id'] . '.search.dirtree.ser';
break;
case "restore":
! $this->dirtree = $config['processdir'] . '/session/' . $config['session_id'] . '.restore.dirindex.db';
! $this->tree_ser = $config['processdir'] . '/session/' . $config['session_id'] . '.restore.dirtree.ser';
break;
}
***************
*** 51,54 ****
--- 51,57 ----
$this->server = $config["server"];
$this->share = $config["share"];
+
+ $this->magic0 = $config["magic0"];
+ $this->magic1 = $config["magic1"];
$this->treehref = $newtreehref . '?where=' . $config["where"];
***************
*** 206,210 ****
// display where we are
! $result .= "You are browsing the <b> " . $this->where . "</b> directories of <b>" . $this->server . '/' . $this->share . "</b><br>";
--- 209,213 ----
// display where we are
! $result .= "You are browsing the <b>" . $this->where . "</b> directories of <b>" . $this->server . '/' . $this->share . "</b><br>";
***************
*** 403,407 ****
eval($statestr);
}
-
return;
}
--- 406,409 ----
|
