Overview
| Comment: | removed CHICKEN_REPOSITORY from cfg.sh now that we have a better solution |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v2.01-local-mtfiles | v2.01-try-1 |
| Files: | files | file ages | folders |
| SHA1: |
1f8f21e43ec6754b81a0014b9dcad5f6 |
| User & Date: | bjbarcla on 2018-12-18 18:13:48 |
| Other Links: | branch diff | manifest | tags |
Context
|
2018-12-20
| ||
| 18:04 | adjusted mtconfig module calls to properly reflect namespace check-in: 6a50f08af8 user: bjbarcla tags: v2.01-local-mtfiles, v2.01-try-1 | |
|
2018-12-18
| ||
| 18:13 | removed CHICKEN_REPOSITORY from cfg.sh now that we have a better solution check-in: 1f8f21e43e user: bjbarcla tags: v2.01-local-mtfiles, v2.01-try-1 | |
| 13:10 | updated method to set repository path to enable build-private egg installs check-in: f05f040231 user: bjbarcla tags: v2.01-local-mtfiles, v2.01-try-1 | |
Changes
Modified Makefile from [082fe8dfd7] to [12acad184c].
| ︙ | ︙ | |||
47 48 49 50 51 52 53 | OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) MOFILES = $(MSRCFILES:%.scm=%.o) | | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 |
OFILES = $(SRCFILES:%.scm=%.o)
GOFILES = $(GUISRCF:%.scm=%.o)
MOFILES = $(MSRCFILES:%.scm=%.o)
%.o : %.scm ../adat.scm $(MTEGGS)
csc $(CSCOPTS) -J -c $< -o $*.o
ADTLSCR=mt_laststep mt_runstep mt_ezstep
HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
MT_EGGS_BASE=$(PREFIX)/eggs
MT_EGGS_DIR=$(MT_EGGS_BASE)/lib/chicken/7
MTEGGS=$(MT_EGGS_DIR)/mtconfigf.so
CHICKEN_REPOSITORY=$(MT_EGGS_DIR)
export CHICKEN_REPOSITORY
#CSCOPTS=-Wl,-rpath,$(MT_EGGS_DIR)
# prefix commands with $(withenv) following as a means to collect env vars for compilation...
withenv=CHICKEN_REPOSITORY=$(MT_EGGS_DIR)
ifeq ($(MTESTHASH),)
$(error MTESTHASH is broken!)
|
| ︙ | ︙ | |||
193 194 195 196 197 198 199 | tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o \ archive.o megatest.o : db_records.scm tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm megatest.o : megatest-fossil-hash.scm | | | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 | tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o \ archive.o megatest.o : db_records.scm tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm megatest.o : megatest-fossil-hash.scm rmt.scm client.scm common.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm $(MTEGGS) common_records.scm : altdb.scm vg.o dashboard.o : vg_records.scm dcommon.o : run_records.scm # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm |
| ︙ | ︙ |
Modified common.scm from [be9a9ca619] to [618eedc185].
| ︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
(directory-exists? libpath))
(repository-path libpath)))
;;(declare (uses mtconfigf))
(use (prefix mtconfigf configf:))
(include "common_records.scm")
;; (require-library margs)
;; (include "margs.scm")
| > > > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
(directory-exists? libpath))
(repository-path libpath)))
;;(declare (uses mtconfigf))
(use (prefix mtconfigf configf:))
;;(configf:add-eval-string "(use common)")
(include "common_records.scm")
;; (require-library margs)
;; (include "margs.scm")
|
| ︙ | ︙ |
Modified utils/mk_wrapper from [6b786d9d7b] to [19d546f47d].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 | echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2 ( cat << __EOF if [[ -z \$LD_LIBRARY_PATH ]];then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH else export LD_LIBRARY_PATH=$LD_LIBRARY_PATH fi | < < < | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2 ( cat << __EOF if [[ -z \$LD_LIBRARY_PATH ]];then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH else export LD_LIBRARY_PATH=$LD_LIBRARY_PATH fi __EOF ) > $cfgfile echo else echo "INFO: LD_LIBRARY_PATH not set" >&2 fi |
| ︙ | ︙ |