Overview
Comment: | Added bit more to datashare |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.55 |
Files: | files | file ages | folders |
SHA1: |
8e9852ca992a4d7bfb159f96e41b732c |
User & Date: | matt on 2014-08-05 00:09:43 |
Other Links: | branch diff | manifest | tags |
Context
2014-08-13
| ||
13:57 | Unset TARGET* vars before starting the real work in nbfake check-in: e89be5432c user: mrwellan tags: v1.55 | |
2014-08-05
| ||
00:09 | Added bit more to datashare check-in: 8e9852ca99 user: matt tags: v1.55 | |
2014-08-01
| ||
01:04 | Added three loop tries for -runtests check-in: 1c0eb707c7 user: matt tags: v1.55 | |
Changes
Modified Makefile from [0989ef3f6a] to [660e49132a].
︙ | ︙ | |||
161 162 163 164 165 166 167 | csc -deploy $(CSCOPTS) $(OFILES) megatest.scm -o deploytarg mv deploytarg/deploytarg deploytarg/mtest deploytarg/dboard : $(OFILES) $(GOFILES) dashboard.scm deploytarg/apropos.so csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg mv deploytarg/deploytarg deploytarg/dboard | > > > > > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 | csc -deploy $(CSCOPTS) $(OFILES) megatest.scm -o deploytarg mv deploytarg/deploytarg deploytarg/mtest deploytarg/dboard : $(OFILES) $(GOFILES) dashboard.scm deploytarg/apropos.so csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg mv deploytarg/deploytarg deploytarg/dboard DATASHAREO=configf.o common.o process.o datashare-testing/datashare : datashare.scm $(DATASHAREO) csc datashare.scm $(DATASHAREO) -o datashare-testing/datashare datashare : datashare-testing/datashare ./datashare-testing/datashare |
Modified datashare-testing/.datashare.config from [dd7d3035a4] to [1d9aef34b1].
|
| > | > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | # Read in the users vars first (so the offical data cannot be overridden [include datastore.config] [storagegroups] 1 eng /tmp/datastore/eng [areas] synthesis asic/synthesis verilog asic/verilog oalibs custom/oalibs [target] basepath #{getenv BASEPATH} [quality] 0 untested 1 lightly tested 2 tested 3 full QA |
Modified datashare.scm from [7b598fa3cf] to [c941a31a14].
︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 | (import (prefix ini-file ini:)) (use canvas-draw) (import canvas-draw-iup) (use sqlite3 srfi-1 posix regex regex-case srfi-69) (import (prefix sqlite3 sqlite3:)) (include "megatest-fossil-hash.scm") ;; ;; GLOBALS ;; (define *datashare:current-tab-number* 0) | > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | (import (prefix ini-file ini:)) (use canvas-draw) (import canvas-draw-iup) (use sqlite3 srfi-1 posix regex regex-case srfi-69) (import (prefix sqlite3 sqlite3:)) (declare (uses configf)) (include "megatest-fossil-hash.scm") ;; ;; GLOBALS ;; (define *datashare:current-tab-number* 0) |
︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 | (id INTEGER PRIMARY KEY, area TEXT, key TEXT, iteration INTEGER, submitter TEXT, datetime TEXT, storegrp TEXT, disk_id INTEGER, comment TEXT);" "CREATE TABLE refs (id INTEGER PRIMARY KEY, pkg_id INTEGER, destlink TEXT);" "CREATE TABLE disks | > > | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | (id INTEGER PRIMARY KEY, area TEXT, key TEXT, iteration INTEGER, submitter TEXT, datetime TEXT, storegrp TEXT, datavol INTEGER, quality TEXT, disk_id INTEGER, comment TEXT);" "CREATE TABLE refs (id INTEGER PRIMARY KEY, pkg_id INTEGER, destlink TEXT);" "CREATE TABLE disks |
︙ | ︙ | |||
122 123 124 125 126 127 128 | ;; #:modal? #t ;; ;; set positon using coordinates or center, start, top, left, end, bottom, right, parent-center, current ;; ;; #:x 'mouse ;; ;; #:y 'mouse ;; ) )))) | | > > > > > > > > > > > > > > | > > > > > > > > | | < < < < < < < | | | | | > | | | | | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | ;; #:modal? #t ;; ;; set positon using coordinates or center, start, top, left, end, bottom, right, parent-center, current ;; ;; #:x 'mouse ;; ;; #:y 'mouse ;; ) )))) (define (datashare:publish-view configdat) (let* ((label-size "50x") (areas-sel (iup:listbox #:expand "YES" #:dropdown "YES")) (version-val (iup:textbox #:expand "YES" #:size "50x")) (iteration (iup:textbox #:expand "YES" #:size "20x")) (comment (iup:textbox #:expand "YES")) (source-path (iup:textbox #:expand "YES")) (browse-btn (iup:button "Browse" #:size "40x" #:action (lambda (obj) (let* ((fd (iup:file-dialog #:dialogtype "DIR")) (top (iup:show fd #:modal? "YES"))) (iup:attribute-set! source-path "VALUE" (iup:attribute fd "VALUE")) (iup:destroy! fd)))))) (iup:vbox (iup:hbox (iup:label "Area:" #:size label-size) areas-sel) (iup:hbox (iup:label "Version:" #:size label-size) version-val (iup:label "Iteration:") iteration) (iup:hbox (iup:label "Comment:" #:size label-size) comment) (iup:hbox (iup:label "Source path:" #:size label-size) source-path browse-btn)))) (define (datashare:get-view configdat) (iup:vbox (iup:hbox (iup:button "Pushme" #:expand "YES" )))) (define (datashare:manage-view configdat) (iup:vbox (iup:hbox (iup:button "Pushme" #:expand "YES" )))) (define (datashare:gui configdat) (iup:show (iup:dialog #:title (conc "DataShare dashboard " (current-user-name) ":" (current-directory)) #:menu (datashare:main-menu) (let* ((tabs (iup:tabs #:tabchangepos-cb (lambda (obj curr prev) (set! *datashare:current-tab-number* curr)) (datashare:publish-view configdat) (datashare:get-view configdat) (datashare:manage-view configdat) ))) ;; (set! (iup:callback tabs tabchange-cb:) (lambda (a b c)(print "SWITCHED TO TAB: " a " " b " " c))) (iup:attribute-set! tabs "TABTITLE0" "Publish") (iup:attribute-set! tabs "TABTITLE1" "Get") (iup:attribute-set! tabs "TABTITLE2" "Manage") ;; (iup:attribute-set! tabs "BGCOLOR" "190 190 190") tabs))) (iup:main-loop)) ;;====================================================================== ;; MAIN ;;====================================================================== (define (datashare:load-config path) (let ((fname (conc path "/.datashare.config"))) (ini:property-separator-patt " * *") (ini:property-separator #\space) (if (file-exists? fname) ;; (ini:read-ini fname) (read-config fname #f #t) (make-hash-table)))) (define (main) (let* ((args (argv)) (prog (car args)) (rema (cdr args)) (configdat (datashare:load-config (pathname-directory prog)))) (cond ((eq? (length rema) 1) (case (string->symbol (car rema)) ((help -h -help --h --help) (print datashare:help)) (else (print "ERROR: Unrecognised command. Try \"datashare help\"")))) ((null? rema)(datashare:gui configdat)) ((>= (length rema) 2) (apply process-action (car rema)(cdr rema))) (else (print "ERROR: Unrecognised command. Try \"datashare help\""))))) (main) |
tests/installall/config/megatest.config.dat became a symlink with target [736a5da885].
tests/installall/config/runconfigs.config.dat became a symlink with target [3b8f260acb].