Overview
Comment: | Testing ordering of loading zmq, fixes to deploy script |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
8c476e86276e109431cf8d4a5b8d8d93 |
User & Date: | mrwellan on 2012-11-06 09:44:27 |
Other Links: | manifest | tags |
Context
2012-11-12
| ||
19:50 | Cherrypicked the fix to building for deploy check-in: e4ac93792c user: matt tags: trunk | |
00:04 | Interleaving query enablement, server side coded check-in: 4980ca9f98 user: matt tags: interleaved-queries | |
2012-11-06
| ||
09:44 | Testing ordering of loading zmq, fixes to deploy script check-in: 8c476e8627 user: mrwellan tags: trunk | |
06:21 | Added deploy script check-in: af55ffc7d7 user: matt tags: trunk | |
Changes
Modified db.scm from [fd4b646002] to [108dfe0472].
︙ | ︙ | |||
12 13 14 15 16 17 18 | ;;====================================================================== ;; Database access ;;====================================================================== (require-extension (srfi 18) extras tcp rpc) (import (prefix rpc rpc:)) | | > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | ;;====================================================================== ;; Database access ;;====================================================================== (require-extension (srfi 18) extras tcp rpc) (import (prefix rpc rpc:)) (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)) (include "common_records.scm") |
︙ | ︙ | |||
1640 1641 1642 1643 1644 1645 1646 | (debug:print 6 "record(after) = " record "\nid: " (db:step-get-id step) "\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))) | > > | > > | 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 | (debug:print 6 "record(after) = " record "\nid: " (db:step-get-id step) "\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)) ))) res))) ;;====================================================================== ;; M I S C M A N A G E M E N T I T E M S ;;====================================================================== ;; the new prereqs calculation, looks also at itempath if specified |
︙ | ︙ |
Modified megatest.scm from [323313750f] to [8b945e5bb2].
1 2 3 4 5 6 7 8 9 10 11 12 | ;; Copyright 2006-2012, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. ;; (include "common.scm") ;; (include "megatest-version.scm") | | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ;; Copyright 2006-2012, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. ;; (include "common.scm") ;; (include "megatest-version.scm") (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)) (declare (uses launch)) (declare (uses server)) |
︙ | ︙ |
Modified server.scm from [65718bc009] to [c2beddecc4].
1 2 3 4 5 6 7 8 9 10 11 12 13 | ;; Copyright 2006-2012, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. (require-extension (srfi 18) extras tcp rpc s11n) (import (prefix rpc rpc:)) | | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ;; Copyright 2006-2012, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. (require-extension (srfi 18) extras tcp rpc s11n) (import (prefix rpc rpc:)) (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)) (declare (uses tests)) (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running. |
︙ | ︙ |
Modified utils/deploy.sh from [c79c41a021] to [614579fd81].
︙ | ︙ | |||
18 19 20 21 22 23 24 | export PROX="-proxy $proxy" fi export CHICKENINSTDIR=$(dirname $(dirname $(type -p csi))) # First copy in the needed iup, sqlite3 and zmq libraries cp $CHICKENINSTDIR/lib/lib{zmq,uuid}* $DEPLOYTARG | | | | | > > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | export PROX="-proxy $proxy" fi 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 ; do if ! [[ -e $DEPLOYTARG/$f.so ]];then 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 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 |