ADDED build-assist/iup-compile.sh Index: build-assist/iup-compile.sh ================================================================== --- /dev/null +++ build-assist/iup-compile.sh @@ -0,0 +1,19 @@ +if [[ -z $PREFIX ]];then + echo "PREFIX required" + exit +fi + +echo "Put iup, im and cd .a and .so files in PREFIX/lib" +echo " 1. get opensrc fossil from https://www.kiatoa.com/fossils/opensrc" +echo " 2. list the unversioned files and export the cd, im and iup lib for your kernel (try uname -a for the kernel number) 4.15 ==> 415_64" +echo " 3. untar iup, im and cp tars into a clean working dir and then copy:" +echo " cp *.a *.so $PREFIX/lib" +echo " cp include/*.h $PREFIX/include" +echo " 4. run the chicken-install like this:" + +echo "If you use a wrapper (e.g. ck5) to create the chicken environment:" +echo "CSC_OPTIONS=\"-I$PREFIX/include -I$PREFIX/include/im -I$PREFIX/include/cd -I$PREFIX/include/iup -L$PREFIX/lib -C -std=gnu99\" ck5 chicken-install iup" +echo "else:" +echo "CSC_OPTIONS=\"-I$PREFIX/include -I$PREFIX/include/im -I$PREFIX/include/cd -I$PREFIX/include/iup -L$PREFIX/lib -C -std=gnu99\" chicken-install iup" +echo "Then repeat for canvas-draw" + Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -18,25 +18,26 @@ ;; ;;====================================================================== (use format) +(declare (uses ducttape-lib)) (require-library iup) (import (prefix iup iup:)) -(use canvas-draw) -(import canvas-draw-iup) -(use ducttape-lib) +(import canvas-draw) +;; (import canvas-draw-iup) +(import ducttape-lib) (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct (import (prefix sqlite3 sqlite3:)) -(declare (uses common)) -(declare (uses margs)) -(declare (uses keys)) -(declare (uses items)) -(declare (uses db)) -(declare (uses configf)) +(declare (uses commonmod)) +(declare (uses mtargs)) +;; (declare (uses keys)) +(declare (uses itemsmod)) +(declare (uses dbmod)) +(declare (uses configfmod)) (declare (uses process)) (declare (uses launch)) (declare (uses runs)) (declare (uses dashboard-tests)) (declare (uses dashboard-guimonitor)) @@ -45,18 +46,26 @@ (declare (uses dashboard-context-menu)) (declare (uses vg)) (declare (uses subrun)) ;; (declare (uses dashboard-main)) (declare (uses mt)) +(declare (uses mtver)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") -(include "megatest-version.scm") +;; (include "megatest-version.scm") (include "megatest-fossil-hash.scm") (include "vg_records.scm") + +(import commonmod + mtargs + itemsmod + dbmod + configfmod + ) (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright (C) Matt Welland 2012-2017 Index: dcommon.scm ================================================================== --- dcommon.scm +++ dcommon.scm @@ -19,25 +19,28 @@ ;;====================================================================== (use format) (require-library iup) (import (prefix iup iup:)) -(use canvas-draw) -(import canvas-draw-iup) +(import canvas-draw) +;; (import canvas-draw-iup) (use regex typed-records matchable) (declare (unit dcommon)) (declare (uses gutils)) (declare (uses db)) +(declare (uses mtver)) ;; (declare (uses synchash)) -(include "megatest-version.scm") +;; (include "megatest-version.scm") (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") + +(import mtver) ;; yes, this is non-ideal (define dashboard:update-summary-tab #f) (define dashboard:update-servers-table #f) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -128,11 +128,10 @@ ;; local modules autoload adjutant csv-xml - ducttape-lib hostinfo mtver mutils cookie csv-xml Index: tree.scm ================================================================== --- tree.scm +++ tree.scm @@ -16,29 +16,33 @@ ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see . ;; ;;====================================================================== -(use format) -(require-library iup) +(import format) +;; (import iup) (import (prefix iup iup:)) -(use canvas-draw) +(import canvas-draw) -(use sqlite3 srfi-1 posix regex regex-case srfi-69) +(import sqlite3 srfi-1 + chicken.file.posix + regex regex-case srfi-69) (import (prefix sqlite3 sqlite3:)) (declare (unit tree)) -(declare (uses margs)) +(declare (uses mtargs)) +(declare (uses mtver)) (declare (uses launch)) ;; (declare (uses megatest-version)) (declare (uses gutils)) -(declare (uses db)) -(declare (uses server)) +(declare (uses dbmod)) +(declare (uses servermod)) ;; (declare (uses synchash)) (declare (uses dcommon)) -(include "megatest-version.scm") +(import mtver) +;; (include "megatest-version.scm") (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") ;;======================================================================