Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -16,10 +16,11 @@
# along with Megatest. If not, see .
# make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)'
# rm .o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less
SHELL=/bin/bash
+include makefile.inc
PREFIX=$(PWD)
CSCOPTS=
INSTALL=install
SRCFILES = common.scm items.scm launch.scm ods.scm runconfig.scm \
server.scm configf.scm db.scm keys.scm margs.scm \
@@ -61,25 +62,17 @@
ifeq ($(MTESTHASH),)
$(error MTESTHASH is broken!)
endif
-CSIPATH=$(shell which csi)
-CKPATH=$(shell dirname $(shell dirname $(CSIPATH)))
-ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
-# ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
-
-# if have csi on path use that, else use default
-CHICKEN_PREFIX=$(or $(CKPATH),$(PREFIX)/$(ARCHSTR))
+# Get ARCHSTR from the configure step
+# ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
PNGFILES = $(shell cd docs/manual;ls *png)
all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
-whatever :
- @echo "CHICKEN_PREFIX=$(CHICKEN_PREFIX)"
-
mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES)
csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
showmtesthash:
@echo $(MTESTHASH)
@@ -91,12 +84,10 @@
csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm
csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut
-include makefile.inc
-
TCMTOBJS = \
api.o \
archive.o \
cgisetup/models/pgdb.o \
client.o \
Index: TODO
==================================================================
--- TODO
+++ TODO
@@ -22,16 +22,19 @@
TODO
====
WW15
-. fill newview matrix with data, filter pipeline gui elements
+. syscheck; touch file in home, tmp, runs, links and start xterm [DONE]
+. fill newview matrix with data, filter pipeline gui elements
. improve [script], especially indent handling
WW16
. split db into megatest.db (runs etc.) db/.db
. release basic newview implementation
+.. -get-data, -put-data [DONE]
+.. get and put to specific paths
WW18
. release split db implementation
. mtutil calls from dashboard (for remote control)
. logs browser (esp. for surfacing mtutil related activities)
Index: chicken.makefile
==================================================================
--- chicken.makefile
+++ chicken.makefile
@@ -19,10 +19,19 @@
#======================================================================
# Chicken build
#======================================================================
+# CHICKEN_BIN_DIR=$(shell dirname $(shell which csi))
+# if have csi on path use that, else use default
+# CSIPATH=$(shell which csi)
+# CKPATH=$(shell dirname $(shell dirname $(CSIPATH)))
+# CHICKEN_PREFIX=$(or $(CKPATH),$(PREFIX)/bin/.$(ARCHSTR))
+
+whatever :
+ @echo "CHICKEN_PREFIX=$(CHICKEN_PREFIX)"
+
tgz-$(USER)/postgresql-9.6.4.tar.gz :
mkdir -p tgz-$(USER)
wget -c https://ftp.postgresql.org/pub/source/v9.6.4/postgresql-9.6.4.tar.gz
mv postgresql-9.6.4.tar.gz tgz-$(USER)/
@@ -42,10 +51,11 @@
wget -c -O tgz-$(USER)/ffcall.tar.gz 'http://www.kiatoa.com/fossils/ffcall/tarball?name=ffcall&uuid=trunk'
$(CHICKEN_PREFIX)/bin/pg_config : tgz-$(USER)/postgresql-9.6.4.tar.gz
mkdir -p build-$(USER)/
tar xfz tgz-$(USER)/postgresql-9.6.4.tar.gz -C build-$(USER)
+ if [[ -e $(CHICKEN_PREFIX)/bin/pg_config ]];then touch $(CHICKEN_PREFIX)/bin/pg_config;fi
cd build-$(USER)/postgresql-9.6.4; ./configure --prefix=$(CHICKEN_PREFIX) --with-openssl; make; make install
build-$(USER)/sqlite-autoconf-3090200/configure : tgz-$(USER)/sqlite-autoconf-3090200.tar.gz
mkdir -p build-$(USER);
cd build-$(USER); tar xf ../tgz-$(USER)/sqlite-autoconf-3090200.tar.gz
@@ -57,27 +67,29 @@
cd tgz-$(USER)/nanomsg-1.0.0/build-$(USER); make; make install
$(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE : tgz-$(USER)/chicken-4.13.0.tar.gz
mkdir -p build-$(USER)/eggs-installed
cd build-$(USER);tar xf ../tgz-$(USER)/chicken-4.13.0.tar.gz
+ if [[ -e $(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE ]];then touch $(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE;fi
tgz-$(USER)/opensrc.fossil :
cd tgz-$(USER); fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil
mkdir tgz-$(USER)/opensrc
cd tgz-$(USER)/opensrc; fossil open --nested ../opensrc.fossil; fossil up; fossil uv sync
$(CHICKEN_PREFIX)/lib/libiupweb.so : tgz-$(USER)/opensrc.fossil
- cd tgz-$(USER)/opensrc; fossil unversioned cat libs/cd/cd-5.10_Linux26g4_64_lib.tar.gz > ../cd.tgz
- cd tgz-$(USER)/opensrc; fossil unversioned cat libs/im/im-3.11_Linux26g4_64_lib.tar.gz > ../im.tgz
- cd tgz-$(USER)/opensrc; fossil unversioned cat libs/iup/iup-3.19.1_Linux26g4_64_lib.tar.gz > ../iup.tgz
+ cd tgz-$(USER)/opensrc; fossil unversioned cat libs/cd/cd-$(CDVER)_Linux$(IUPARCH)_64_lib.tar.gz > ../cd.tgz
+ cd tgz-$(USER)/opensrc; fossil unversioned cat libs/im/im-$(IMVER)_Linux$(IUPARCH)_64_lib.tar.gz > ../im.tgz
+ cd tgz-$(USER)/opensrc; fossil unversioned cat libs/iup/iup-$(IUPVER)_Linux$(IUPARCH)_64_lib.tar.gz > ../iup.tgz
cd tgz-$(USER); tar -xzf cd.tgz;
cd tgz-$(USER); tar -xzf im.tgz;
cd tgz-$(USER); tar -xzf iup.tgz;
- cp tgz-$(USER)/include/* $(CHICKEN_PREFIX)/include/
- cp tgz-$(USER)/*.so $(CHICKEN_PREFIX)/lib/
- cp tgz-$(USER)/*.a $(CHICKEN_PREFIX)/lib/
- cp tgz-$(USER)/ftgl/lib/*/* $(CHICKEN_PREFIX)/lib/
+ rsync -av tgz-$(USER)/include/ $(CHICKEN_PREFIX)/include/
+ rsync -av tgz-$(USER)/*.so $(CHICKEN_PREFIX)/lib/
+ rsync -av tgz-$(USER)/*.a $(CHICKEN_PREFIX)/lib/
+ rsync -av tgz-$(USER)/ftgl/lib/*/* $(CHICKEN_PREFIX)/lib/
+ if [[ -e $(CHICKEN_PREFIX)/lib/libiupweb.so ]];then touch $(CHICKEN_PREFIX)/lib/libiupweb.so;fi
EGGS=srfi-69 srfi-42 sqlite3 iup canvas-draw typed-records md5 regex-case base64 \
format dot-locking csv-xml z3 udp hostinfo directory-utils stack dbi crypt sha1 \
posix-extras pathname-expand csv call-with-environment-variables s11n spiffy \
uri-common intarweb http-client spiffy-request-vars spiffy-directory-listing \
@@ -92,58 +104,69 @@
cd tgz-$(USER)/ffcall; make CC="gcc -fPIC"; make install
$(CHICKEN_PREFIX)/bin/sqlite3 : build-$(USER)/sqlite-autoconf-3090200/configure
cd build-$(USER)/sqlite-autoconf-3090200; ./configure --prefix=$(CHICKEN_PREFIX); make; make install
-$(CHICKEN_PREFIX)/bin/csi : $(CHICKEN_PREFIX)/bin/sqlite3 $(CHICKEN_PREFIX)/lib/libiupweb.so $(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE
+$(CHICKEN_PREFIX)/bin/csi : $(SQLITE3_DEPS) $(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE
cd build-$(USER)/chicken-4.13.0;make PLATFORM=linux PREFIX=$(CHICKEN_PREFIX)
cd build-$(USER)/chicken-4.13.0;make PLATFORM=linux PREFIX=$(CHICKEN_PREFIX) install
ALL_CKBIN=chicken chicken-bind chicken-bug chicken-dump \
chicken-install chicken-profile chicken-sqlite3 chicken-status \
chicken-uninstall csc csi feathers nanocat sqlite3 vacuumdb logpro \
refdb
-# CHICKEN_BIN_DIR=$(shell dirname $(shell which csi))
CKBIN_WRAPPERS=$(addprefix $(PREFIX)/bin/,$(ALL_CKBIN))
$(PREFIX)/bin/% : $(CHICKEN_PREFIX)/bin/% $(CHICKEN_PREFIX)/bin/csi $(EGGSTARG2)
utils/mk_wrapper_tool $(PREFIX) $* $(PREFIX)/bin/$*
chmod a+x $(PREFIX)/bin/$*
$(PREFIX)/bin :
- mkdir -p $(PREFIX)/bin
+ mkdir -p $(PREFIX)/bin $(CHICKEN_PREFIX)/bin
chicken : $(PREFIX)/bin $(CHICKEN_PREFIX)/bin/csi binwrappers
@echo "Fake target to build prefix chicken"
binwrappers : $(CKBIN_WRAPPERS)
-postgresql.done : $(CHICKEN_PREFIX)/bin/pg_config
+# Turn on postgres if configure did not find the library
+ifeq ($(BUILD_POSTGRES),yes)
+POSTGRES_DEPS=$(CHICKEN_PREFIX)/bin/pg_config
+endif
+
+# Turn on sqlite3 if configure did not find the library
+ifeq ($(BUILD_SQLITE3),yes)
+SQLITE3_DEPS=$(CHICKEN_PREFIX)/bin/sqlite3
+endif
+
+postgresql.done : $(POSTGRES_DEPS)
CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install postgresql > postgresql.done
nanomsg.done : $(CHICKEN_PREFIX)/lib/libnanomsg.so
CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install nanomsg > nanomsg.done
-iup.done : $(CHICKEN_PREFIX)/lib/libcallback.a
- CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks -feature disable-iup-web -feature disable-iup-pplot -feature disable-iup-matrixex iup > iup.done
+iup.done : $(CHICKEN_PREFIX)/lib/libcallback.a $(CHICKEN_PREFIX)/lib/libiupweb.so
+ CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks -feature disable-iup-web -feature disable-iup-pplot -feature disable-iup-matrixex iup$(IUPEGGVER) > iup.done
canvas-draw.done :
CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks canvas-draw > canvas-draw.done
-sqlite3.done :
+sqlite3.done : $(SQLITE3_DEPS)
CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install sqlite3 > sqlite3.done
sql-de-lite.done :
CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install sql-de-lite > sql-de-lite.done
dbi.done : postgresql.done sqlite3.done sql-de-lite.done
CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install dbi > dbi.done
+logpro.done : typed-records.done
+
%.done :
$(CHICKEN_PREFIX)/bin/chicken-install $* > $*.done
build-$(USER)/eggs-installed/%.done : $(CHICKEN_PREFIX)/bin/csi $(EGGS)
$(CHICKEN_PREFIX)/bin/chicken-install $* > build-$(USER)/eggs-installed/$*.done
-
-
+build-clean :
+ rm -rf build-$(USER) bin
Index: configure
==================================================================
--- configure
+++ configure
@@ -16,10 +16,59 @@
#
# You should have received a copy of the GNU General Public License
# along with Megatest. If not, see .
# Configure the build
+
+if [[ "$1"x == "x" ]];then
+ PREFIX=$PWD
+else
+ PREFIX=$1
+fi
+
+if [[ -e /usr/bin/sw_vers ]]; then
+ ARCHSTR=$(/usr/bin/sw_vers -productVersion)
+else
+ ARCHSTR=$(lsb_release -sr)
+fi
+
+#======================================================================
+# Arch dependent stuff
+#======================================================================
+
+# IUP Arch key
+case $ARCHSTR in
+ 18.04)
+ IUPARCH=415
+ CDVER=5.12
+ IMVER=3.13
+ IUPVER=3.28
+ IUPEGGVER=":1.9.0"
+ ;;
+ dunno)
+ IUPARCH=44
+ CDVER=5.12
+ IMVER=3.13
+ IUPVER=3.28
+ ;;
+ *)
+ IUPARCH=26g4
+ CDVER=5.10
+ IMVER=3.11
+ IUPVER=3.19.1
+ IUPEGGVER=
+ ;;
+esac
+
+#======================================================================
+# Required software checks
+#======================================================================
+
+if [[ ! $(type fossil) ]];then
+ echo "Please install fossil from http://fossil-scm.org"
+ exit 1
+fi
#======================================================================
# Configure stuff needed for eggs
#======================================================================
@@ -58,15 +107,37 @@
#======================================================================
# Do we need Chicken?
#======================================================================
+CHICKEN_PREFIX=$PREFIX/bin/.$ARCHSTR
+echo "CHICKEN_PREFIX=$CHICKEN_PREFIX" >> makefile.inc
+echo "PREFIX=$PREFIX" >> makefile.inc
+echo "ARCHSTR=$ARCHSTR" >> makefile.inc
+echo "IUPARCH=$IUPARCH" >> makefile.inc
+echo "CDVER=$CDVER" >> makefile.inc
+echo "IMVER=$IMVER" >> makefile.inc
+echo "IUPVER=$IUPVER" >> makefile.inc
+echo "IUPEGGVER=$IUPEGGVER" >> makefile.inc
+
if [[ ! $(type csi) ]];then
echo "Chicken build needed."
echo "BUILD_CHICKEN=yes" >> makefile.inc
configure_dependencies
echo "include chicken.makefile" >> makefile.inc
+else
+ echo "CSIPATH=$(which csi)" >> makefile.inc
+ echo "CKPATH=$(dirname $(dirname $CSIPATH))" >> makefile.inc
fi
-echo "All done creating makefile.inc, feel free to edit it!"
+# Make setup scripts
+echo "#!/bin/bash" > setup.sh
+echo "export PATH=$CHICKEN_PREFIX/bin:\$PATH" >> setup.sh
+echo "export LD_LIBRARY_PATH=$CHICKEN_PREFIX/lib" >> setup.sh
+echo 'exec "$@"' >> setup.sh
+chmod a+x setup.sh
+
+echo "setenv PATH $CHICKEN_PREFIX/bin:\$PATH" > setup.csh
+echo "setenv LD_LIBRARY_PATH $CHICKEN_PREFIX/lib" >> setup.csh
-
+echo "All done creating makefile.inc, feel free to edit it!"
+echo "run \"setup.sh bash\" or source setup.csh to get PATH and LD_LIBRARY_PATH adjusted"
Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -1484,11 +1484,11 @@
(hash-table-set! tests-draw-state 'first-time #t)
;; (hash-table-set! tests-draw-state 'scalef 1)
(tests:get-full-data test-names test-records '() all-tests-registry)
(set! sorted-testnames (tests:sort-by-priority-and-waiton test-records))
- ;; refer to (dboard:tabcodat-keys tabdat), (dboard:tabdat-dbkeys tabdat) for keys
+ ;; refer to (dboard:tabdat-keys tabdat), (dboard:tabdat-dbkeys tabdat) for keys
(let* ((result
(iup:vbox
(dcommon:command-execution-control tabdat)
(iup:split
#:orientation "VERTICAL" ;; "HORIZONTAL"
@@ -2765,65 +2765,83 @@
(cell-width (dboard:tabdat-runs-cell-width runs-dat)))
;; controls (along bottom)
;; (set! controls (dboard:make-controls commondat runs-dat))
;; create the left most column for the run key names and the test names
- (set! lftlst (list (iup:hbox
- (iup:label) ;; (iup:valuator)
- (apply iup:vbox
- (map (lambda (x)
- (let ((res (iup:hbox #:expand "HORIZONTAL"
- (iup:label x #:size (conc 40 btn-height) #:fontsize btn-fontsz #:expand "NO") ;; "HORIZONTAL")
- (iup:textbox #:size (conc 35 btn-height) #:fontsize btn-fontsz #:value "%" #:expand "NO" ;; "HORIZONTAL"
- #:action (lambda (obj unk val)
- ;; each field (field name is "x" var) live updates
- ;; the search filter as it is typed
- (dboard:tabdat-target-set! runs-dat #f) ;; ensure the fields text boxes are used and not the info from the tree
- (mark-for-update runs-dat)
- (update-search commondat runs-dat x val))))))
- (set! i (+ i 1))
- res))
- keynames)))))
+ (set! lftlst
+ (list (iup:hbox
+ (iup:label) ;; (iup:valuator)
+ (apply iup:vbox
+ (map (lambda (x)
+ (let ((res (iup:hbox
+ #:expand "HORIZONTAL"
+ (iup:label x
+ #:size (conc 40 btn-height)
+ #:fontsize btn-fontsz
+ #:expand "NO") ;; "HORIZONTAL")
+ (iup:textbox
+ #:size (conc 35 btn-height)
+ #:fontsize btn-fontsz
+ #:value "%"
+ #:expand "NO" ;; "HORIZONTAL"
+ #:action (lambda (obj unk val)
+ ;; each field
+ ;; (field name is "x" var) live updates
+ ;; the search filter as it is typed
+ (dboard:tabdat-target-set! runs-dat #f)
+ ;; ensure fields text boxes are used
+ ;; and not the info from the tree
+ (mark-for-update runs-dat)
+ (update-search commondat runs-dat x val))))))
+ (set! i (+ i 1))
+ res))
+ keynames)))))
(let loop ((testnum 0)
(res '()))
(cond
((>= testnum ntests)
;; now lftlst will be an hbox with the test keys and the test name labels
(set! lftlst
- (append lftlst
- (list (iup:hbox
- #:expand "HORIZONTAL"
- (iup:valuator
- #:valuechanged_cb (lambda (obj)
- (let ((val (string->number (iup:attribute obj "VALUE")))
- (oldmax (string->number (iup:attribute obj "MAX")))
- (newmax (* 10 (length (dboard:tabdat-all-test-names runs-dat)))))
- (dboard:commondat-please-update-set! commondat #t)
- (dboard:tabdat-start-test-offset-set! runs-dat (inexact->exact (round (/ val 10))))
- (debug:print 6 *default-log-port* "(dboard:tabdat-start-test-offset runs-dat) "
- (dboard:tabdat-start-test-offset runs-dat) " val: " val
- " newmax: " newmax " oldmax: " oldmax)
- (if (< val 10)
- (iup:attribute-set! obj "MAX" newmax))
- ))
- #:expand "VERTICAL"
- #:orientation "VERTICAL"
- #:min 0
- #:step 0.01)
- (apply iup:vbox (reverse res)))))))
+ (append
+ lftlst
+ (list
+ (iup:hbox
+ #:expand "HORIZONTAL"
+ (iup:valuator
+ #:valuechanged_cb
+ (lambda (obj)
+ (let ((val (string->number (iup:attribute obj "VALUE")))
+ (oldmax (string->number (iup:attribute obj "MAX")))
+ (newmax (* 10 (length (dboard:tabdat-all-test-names runs-dat)))))
+ (dboard:commondat-please-update-set! commondat #t)
+ (dboard:tabdat-start-test-offset-set! runs-dat
+ (inexact->exact (round (/ val 10))))
+ (debug:print 6 *default-log-port*
+ "(dboard:tabdat-start-test-offset runs-dat) "
+ (dboard:tabdat-start-test-offset runs-dat) " val: " val
+ " newmax: " newmax " oldmax: " oldmax)
+ (if (< val 10)
+ (iup:attribute-set! obj "MAX" newmax))
+ ))
+ #:expand "VERTICAL"
+ #:orientation "VERTICAL"
+ #:min 0
+ #:step 0.01)
+ (apply iup:vbox (reverse res)))))))
(else
- (let ((labl (iup:button "" ;; the testname labels
- #:flat "YES"
- #:alignment "ALEFT"
+ (let ((labl (iup:button
+ "" ;; the testname labels
+ #:flat "YES"
+ #:alignment "ALEFT"
; #:image img1
; #:impress img2
- #:size (conc cell-width btn-height)
- #:expand "HORIZONTAL"
- #:fontsize btn-fontsz
- #:action (lambda (obj)
- (mark-for-update runs-dat)
- (toggle-hide testnum (dboard:commondat-uidat commondat)))))) ;; (iup:attribute obj "TITLE"))))
+ #:size (conc cell-width btn-height)
+ #:expand "HORIZONTAL"
+ #:fontsize btn-fontsz
+ #:action (lambda (obj)
+ (mark-for-update runs-dat)
+ (toggle-hide testnum (dboard:commondat-uidat commondat))))))
(vector-set! lftcol testnum labl)
(loop (+ testnum 1)(cons labl res))))))
;; These are the headers for each row
(let loop ((runnum 0)
(keynum 0)
@@ -2921,11 +2939,11 @@
(dashboard:runs-horizontal-slider runs-dat))))
controls
))
(views-cfgdat (common:load-views-config))
(additional-tabnames '())
- (tab-start-num 6) ;; DON'T FORGET TO UPDATE THIS WHEN CHANGING THE STANDARD TABS BELOW
+ (tab-start-num 5) ;; DON'T FORGET TO UPDATE THIS WHEN CHANGING THE STANDARD TABS BELOW
;; (data (dboard:tabdat-init (make-d:data)))
(additional-views ;; process views-dat
(let ((tab-num tab-start-num)
(result '()))
(for-each
@@ -2964,24 +2982,22 @@
(dboard:commondat-please-update-set! commondat #t)
(dboard:tabdat-layout-update-ok-set! tabdat #t)))
"tabchangepos"))
(dashboard:summary commondat stats-dat tab-num: 0)
runs-view
- (make-runs-view commondat runs2-dat 2)
- (dashboard:runs-summary commondat onerun-dat tab-num: 3)
- ;; (dashboard:new-view db data new-view-dat tab-num: 3)
- (dashboard:run-controls commondat runcontrols-dat tab-num: 4)
- (dashboard:run-times commondat runtimes-dat tab-num: 5)
- ;; (dashboard:runs-summary commondat onerun-dat tab-num: 4)
+ ;; (make-runs-view commondat runs2-dat 2)
+ (dashboard:runs-summary commondat onerun-dat tab-num: 2)
+ (dashboard:run-controls commondat runcontrols-dat tab-num: 3)
+ (dashboard:run-times commondat runtimes-dat tab-num: 4)
additional-views)))
;; (set! (iup:callback tabs tabchange-cb:) (lambda (a b c)(print "SWITCHED TO TAB: " a " " b " " c)))
(iup:attribute-set! tabs "TABTITLE0" "Summary")
(iup:attribute-set! tabs "TABTITLE1" "Runs")
- (iup:attribute-set! tabs "TABTITLE2" "Runs2")
- (iup:attribute-set! tabs "TABTITLE3" "Run Summary")
- (iup:attribute-set! tabs "TABTITLE4" "Run Control")
- (iup:attribute-set! tabs "TABTITLE5" "Run Times")
+ ;; (iup:attribute-set! tabs "TABTITLE2" "Runs2")
+ (iup:attribute-set! tabs "TABTITLE2" "Run Summary")
+ (iup:attribute-set! tabs "TABTITLE3" "Run Control")
+ (iup:attribute-set! tabs "TABTITLE4" "Run Times")
;; (iup:attribute-set! tabs "TABTITLE3" "New View")
;; (iup:attribute-set! tabs "TABTITLE4" "Run Control")
;; set the tab names for user added tabs
(for-each
@@ -2993,14 +3009,14 @@
;; make the iup tabs object available (for changing color for example)
(dboard:commondat-hide-not-hide-tabs-set! commondat tabs)
;; now set up the tabdat lookup
(dboard:common-set-tabdat! commondat 0 stats-dat)
(dboard:common-set-tabdat! commondat 1 runs-dat)
+ ;;(dboard:common-set-tabdat! commondat 2 runs2-dat)
(dboard:common-set-tabdat! commondat 2 onerun-dat)
(dboard:common-set-tabdat! commondat 3 runcontrols-dat)
- (dboard:common-set-tabdat! commondat 4 runs2-dat)
- (dboard:common-set-tabdat! commondat 5 runtimes-dat)
+ (dboard:common-set-tabdat! commondat 4 runtimes-dat)
(iup:vbox
tabs
;; controls
))))
ADDED docs/manual/subrun-opt-stuff.fig
Index: docs/manual/subrun-opt-stuff.fig
==================================================================
--- /dev/null
+++ docs/manual/subrun-opt-stuff.fig
@@ -0,0 +1,128 @@
+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
+Landscape
+Center
+Inches
+Letter
+100.00
+Single
+-2
+1200 2
+6 150 5475 1650 9675
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 150 5475 1650 5475 1650 9675 150 9675 150 5475
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 225 5550 1575 5550 1575 6075 225 6075 225 5550
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 225 6150 1575 6150 1575 6675 225 6675 225 6150
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 225 6750 1575 6750 1575 7275 225 7275 225 6750
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 225 7350 1575 7350 1575 7875 225 7875 225 7350
+-6
+6 3900 5550 5400 9750
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 3900 5550 5400 5550 5400 9750 3900 9750 3900 5550
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 3975 5625 5325 5625 5325 6150 3975 6150 3975 5625
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 3975 6225 5325 6225 5325 6750 3975 6750 3975 6225
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 3975 6825 5325 6825 5325 7350 3975 7350 3975 6825
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 3975 7425 5325 7425 5325 7950 3975 7950 3975 7425
+-6
+6 8325 5700 9525 9825
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 8325 6000 9525 6000 9525 6825 8325 6825 8325 6000
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 8325 6900 9525 6900 9525 7725 8325 7725 8325 6900
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 8325 7800 9525 7800 9525 8625 8325 8625 8325 7800
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 8325 8700 9525 8700 9525 9525 8325 9525 8325 8700
+4 0 0 50 -1 0 12 0.0000 4 120 405 8475 5850 tests\001
+4 0 0 50 -1 0 12 0.0000 4 165 600 8400 6375 startup\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 8400 7275 opt1\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 8400 8025 opt2\001
+4 0 0 50 -1 0 12 0.0000 4 195 585 8400 9075 opt1v2\001
+4 0 0 50 -1 0 12 0.0000 4 15 180 8775 9825 ...\001
+-6
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 4800 450 6000 450 6000 1275 4800 1275 4800 450
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 1050 2100 2250 2100 2250 2925 1050 2925 1050 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 2925 2100 4125 2100 4125 2925 2925 2925 2925 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 4950 2100 6150 2100 6150 2925 4950 2925 4950 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 7200 2100 8400 2100 8400 2925 7200 2925 7200 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 9375 2100 10575 2100 10575 2925 9375 2925 9375 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 2025 4050 3225 4050 3225 4875 2025 4875 2025 4050
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 6525 3975 7725 3975 7725 4800 6525 4800 6525 3975
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 5400 1275 1500 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 5325 1275 3525 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 5325 1275 5475 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 5250 1275 7800 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 5325 1275 9900 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 1650 2925 2550 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 3525 2925 2550 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 3525 2925 7050 3975
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 5550 2925 6975 3975
+2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+ 750 1650 10875 1650 10875 3450 750 3450 750 1650
+2 1 0 1 0 7 50 -1 -1 3.000 0 0 -1 1 0 3
+ 0 0 1.00 60.00 120.00
+ 1050 2700 450 2700 450 5550
+2 1 0 1 0 7 50 -1 -1 3.000 0 0 -1 1 0 3
+ 0 0 1.00 60.00 120.00
+ 4125 2700 4650 2700 4650 5550
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 2100 5475 3300 5475 3300 8700 2100 8700 2100 5475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 2175 6000 3225 6000 3225 6525 2175 6525 2175 6000
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 1500 6375 2325 6300
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 4200 6525 3000 6225
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 7800 2925 7050 3975
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+ 0 0 1.00 60.00 120.00
+ 9975 2925 7125 3900
+4 0 0 50 -1 0 12 0.0000 4 165 600 4875 975 startup\001
+4 0 0 50 -1 0 12 0.0000 4 15 180 5325 2550 ...\001
+4 0 0 50 -1 0 12 0.0000 4 195 2100 900 675 p1278/2/cpdk_r0.5/none\001
+4 0 0 50 -1 0 12 0.0000 4 150 675 150 2475 subruns\001
+4 0 0 50 -1 0 12 0.0000 4 195 585 2175 4500 opt1v2\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 1200 2625 opt1\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 3150 2550 opt2\001
+4 0 0 50 -1 0 12 0.0000 4 150 2100 3075 150 SUBRUN for Multistack\001
+4 0 0 50 -1 0 12 0.0000 4 150 225 300 6375 ftc\001
+4 0 0 50 -1 0 12 0.0000 4 150 225 4050 6450 ftc\001
+4 0 0 50 -1 0 12 0.0000 4 195 2220 600 5250 p1278/2/cpdk_r0.5/x-opt1\001
+4 0 0 50 -1 0 12 0.0000 4 195 2220 4800 5325 p1278/2/cpdk_r0.5/y-opt2\001
Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -18,6 +18,6 @@
;; Always use two or four digit decimal
;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
(declare (unit megatest-version))
-(define megatest-version 1.6548)
+(define megatest-version 1.6601)