luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use into as catvec replacement for now

Browse source
This commit is contained in:
Michiel Borkent 2022-05-03 16:47:43 +02:00
parent e65f86a39d
commit 41dcc9239a
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
script/compile
View file

@ -105,7 +105,6 @@ then
export BABASHKA_FEATURE_SELMER="${BABASHKA_FEATURE_SELMER:-false}" export BABASHKA_FEATURE_SELMER="${BABASHKA_FEATURE_SELMER:-false}"
export BABASHKA_FEATURE_LOGGING="${BABASHKA_FEATURE_LOGGING:-false}" export BABASHKA_FEATURE_LOGGING="${BABASHKA_FEATURE_LOGGING:-false}"
export BABASHKA_FEATURE_PRIORITY_MAP="${BABASHKA_FEATURE_PRIORITY_MAP:-false}" export BABASHKA_FEATURE_PRIORITY_MAP="${BABASHKA_FEATURE_PRIORITY_MAP:-false}"
export BABASHKA_FEATURE_RRB_VECTOR="${BABASHKA_FEATURE_RRB_VECTOR:-false}"
fi fi
"$GRAALVM_HOME/bin/native-image" "${args[@]}" "$GRAALVM_HOME/bin/native-image" "${args[@]}"

2
script/uberjar
View file

@ -168,7 +168,7 @@ else
BABASHKA_LEIN_PROFILES+=",-feature/priority-map" BABASHKA_LEIN_PROFILES+=",-feature/priority-map"
fi fi
if [ "$BABASHKA_FEATURE_RRB_VECTOR" != "false" ] if [ "$BABASHKA_FEATURE_RRB_VECTOR" = "true" ]
then then
BABASHKA_LEIN_PROFILES+=",+feature/rrb-vector" BABASHKA_LEIN_PROFILES+=",+feature/rrb-vector"
else else

2
src/babashka/impl/features.clj
View file

@ -17,7 +17,6 @@
(def selmer? (not= "false" (System/getenv "BABASHKA_FEATURE_SELMER"))) (def selmer? (not= "false" (System/getenv "BABASHKA_FEATURE_SELMER")))
(def logging? (not= "false" (System/getenv "BABASHKA_FEATURE_LOGGING"))) (def logging? (not= "false" (System/getenv "BABASHKA_FEATURE_LOGGING")))
(def priority-map? (not= "false" (System/getenv "BABASHKA_FEATURE_PRIORITY_MAP"))) (def priority-map? (not= "false" (System/getenv "BABASHKA_FEATURE_PRIORITY_MAP")))
(def rrb-vector? (not= "false" (System/getenv "BABASHKA_FEATURE_RRB_VECTOR")))
;; excluded by default ;; excluded by default
(def jdbc? (= "true" (System/getenv "BABASHKA_FEATURE_JDBC"))) (def jdbc? (= "true" (System/getenv "BABASHKA_FEATURE_JDBC")))
@ -28,6 +27,7 @@
(def datascript? (= "true" (System/getenv "BABASHKA_FEATURE_DATASCRIPT"))) (def datascript? (= "true" (System/getenv "BABASHKA_FEATURE_DATASCRIPT")))
(def lanterna? (= "true" (System/getenv "BABASHKA_FEATURE_LANTERNA"))) (def lanterna? (= "true" (System/getenv "BABASHKA_FEATURE_LANTERNA")))
(def spec-alpha? (= "true" (System/getenv "BABASHKA_FEATURE_SPEC_ALPHA"))) (def spec-alpha? (= "true" (System/getenv "BABASHKA_FEATURE_SPEC_ALPHA")))
(def rrb-vector? (= "true" (System/getenv "BABASHKA_FEATURE_RRB_VECTOR")))
(when xml? (when xml?
(require '[babashka.impl.xml])) (require '[babashka.impl.xml]))

8
src/babashka/main.clj
View file

@ -387,7 +387,10 @@ Use bb run --help to show this help output.
'rewrite-clj.paredit rewrite/paredit-namespace 'rewrite-clj.paredit rewrite/paredit-namespace
'rewrite-clj.parser rewrite/parser-namespace 'rewrite-clj.parser rewrite/parser-namespace
'rewrite-clj.zip rewrite/zip-namespace 'rewrite-clj.zip rewrite/zip-namespace
'rewrite-clj.zip.subedit rewrite/subedit-namespace} 'rewrite-clj.zip.subedit rewrite/subedit-namespace
'clojure.core.rrb-vector (if features/rrb-vector?
@(resolve 'babashka.impl.rrb-vector/rrb-vector-namespace)
{'catvec (sci/copy-var into (sci/create-ns 'clojure.core.rrb-vector))})}
features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace) features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace)
'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace) 'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace)
'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace)) 'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace))
@ -447,8 +450,7 @@ Use bb run --help to show this help output.
'clojure.tools.logging.readable 'clojure.tools.logging.readable
@(resolve 'babashka.impl.logging/tools-logging-readable-namespace)) @(resolve 'babashka.impl.logging/tools-logging-readable-namespace))
features/priority-map? (assoc 'clojure.data.priority-map features/priority-map? (assoc 'clojure.data.priority-map
@(resolve 'babashka.impl.priority-map/priority-map-namespace)) @(resolve 'babashka.impl.priority-map/priority-map-namespace))))
features/rrb-vector? (assoc 'clojure.core.rrb-vector @(resolve 'babashka.impl.rrb-vector/rrb-vector-namespace))))
(def edn-readers (cond-> {} (def edn-readers (cond-> {}
features/yaml? features/yaml?