Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -150,23 +150,24 @@ ;; if none running or if > 20 seconds since ;; server last used then start shutdown (let loop ((count 0)) (thread-sleep! 20) ;; no need to do this very often (let ((numrunning (db:get-count-tests-running db))) - (if (or (not (> numrunning 0)) - (> *last-db-access* (+ (current-seconds) 60))) + (if (or (> numrunning 0) + (> (+ *last-db-access* 60)(current-seconds))) + (begin + (debug:print 0 "INFO: Server continuing, tests running: " numrunning ", seconds since last db access: " (- (current-seconds) *last-db-access*)) + (loop (+ 1 count))) (begin (debug:print 0 "INFO: Starting to shutdown the server side") ;; need to delete only *my* server entry (future use) (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER' AND val like ?;" host:port) (thread-sleep! 10) (debug:print 0 "INFO: Max cached queries was " *max-cache-size*) (debug:print 0 "INFO: Server shutdown complete. Exiting") - (exit)) - (debug:print 0 "INFO: Server continuing, tests running: " numrunning ", seconds since last db access: " (- (current-seconds) *last-db-access*)) - )) - (loop (+ 1 count)))) + ;; (exit))) + ))))) (define (server:find-free-port-and-open port) (handle-exceptions exn (begin @@ -200,12 +201,12 @@ ;; #f) (set! *runremote* #f)) (if (and (not (args:get-arg "-server")) ;; no point in the server using the server using the server ((rpc:procedure 'server:login host portn) *toppath*)) (begin - (debug:print 2 "INFO: Connected to " host ":" port) + (debug:print 2 "INFO: Logged in and connected to " host ":" port) (set! *runremote* (vector host portn))) (begin - (debug:print 2 "INFO: Failed to connect to " host ":" port) + (debug:print 2 "INFO: Failed to login or connect to " host ":" port) (set! *runremote* #f))))) (debug:print 2 "INFO: no server available"))))) Index: utils/installall.sh ================================================================== --- utils/installall.sh +++ utils/installall.sh @@ -11,16 +11,21 @@ echo You may need to do the following first: echo sudo apt-get install libreadline-dev echo sudo apt-get install libwebkitgtk-dev echo sudo apt-get install libmotif3 -OR- set KTYPE=26g4 -echo KTYPE can be 26, 26g4, 32, or 32_64 +echo KTYPE can be 26, 26g4, or 32 echo KTYPE=$KTYPE echo You are using PREFIX=$PREFIX echo You are using proxy="$proxy" +echo echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :" echo ADDITIONAL_LIBPATH=$ADDITIONAL_LIBPATH +echo +echo To use previous IUP libraries set USEOLDIUP to yes +echo USEOLDIUP=$USEOLDIUP + echo Hit ^C now to do that # A nice way to run this script: # # script -c 'PREFIX=/tmp/delme ./installall.sh ' installall.log @@ -68,20 +73,28 @@ make PLATFORM=linux PREFIX=$PREFIX make PLATFORM=linux PREFIX=$PREFIX install cd $BUILDHOME fi -for f in 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 ; do - chicken-install $PROX $f +# Some eggs are quoted since they are reserved to Bash +for f in 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 ; do + if ! [[ -e $PREFIX/lib/chicken/6/$f.so ]];then + chicken-install $PROX $f + else + echo Skipping install of egg $f as it is already installed + fi done cd $BUILDHOME for a in `ls */*.meta|cut -f1 -d/` ; do echo $a (cd $a;chicken-install) done + +export LIBPATH=$PREFIX/lib$ADDITIONAL_LIBPATH +export LD_LIBRARY_PATH=$LIBPATH export SQLITE3_VERSION=3071401 echo Install sqlite3 if ! [[ -e sqlite-autoconf-$SQLITE3_VERSION.tar.gz ]]; then wget http://www.sqlite.org/sqlite-autoconf-$SQLITE3_VERSION.tar.gz @@ -101,15 +114,16 @@ export ARCHSIZE='' else export ARCHSIZE=64_ fi # export files="cd-5.4.1_Linux${KTYPE}_lib.tar.gz im-3.6.3_Linux${KTYPE}_lib.tar.gz iup-3.5_Linux${KTYPE}_lib.tar.gz" -export files="cd-5.5.1_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz im-3.8_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz iup-3.6_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz" -# else -# # export files="cd-5.4.1_Linux${KTYPE}_64_lib.tar.gz im-3.6.3_Linux${KTYPE}_64_lib.tar.gz iup-3.5_Linux${KTYPE}_64_lib.tar.gz" -# export files="cd-5.5.1_Linux${KTYPE}_lib.tar.gz im-3.6.3_Linux${KTYPE}_lib.tar.gz iup-3.5_Linux${KTYPE}_lib.tar.gz" -# fi +if [[ x$USEOLDIUP == "x" ]];then + export files="cd-5.5.1_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz im-3.8_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz iup-3.6_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz" +else + echo WARNING: Using old IUP libraries + export files="cd-5.4.1_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz im-3.6.3_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz iup-3.5_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz" +fi mkdir $PREFIX/iuplib for a in `echo $files` ; do if ! [[ -e $a ]] ; then wget http://www.kiatoa.com/matt/iup/$a