Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -14,12 +14,14 @@ ;;====================================================================== (require-extension (srfi 18) extras tcp rpc) (import (prefix rpc rpc:)) -(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n zmq) +(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n) (import (prefix sqlite3 sqlite3:)) + +(use zmq) (declare (unit db)) (declare (uses common)) (declare (uses keys)) (declare (uses ods)) @@ -1642,11 +1644,15 @@ "\nstepname: " (db:step-get-stepname step) "\nstate: " (db:step-get-state step) "\nstatus: " (db:step-get-status step) "\ntime: " (db:step-get-event_time step)))) ;; (else (vector-set! record 1 (db:step-get-event_time step))) - (sort steps (lambda (a b)(< (db:step-get-event_time a)(db:step-get-event_time b))))) + (sort steps (lambda (a b) + + (< (db:step-get-event_time a)(db:step-get-event_time b)) + + ))) res))) ;;====================================================================== ;; M I S C M A N A G E M E N T I T E M S ;;====================================================================== Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -8,13 +8,15 @@ ;; PURPOSE. ;; (include "common.scm") ;; (include "megatest-version.scm") -(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos zmq) ;; (srfi 18) extras) +(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos ) ;; (srfi 18) extras) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) + +(use zmq) (declare (uses common)) (declare (uses megatest-version)) (declare (uses margs)) (declare (uses runs)) Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -9,12 +9,14 @@ ;; PURPOSE. (require-extension (srfi 18) extras tcp rpc s11n) (import (prefix rpc rpc:)) -(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo zmq md5 message-digest) +(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest) (import (prefix sqlite3 sqlite3:)) + +(use zmq) (declare (unit server)) (declare (uses common)) (declare (uses db)) Index: utils/deploy.sh ================================================================== --- utils/deploy.sh +++ utils/deploy.sh @@ -20,23 +20,25 @@ export CHICKENINSTDIR=$(dirname $(dirname $(type -p csi))) # First copy in the needed iup, sqlite3 and zmq libraries cp $CHICKENINSTDIR/lib/lib{zmq,uuid}* $DEPLOYTARG - +cp $CHICKENINSTDIR/lib/libchicken.* $DEPLOYTARG # Then run the deploy for all needed # Some eggs are quoted since they are reserved to Bash for f in matchable readline apropos base64 regex-literals format "regex-case" "test" coops \ trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc \ - csv-xml fmt json md5 iup canvas-draw sqlite3 ; do + csv-xml fmt json md5 iup canvas-draw ; do if ! [[ -e $DEPLOYTARG/$f.so ]];then - chicken-install -deploy $f -prefix $DEPLOYTARG + chicken-install $PROX -deploy $f -prefix $DEPLOYTARG # chicken-install -deploy -prefix $DEPLOYTARG $PROX $f else echo Skipping install of egg $f as it is already installed fi done -CSC_OPTIONS="-I$CHICKENINSTDIR/include -L$DEPLOYTARG" chicken-install -deploy zmq -prefix $DEPLOYTARG +export CSC_OPTIONS="-I$CHICKENINSTDIR/include -L$DEPLOYTARG" +chicken-install -deploy zmq -prefix $DEPLOYTARG +chicken-install -deploy sqlite3 -prefix $DEPLOYTARG make $DEPLOYTARG/megatest make $DEPLOYTARG/dashboard