Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -33,10 +33,12 @@
# ARCHSTR=$(shell uname -m)_$(shell uname -r)
# BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE")
# ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
ARCHSTR=$(shell lsb_release -sr)
# ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
+
+PNGFILES = $(shell cd docs/manual;ls *png)
all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard
mtest: $(OFILES) readline-fix.scm megatest.o
csc $(CSCOPTS) $(OFILES) megatest.o -o mtest
@@ -45,10 +47,18 @@
csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) -o dboard
ndboard : newdashboard.scm $(OFILES) $(GOFILES)
csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
+# install documentation to $(PREFIX)/docs
+# DOES NOT REBUILD DOCS
+#
+$(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html
+ mkdir -p $(PREFIX)/share/docs
+ $(INSTALL) docs/manual/megatest_manual.html $(PREFIX)/share/docs/megatest_manual.html
+ for png in $(PNGFILES);do $(INSTALL) docs/manual/$$png $(PREFIX)/share/docs/$$png;done
+
#multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES)
# csc $(CSCOPTS) $(OFILES) $(GOFILES) multi-dboard.scm -o multi-dboard
#
# $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
@@ -92,13 +102,13 @@
chmod a+x $(PREFIX)/bin/newdashboard
#$(PREFIX)/bin/.$(ARCHSTR)/mdboard : multi-dboard
# $(INSTALL) multi-dboard $(PREFIX)/bin/.$(ARCHSTR)/mdboard
-$(PREFIX)/bin/mdboard : $(PREFIX)/bin/.$(ARCHSTR)/mdboard utils/mk_wrapper
- utils/mk_wrapper $(PREFIX) mdboard $(PREFIX)/bin/mdboard
- chmod a+x $(PREFIX)/bin/mdboard
+# $(PREFIX)/bin/mdboard : $(PREFIX)/bin/.$(ARCHSTR)/mdboard utils/mk_wrapper
+# utils/mk_wrapper $(PREFIX) mdboard $(PREFIX)/bin/mdboard
+# chmod a+x $(PREFIX)/bin/mdboard
# $(HELPERS) : utils/%
# $(INSTALL) $< $@
# chmod a+x $@
@@ -148,21 +158,20 @@
deploytarg/nbfind : utils/nbfind
$(INSTALL) $< $@
chmod a+x $@
-
# install dashboard as dboard so wrapper script can be called dashboard
$(PREFIX)/bin/.$(ARCHSTR)/dboard : dboard $(FILES) utils/mk_wrapper
utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard
chmod a+x $(PREFIX)/bin/dashboard
$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
$(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
$(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
- $(PREFIX)/bin/newdashboard $(PREFIX)/bin/mdboard
+ $(PREFIX)/share/docs/megatest_manual.html
$(PREFIX)/bin/.$(ARCHSTR) :
mkdir -p $(PREFIX)/bin/.$(ARCHSTR)
test: tests/tests.scm
Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -491,10 +491,36 @@
;; '(print (string-intersperse (map cadr (hash-table-ref/default (read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))'
(define (common:get-disks #!key (configf #f))
(hash-table-ref/default
(or configf (read-config "megatest.config" #f #t))
"disks" '("none" "")))
+
+;; return first command that exists, else #f
+;;
+(define (common:which cmds)
+ (if (null? cmds)
+ #f
+ (let loop ((hed (car cmds))
+ (tal (cdr cmds)))
+ (let ((res (with-input-from-pipe (conc "which " hed) read-line)))
+ (if (and (string? res)
+ (file-exists? res))
+ res
+ (if (null? tal)
+ #f
+ (loop (car tal)(cdr tal))))))))
+
+(define (common:get-install-area)
+ (let ((exe-path (car (argv))))
+ (if (file-exists? exe-path)
+ (handle-exceptions
+ exn
+ #f
+ (pathname-directory
+ (pathname-directory
+ (pathname-directory exe-path))))
+ #f)))
;;======================================================================
;; T A R G E T S , S T A T E , S T A T U S ,
;; R U N N A M E A N D T E S T P A T T
;;======================================================================
Index: docs/dashboard.png
==================================================================
--- docs/dashboard.png
+++ docs/dashboard.png
cannot compute difference between binary files
Index: docs/manual/Makefile
==================================================================
--- docs/manual/Makefile
+++ docs/manual/Makefile
@@ -16,10 +16,13 @@
all : server.ps megatest_manual.html client.ps complex-itemmap.png
megatest_manual.html : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt *png
asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 megatest_manual.txt
# dos2unix megatest_manual.html
+
+megatest.pdf : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt *png
+ a2x -a toc -f pdf megatest_manual.txt
server.ps : server.dot
dot -Tps server.dot > server.ps
client.ps : client.dot
Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -831,11 +831,11 @@
Relocatable - the testsuite or automation area can be checked out and the tests run anywhere
-Encapsulated - the area where the tests run are self-contained and all inputs
+Encapsulated - the tests run in self-contained directories and all inputs
and outputs to the process can be found in the run areas.
@@ -1833,10 +1833,11 @@