simon/mw-scittle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Michiel Borkent 2023-05-03 14:05:32 +02:00
parent 8d3f0f51f4
commit 1b9793733d
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bb.edn
View file

@ -4,7 +4,8 @@
io.github.babashka/http-server io.github.babashka/http-server
{:git/sha "b38c1f16ad2c618adae2c3b102a5520c261a7dd3"} {:git/sha "b38c1f16ad2c618adae2c3b102a5520c261a7dd3"}
io.github.scittle/build io.github.scittle/build
{:local/root "build"}} {:local/root "build"}
io.github.babashka/scittle.datascript {:local/root "plugins/datascript"}}
:tasks :tasks
{:requires ([scittle.build :as build] {:requires ([scittle.build :as build]

10
build/src/scittle/build.clj
View file

@ -11,7 +11,7 @@
[] []
(filter fs/exists? (filter fs/exists?
(map (fn [d] (map (fn [d]
(fs/file d "scittle_features.edn")) (fs/file d "scittle_plugin.edn"))
(classpath/split-classpath (classpath/get-classpath))))) (classpath/split-classpath (classpath/get-classpath)))))
(defn- read-configs (defn- read-configs
@ -21,8 +21,9 @@
(defn- build-cmd [cmd scittle-dir] (defn- build-cmd [cmd scittle-dir]
(let [files (feature-files) (let [files (feature-files)
_ (prn :files files)
feature-configs (read-configs files) feature-configs (read-configs files)
;; Each ./src/scittle_features.edn has a ./deps.edn ;; Each ./src/scittle_plugin.edn has a ./deps.edn
feature-dirs (map (comp fs/parent fs/parent) files) feature-dirs (map (comp fs/parent fs/parent) files)
cmd' (if (seq files) cmd' (if (seq files)
(format "-Sdeps '%s' %s" (format "-Sdeps '%s' %s"
@ -35,6 +36,7 @@
{'scittle/deps {:local/root scittle-dir}})} {'scittle/deps {:local/root scittle-dir}})}
cmd) cmd)
cmd)] cmd)]
(prn :cmd' cmd')
(when (seq feature-configs) (when (seq feature-configs)
(println "Building features:" (str/join ", " (map :name feature-configs)) "...")) (println "Building features:" (str/join ", " (map :name feature-configs)) "..."))
(if (seq feature-configs) (if (seq feature-configs)
@ -54,8 +56,8 @@
fs/parent))] fs/parent))]
(when building-outside-scittle? (when building-outside-scittle?
(fs/copy (fs/file scittle-dir "shadow-cljs.edn") "shadow-cljs.edn")) (fs/copy (fs/file scittle-dir "shadow-cljs.edn") "shadow-cljs.edn"))
(apply clojure {:extra-env {"SCI_ELIDE_VARS" "true"}} (let [cmd (build-cmd cmd (str scittle-dir))]
(build-cmd cmd (str scittle-dir)) args) (apply clojure {:extra-env {"SCI_ELIDE_VARS" "true"}} cmd args))
(when building-outside-scittle? (when building-outside-scittle?
(fs/delete "shadow-cljs.edn")))) (fs/delete "shadow-cljs.edn"))))

3
deps.edn
View file

@ -1,5 +1,4 @@
{:paths ["src" "resources"] {:paths ["src" "resources"]
:deps :deps
{org.clojure/clojure {:mvn/version "1.11.1"} {org.clojure/clojure {:mvn/version "1.11.1"}
thheller/shadow-cljs {:mvn/version "2.20.15"} thheller/shadow-cljs {:mvn/version "2.20.15"}
@ -20,7 +19,7 @@
io.github.babashka/sci.configs io.github.babashka/sci.configs
#_{:local/root "/Users/borkdude/dev/sci.configs"} #_{:local/root "/Users/borkdude/dev/sci.configs"}
{:git/url "https://github.com/babashka/sci.configs" {:git/url "https://github.com/babashka/sci.configs"
:git/sha "bf8d209e4aeabb92cb1be04e3d8f789583d5f449"}} :git/sha "33bd51e53700b224b4cb5bda59eb21b62f962745"}}
:aliases :aliases
{:dev {:dev
{:extra-paths ["dev"] {:extra-paths ["dev"]

3
plugins/datascript/deps.edn
View file

@ -0,0 +1,3 @@
{:deps
{datascript/datascript {:mvn/version "1.3.12"}
io.github.babashka/sci.configs {:git/sha "33bd51e53700b224b4cb5bda59eb21b62f962745"}}}