build: build with installed jerbuild (no ~/mine/jerboa dependency)
ober
31fdb718e3b0a4424c54273e5aa80984a2f7e1ff
--- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ -JERBOA_HOME ?= $(HOME)/mine/jerboa -SCHEME ?= $(JERBOA_HOME)/.chez/bin/scheme -JERBUILD ?= $(JERBOA_HOME)/jerbuild -LIBDIRS = lib:$(JERBOA_HOME)/lib +JERBUILD ?= jerbuild +JH := $(shell $(JERBUILD) --jerboa-home 2>/dev/null) +ifeq ($(JH),) +$(error jerbuild not found on PATH (or '$(JERBUILD) --jerboa-home' failed). Install jerbuild, or set JERBUILD=/path/to/jerbuild) +endif + +LIBDIRS = lib:$(JH)/lib QT_VENDOR_DIR := $(HOME)/mine/qt-vendor VENDOR_DIR := $(QT_VENDOR_DIR)/vendor @@ -50,7 +53,7 @@ test: build JERBOA_QT_LIB=$(CURDIR) \ $(LD_VAR)=$(CURDIR):$(VENDOR_DIR) \ QT_QPA_PLATFORM=offscreen \ - $(SCHEME) --libdirs "$(LIBDIRS)" --script tests/qt-test.ss + $(JERBUILD) exec --libdirs "$(LIBDIRS)" tests/qt-test.ss clean: rm -f $(SHIM) qt_chez_shim.so --- a/lib/jerboa-qt/qt.sls +++ b/lib/jerboa-qt/qt.sls @@ -521,7 +521,7 @@ printf fprintf format path-extension path-absolute? with-input-from-string with-output-to-string iota \x31;+ \x31;- partition make-date make-time meta atom?) - (jerboa prelude) + (except (jerboa prelude) string-split string-join) (jerboa-qt ffi)) (def QT_ALIGN_LEFT ffi-qt-const-align-left) (def QT_ALIGN_RIGHT ffi-qt-const-align-right)