From 1f763a443c94628511c9749373bcfd6478afa3c0 Mon Sep 17 00:00:00 2001 From: Kyle Cesare Date: Sat, 10 Oct 2026 14:35:04 -0600 Subject: [PATCH 1/3] Use new jank-build package throughout --- box2d-sys/example/project.clj | 2 +- box2d-sys/jank-build.bb | 19 ++++---- box2d-sys/project.clj | 4 +- box3d-sys/example/project.clj | 2 +- box3d-sys/jank-build.bb | 16 +++---- box3d-sys/project.clj | 4 +- cpp-httplib-sys/example/project.clj | 2 +- cpp-httplib-sys/jank-build.bb | 29 ++++++------ cpp-httplib-sys/project.clj | 4 +- ftxui-sys/example/project.clj | 2 +- ftxui-sys/jank-build.bb | 17 ++++---- ftxui-sys/project.clj | 4 +- gl-sys/example/project.clj | 2 +- gl-sys/jank-build.bb | 6 +-- gl-sys/project.clj | 4 +- glfw-sys/example/project.clj | 2 +- glfw-sys/project.clj | 4 +- glm-sys/example/project.clj | 2 +- glm-sys/jank-build.bb | 16 +++---- glm-sys/project.clj | 4 +- imgui-glfw-sys/example/project.clj | 2 +- imgui-glfw-sys/jank-build.bb | 15 +++---- imgui-glfw-sys/project.clj | 4 +- imgui-opengl2-sys/example/project.clj | 2 +- imgui-opengl2-sys/jank-build.bb | 15 +++---- imgui-opengl2-sys/project.clj | 4 +- imgui-sys/example/project.clj | 2 +- imgui-sys/jank-build.bb | 12 ++--- imgui-sys/project.clj | 4 +- ncurses-sys/example/project.clj | 2 +- ncurses-sys/project.clj | 2 +- raygui-sys/example/project.clj | 2 +- raygui-sys/jank-build.bb | 15 +++---- raygui-sys/project.clj | 4 +- raylib-sys/example/project.clj | 2 +- raylib-sys/jank-build.bb | 15 +++---- raylib-sys/project.clj | 4 +- sdl-sys/example/project.clj | 2 +- sdl-sys/jank-build.bb | 63 +++++++++++++-------------- sdl-sys/project.clj | 4 +- sqlite3-sys/example/project.clj | 2 +- sqlite3-sys/project.clj | 4 +- template/project.clj | 2 +- 43 files changed, 158 insertions(+), 170 deletions(-) diff --git a/box2d-sys/example/project.clj b/box2d-sys/example/project.clj index 7fcbbd0..f0b3748 100644 --- a/box2d-sys/example/project.clj +++ b/box2d-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/box2d-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main box2d-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/box2d-sys/jank-build.bb b/box2d-sys/jank-build.bb index 678a56f..c0a7f54 100644 --- a/box2d-sys/jank-build.bb +++ b/box2d-sys/jank-build.bb @@ -1,15 +1,14 @@ (require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) (let [src-dir (fs/path (:src-dir *input*) "lib" "box2d") - out-dir (:out-dir *input*) input (assoc *input* :src-dir src-dir) debug? (not (pos? (:optimization-level *input*)))] - (cmake/build input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" - "BOX2D_SAMPLES" false - "BOX2D_VALIDATE" false - "BOX2D_UNIT_TESTS" false}}) - - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" (if debug? "box2dd" "box2d")))) + (cmake input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" + "BOX2D_SAMPLES" false + "BOX2D_VALIDATE" false + "BOX2D_UNIT_TESTS" false}}) + (util/include-dir "include") + (util/link-dir "lib") + (util/link-library (if debug? "box2dd" "box2d"))) diff --git a/box2d-sys/project.clj b/box2d-sys/project.clj index 122419d..1223953 100644 --- a/box2d-sys/project.clj +++ b/box2d-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/erincatto/box2d/blob/main/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :verbatim-paths ["lib/box2d"]) diff --git a/box3d-sys/example/project.clj b/box3d-sys/example/project.clj index 9d47d77..399da1e 100644 --- a/box3d-sys/example/project.clj +++ b/box3d-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/box3d-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main box3d-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/box3d-sys/jank-build.bb b/box3d-sys/jank-build.bb index 56ddee2..7009285 100644 --- a/box3d-sys/jank-build.bb +++ b/box3d-sys/jank-build.bb @@ -1,14 +1,14 @@ (require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) (let [src-dir (fs/path (:src-dir *input*) "lib" "box3d") - out-dir (:out-dir *input*) input (assoc *input* :src-dir src-dir) debug? (not (pos? (:optimization-level *input*)))] - (cmake/build input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" - "BOX3D_SAMPLES" false - "BOX3D_UNIT_TESTS" false}}) + (cmake input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" + "BOX3D_SAMPLES" false + "BOX3D_UNIT_TESTS" false}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" (if debug? "box3dd" "box3d")))) + (util/include-dir "include") + (util/link-dir "lib") + (util/link-library (if debug? "box3dd" "box3d"))) diff --git a/box3d-sys/project.clj b/box3d-sys/project.clj index 9db68fb..07b6ed3 100644 --- a/box3d-sys/project.clj +++ b/box3d-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/erincatto/box3d/blob/main/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :verbatim-paths ["lib/box3d"]) diff --git a/cpp-httplib-sys/example/project.clj b/cpp-httplib-sys/example/project.clj index 0b296c0..b835592 100644 --- a/cpp-httplib-sys/example/project.clj +++ b/cpp-httplib-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/cpp-httplib-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main cpp-httplib-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/cpp-httplib-sys/jank-build.bb b/cpp-httplib-sys/jank-build.bb index ecd2203..96604a1 100644 --- a/cpp-httplib-sys/jank-build.bb +++ b/cpp-httplib-sys/jank-build.bb @@ -1,19 +1,16 @@ -(require '[clojure.string :refer [lower-case]] - '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) - -(def macos? (contains? #{"mac os x" "darwin"} (lower-case (System/getProperty "os.name")))) +(require '[babashka.fs :as fs] + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) (let [src-dir (fs/path (:src-dir *input*) "lib" "cpp-httplib") - out-dir (:out-dir *input*) input (assoc *input* :src-dir src-dir)] - (cmake/build input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" - "HTTPLIB_COMPILE" true - ;; TODO: static build causes "Unsupported x86-64 relocation type R_X86_64_TLSLD" - "HTTPLIB_SHARED" true - ;; TODO: zstd cmake config module cannot be loaded in CI on macOS - "HTTPLIB_USE_ZSTD_IF_AVAILABLE" (not macos?)}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" "cpp-httplib")) - (println "jank-build::define=CPPHTTPLIB_OPENSSL_SUPPORT=1")) + (cmake input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" + "HTTPLIB_COMPILE" true + ;; TODO: static build causes "Unsupported x86-64 relocation type R_X86_64_TLSLD" + "HTTPLIB_SHARED" true + ;; TODO: zstd cmake config module cannot be loaded in CI on macOS + "HTTPLIB_USE_ZSTD_IF_AVAILABLE" (not (util/mac?))}}) + (util/include-dir "include") + (util/link-dir "lib") + (util/link-library "cpp-httplib") + (util/define "CPPHTTPLIB_OPENSSL_SUPPORT" 1)) diff --git a/cpp-httplib-sys/project.clj b/cpp-httplib-sys/project.clj index 659f591..fadda9c 100644 --- a/cpp-httplib-sys/project.clj +++ b/cpp-httplib-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/yhirose/cpp-httplib/blob/master/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :verbatim-paths ["lib/cpp-httplib/README.md" "lib/cpp-httplib/LICENSE" "lib/cpp-httplib/cmake" diff --git a/ftxui-sys/example/project.clj b/ftxui-sys/example/project.clj index 057652b..1835bb7 100644 --- a/ftxui-sys/example/project.clj +++ b/ftxui-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/ftxui-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main ftxui-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/ftxui-sys/jank-build.bb b/ftxui-sys/jank-build.bb index 7ac880b..e49c162 100644 --- a/ftxui-sys/jank-build.bb +++ b/ftxui-sys/jank-build.bb @@ -1,12 +1,11 @@ (require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) -(let [out-dir (:out-dir *input*)] - (cmake/build (update *input* :src-dir #(fs/path % "lib/ftxui")) - {:defines {"CMAKE_INSTALL_LIBDIR" "lib"}}) +(cmake (update *input* :src-dir #(fs/path % "lib/ftxui"))) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" "ftxui-component")) - (println (str "jank-build::link-library=" "ftxui-dom")) - (println (str "jank-build::link-library=" "ftxui-screen"))) +(util/include-dir "include") +(util/link-dir "lib") +(util/link-library "ftxui-component") +(util/link-library "ftxui-dom") +(util/link-library "ftxui-screen") diff --git a/ftxui-sys/project.clj b/ftxui-sys/project.clj index 5a18ac9..a2fdc7b 100644 --- a/ftxui-sys/project.clj +++ b/ftxui-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ArthurSonzogni/FTXUI/blob/main/LICENSE"} - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["lib/ftxui"]) diff --git a/gl-sys/example/project.clj b/gl-sys/example/project.clj index 04a5c9e..1f7a015 100644 --- a/gl-sys/example/project.clj +++ b/gl-sys/example/project.clj @@ -3,7 +3,7 @@ :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/gl-sys "2026.09-4"] [org.jank-lang.commons/glfw-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main gl-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/gl-sys/jank-build.bb b/gl-sys/jank-build.bb index 8d4fbf7..a60db16 100644 --- a/gl-sys/jank-build.bb +++ b/gl-sys/jank-build.bb @@ -1,8 +1,8 @@ -(require '[clojure.string :refer [lower-case]]) -(require '[jank.build.pkg-config :refer [pkg-config]]) +(require '[jank.build.pkg-config :refer [pkg-config]] + '[jank.build.util :as util]) ; macOS doesn't package OpenGL with pkg-config. It's just globally available. -(if (contains? #{"mac os x" "darwin"} (lower-case (System/getProperty "os.name"))) +(if (util/mac?) (do ; However, if macOS has deprecated OpenGL and surfaces warnings about this unless ; we provide this define. diff --git a/gl-sys/project.clj b/gl-sys/project.clj index 37e694b..23c3edc 100644 --- a/gl-sys/project.clj +++ b/gl-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://docs.mesa3d.org/license.html"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-pkg-config "2026.09-3"]]) + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]]) diff --git a/glfw-sys/example/project.clj b/glfw-sys/example/project.clj index d372190..8d49a3e 100644 --- a/glfw-sys/example/project.clj +++ b/glfw-sys/example/project.clj @@ -3,7 +3,7 @@ :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/gl-sys "2026.09-4"] [org.jank-lang.commons/glfw-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main glfw-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/glfw-sys/project.clj b/glfw-sys/project.clj index 10d78eb..1fe9d00 100644 --- a/glfw-sys/project.clj +++ b/glfw-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "zlib/libpng" :url "https://github.com/glfw/glfw/blob/master/LICENSE.md"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-pkg-config "2026.09-3"]]) + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]]) diff --git a/glm-sys/example/project.clj b/glm-sys/example/project.clj index 89ff364..4a10e90 100644 --- a/glm-sys/example/project.clj +++ b/glm-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/glm-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main glm-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/glm-sys/jank-build.bb b/glm-sys/jank-build.bb index e46fff0..829073c 100644 --- a/glm-sys/jank-build.bb +++ b/glm-sys/jank-build.bb @@ -1,13 +1,13 @@ (require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) (let [src-dir (fs/path (:src-dir *input*) "lib" "glm") - out-dir (:out-dir *input*) input (assoc *input* :src-dir src-dir)] - (cmake/build input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" - "GLM_ENABLE_CXX_20" "ON"}}) + (cmake input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" + "GLM_ENABLE_CXX_20" "ON"}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::define=GLM_ENABLE_EXPERIMENTAL")) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" "glm"))) + (util/include-dir "include") + (util/define "GLM_ENABLE_EXPERIMENTAL") + (util/link-dir "lib") + (util/link-library "glm")) diff --git a/glm-sys/project.clj b/glm-sys/project.clj index 0f997c9..9d51794 100644 --- a/glm-sys/project.clj +++ b/glm-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/g-truc/glm/blob/master/copying.txt"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :verbatim-paths ["lib/glm"]) diff --git a/imgui-glfw-sys/example/project.clj b/imgui-glfw-sys/example/project.clj index 42a7c4c..f280d37 100644 --- a/imgui-glfw-sys/example/project.clj +++ b/imgui-glfw-sys/example/project.clj @@ -4,7 +4,7 @@ :dependencies [[org.jank-lang.commons/imgui-glfw-sys "2026.09-9"] [org.jank-lang.commons/imgui-opengl2-sys "2026.09-6"] [org.jank-lang.commons/gl-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main imgui-glfw-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/imgui-glfw-sys/jank-build.bb b/imgui-glfw-sys/jank-build.bb index 5543f08..ea9548d 100644 --- a/imgui-glfw-sys/jank-build.bb +++ b/imgui-glfw-sys/jank-build.bb @@ -1,9 +1,8 @@ -(require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) +(require '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) -(let [out-dir (:out-dir *input*) - imgui-sys (get-in *input* [:inputs "org.jank-lang.commons/imgui-sys"])] - (cmake/build *input* {:defines {"IMGUI_SYS_ROOT" imgui-sys}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include" "backends"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println "jank-build::link-library=imgui_glfw")) +(let [imgui-sys (get-in *input* [:inputs "org.jank-lang.commons/imgui-sys"])] + (cmake *input* {:defines {"IMGUI_SYS_ROOT" imgui-sys}}) + (util/include-dir "include/backends") + (util/link-dir "lib") + (util/link-library "imgui_glfw")) diff --git a/imgui-glfw-sys/project.clj b/imgui-glfw-sys/project.clj index 09222b4..55c51a9 100644 --- a/imgui-glfw-sys/project.clj +++ b/imgui-glfw-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ocornut/imgui/blob/master/LICENSE.txt"} - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :dependencies [[org.jank-lang.commons/glfw-sys "2026.09-4"] [org.jank-lang.commons/imgui-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["CMakeLists.txt"]) diff --git a/imgui-opengl2-sys/example/project.clj b/imgui-opengl2-sys/example/project.clj index 452e3d0..e763016 100644 --- a/imgui-opengl2-sys/example/project.clj +++ b/imgui-opengl2-sys/example/project.clj @@ -4,7 +4,7 @@ :dependencies [[org.jank-lang.commons/imgui-glfw-sys "2026.09-9"] [org.jank-lang.commons/imgui-opengl2-sys "2026.09-6"] [org.jank-lang.commons/gl-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main imgui-opengl2-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/imgui-opengl2-sys/jank-build.bb b/imgui-opengl2-sys/jank-build.bb index 319d741..519861a 100644 --- a/imgui-opengl2-sys/jank-build.bb +++ b/imgui-opengl2-sys/jank-build.bb @@ -1,9 +1,8 @@ -(require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) +(require '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) -(let [out-dir (:out-dir *input*) - imgui-sys (get-in *input* [:inputs "org.jank-lang.commons/imgui-sys"])] - (cmake/build *input* {:defines {"IMGUI_SYS_ROOT" imgui-sys}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include" "backends"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=imgui_opengl2"))) +(let [imgui-sys (get-in *input* [:inputs "org.jank-lang.commons/imgui-sys"])] + (cmake *input* {:defines {"IMGUI_SYS_ROOT" imgui-sys}}) + (util/include-dir "include/backends") + (util/link-dir "lib") + (util/link-library "imgui_opengl2")) diff --git a/imgui-opengl2-sys/project.clj b/imgui-opengl2-sys/project.clj index 0498e1f..a0d2bb6 100644 --- a/imgui-opengl2-sys/project.clj +++ b/imgui-opengl2-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ocornut/imgui/blob/master/LICENSE.txt"} - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :dependencies [[org.jank-lang.commons/gl-sys "2026.09-4"] [org.jank-lang.commons/imgui-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["CMakeLists.txt"]) diff --git a/imgui-sys/example/project.clj b/imgui-sys/example/project.clj index c47bf7b..13f7c89 100644 --- a/imgui-sys/example/project.clj +++ b/imgui-sys/example/project.clj @@ -4,7 +4,7 @@ :dependencies [[org.jank-lang.commons/imgui-glfw-sys "2026.09-9"] [org.jank-lang.commons/imgui-opengl2-sys "2026.09-6"] [org.jank-lang.commons/gl-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main imgui-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/imgui-sys/jank-build.bb b/imgui-sys/jank-build.bb index 98b7d90..b99c8d9 100644 --- a/imgui-sys/jank-build.bb +++ b/imgui-sys/jank-build.bb @@ -1,9 +1,9 @@ (require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) -(let [out-dir (:out-dir *input*)] - (cmake/build *input* {}) +(cmake *input*) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" "imgui"))) +(util/include-dir "include") +(util/link-dir "lib") +(util/link-library "imgui") diff --git a/imgui-sys/project.clj b/imgui-sys/project.clj index 42cfda3..3b9d5c6 100644 --- a/imgui-sys/project.clj +++ b/imgui-sys/project.clj @@ -3,8 +3,8 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ocornut/imgui/blob/master/LICENSE.txt"} - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :dependencies [] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["lib/imgui" "CMakeLists.txt"]) diff --git a/ncurses-sys/example/project.clj b/ncurses-sys/example/project.clj index 8752725..0936f90 100644 --- a/ncurses-sys/example/project.clj +++ b/ncurses-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/ncurses-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main ncurses-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/ncurses-sys/project.clj b/ncurses-sys/project.clj index a42c2d5..aeacd13 100644 --- a/ncurses-sys/project.clj +++ b/ncurses-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "X11" :url "https://invisible-island.net/ncurses/ncurses-license.html"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :build-dependencies [[org.jank-lang.commons/jank-build-pkg-config "2026.09-3"]]) diff --git a/raygui-sys/example/project.clj b/raygui-sys/example/project.clj index c52ac4a..ea05a1c 100644 --- a/raygui-sys/example/project.clj +++ b/raygui-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/raygui-sys "2026.09-5"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main raygui-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/raygui-sys/jank-build.bb b/raygui-sys/jank-build.bb index c3fa236..4ec3429 100644 --- a/raygui-sys/jank-build.bb +++ b/raygui-sys/jank-build.bb @@ -1,10 +1,9 @@ -(require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) +(require '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) -(let [out-dir (:out-dir *input*) - raylib (get-in *input* [:inputs "org.jank-lang.commons/raylib-sys"])] - (cmake/build *input* {:defines {"RAYLIB_SYS_ROOT" raylib}}) +(let [raylib (get-in *input* [:inputs "org.jank-lang.commons/raylib-sys"])] + (cmake *input* {:defines {"RAYLIB_SYS_ROOT" raylib}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" "raygui"))) + (util/include-dir "include") + (util/link-dir "lib") + (util/link-library "raygui")) diff --git a/raygui-sys/project.clj b/raygui-sys/project.clj index e381511..4303c53 100644 --- a/raygui-sys/project.clj +++ b/raygui-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] ;; raygui at this revision calls raylib's TextToFloat, which raylib gained in ;; 5.5. raygui carries its own copy, but only behind RAYGUI_STANDALONE, which ;; this package does not define. So raylib-sys has to stay on raylib 5.5 or diff --git a/raylib-sys/example/project.clj b/raylib-sys/example/project.clj index f0aa6c3..237d5a0 100644 --- a/raylib-sys/example/project.clj +++ b/raylib-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/raylib-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main raylib-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/raylib-sys/jank-build.bb b/raylib-sys/jank-build.bb index 977f45d..9140e9d 100644 --- a/raylib-sys/jank-build.bb +++ b/raylib-sys/jank-build.bb @@ -1,18 +1,15 @@ (require '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) (let [src-dir (fs/path (:src-dir *input*) "lib" "raylib") - out-dir (:out-dir *input*) input (assoc *input* :src-dir src-dir ; raylib has transient deps which aren't handled by ; static linking. :static? false)] - (cmake/build input {:defines {"BUILD_EXAMPLES" false}}) + (cmake input {:defines {"BUILD_EXAMPLES" false}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - ; macOS uses lib. - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - ; Linux uses lib64. - (println (str "jank-build::link-dir=" (fs/path out-dir "lib64"))) - (println (str "jank-build::link-library=" "raylib"))) + (util/include-dir "include") + (util/link-dir "lib") + (util/link-library "raylib")) diff --git a/raylib-sys/project.clj b/raylib-sys/project.clj index b990236..de5ce57 100644 --- a/raylib-sys/project.clj +++ b/raylib-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "zlib/libpng" :url "https://github.com/raysan5/raylib/blob/master/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :verbatim-paths ["lib/raylib/LICENSE" "lib/raylib/README.md" "lib/raylib/raylib.pc.in" diff --git a/sdl-sys/example/project.clj b/sdl-sys/example/project.clj index 2b34a7b..0c2c3e1 100644 --- a/sdl-sys/example/project.clj +++ b/sdl-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/sdl-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main sdl-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/sdl-sys/jank-build.bb b/sdl-sys/jank-build.bb index b441298..d776d3a 100644 --- a/sdl-sys/jank-build.bb +++ b/sdl-sys/jank-build.bb @@ -1,37 +1,36 @@ -(require '[clojure.string :refer [lower-case]] - '[babashka.fs :as fs] - '[jank.build.cmake :as cmake]) +(require '[babashka.fs :as fs] + '[jank.build.cmake :refer [cmake]] + '[jank.build.util :as util]) (let [src-dir (str (fs/path (:src-dir *input*) "lib" "SDL")) - out-dir (:out-dir *input*) input (assoc *input* :src-dir src-dir)] - (cmake/build input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" - ;; per https://wiki.libsdl.org/SDL3/README-macos - "CMAKE_OSX_DEPLOYMENT_TARGET" "10.13" - "SDL_WAYLAND" false - "SDL_TESTS" false - "SDL_EXAMPLES" false}}) + (cmake input {:defines {"CMAKE_INSTALL_LIBDIR" "lib" + ;; per https://wiki.libsdl.org/SDL3/README-macos + "CMAKE_OSX_DEPLOYMENT_TARGET" "10.13" + "SDL_WAYLAND" false + "SDL_TESTS" false + "SDL_EXAMPLES" false}}) - (println (str "jank-build::include-dir=" (fs/path out-dir "include"))) - (println (str "jank-build::link-dir=" (fs/path out-dir "lib"))) - (println (str "jank-build::link-library=" "SDL3")) + (util/include-dir "include") + (util/link-dir "lib") + (util/link-library "SDL3") - (when (contains? #{"mac os x" "darwin"} (lower-case (System/getProperty "os.name"))) - (println "jank-build::link-framework=CoreMedia") - (println "jank-build::link-framework=CoreVideo") - (println "jank-build::link-framework=Cocoa") - (println "jank-build::link-framework=IOKit") - (println "jank-build::link-framework=ForceFeedback") - (println "jank-build::link-framework=Carbon") - (println "jank-build::link-framework=CoreAudio") - (println "jank-build::link-framework=AudioToolbox") - (println "jank-build::link-framework=AVFoundation") - (println "jank-build::link-framework=CoreBluetooth") - (println "jank-build::link-framework=CoreGraphics") - (println "jank-build::link-framework=CoreMotion") - (println "jank-build::link-framework=Foundation") - (println "jank-build::link-framework=GameController") - (println "jank-build::link-framework=Metal") - (println "jank-build::link-framework=CoreHaptics") - (println "jank-build::link-framework=QuartzCore") - (println "jank-build::link-framework=UniformTypeIdentifiers"))) + (when (util/mac?) + (util/link-framework "CoreMedia") + (util/link-framework "CoreVideo") + (util/link-framework "Cocoa") + (util/link-framework "IOKit") + (util/link-framework "ForceFeedback") + (util/link-framework "Carbon") + (util/link-framework "CoreAudio") + (util/link-framework "AudioToolbox") + (util/link-framework "AVFoundation") + (util/link-framework "CoreBluetooth") + (util/link-framework "CoreGraphics") + (util/link-framework "CoreMotion") + (util/link-framework "Foundation") + (util/link-framework "GameController") + (util/link-framework "Metal") + (util/link-framework "CoreHaptics") + (util/link-framework "QuartzCore") + (util/link-framework "UniformTypeIdentifiers"))) diff --git a/sdl-sys/project.clj b/sdl-sys/project.clj index e8c8a03..b214c49 100644 --- a/sdl-sys/project.clj +++ b/sdl-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "zlib" :url "https://github.com/libsdl-org/SDL/blob/main/LICENSE.txt"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-cmake "2026.09-2"]] + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] :verbatim-paths ["lib/SDL/LICENSE.txt" "lib/SDL/CMakeLists.txt" "lib/SDL/cmake" diff --git a/sqlite3-sys/example/project.clj b/sqlite3-sys/example/project.clj index 1bf9901..1ce0cd4 100644 --- a/sqlite3-sys/example/project.clj +++ b/sqlite3-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/sqlite3-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :main sqlite3-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/sqlite3-sys/project.clj b/sqlite3-sys/project.clj index f4ece33..fe9d4bf 100644 --- a/sqlite3-sys/project.clj +++ b/sqlite3-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "Public Domain" :url "https://www.sqlite.org/copyright.html"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-pkg-config "2026.09-3"]]) + :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]]) diff --git a/template/project.clj b/template/project.clj index 5ef9a1c..1529e06 100644 --- a/template/project.clj +++ b/template/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "TODO" :url "TODO"} - :plugins [[org.jank-lang/lein-jank "2026.09-7"]] + :plugins [[org.jank-lang/lein-jank "2026.09-9"]] :middleware [leiningen.jank/middleware] :build-dependencies []) From 11e43869c3f126c5b488bdaa436bd6143d649ded Mon Sep 17 00:00:00 2001 From: Kyle Cesare Date: Sun, 11 Oct 2026 13:34:54 -0600 Subject: [PATCH 2/3] Bump lein-jank and jank-build versions --- box2d-sys/example/project.clj | 2 +- box2d-sys/project.clj | 4 ++-- box3d-sys/example/project.clj | 2 +- box3d-sys/project.clj | 4 ++-- cpp-httplib-sys/example/project.clj | 2 +- cpp-httplib-sys/project.clj | 4 ++-- ftxui-sys/example/project.clj | 2 +- ftxui-sys/project.clj | 4 ++-- gl-sys/example/project.clj | 2 +- gl-sys/project.clj | 4 ++-- glfw-sys/example/project.clj | 2 +- glfw-sys/project.clj | 4 ++-- glm-sys/example/project.clj | 2 +- glm-sys/project.clj | 4 ++-- imgui-glfw-sys/example/project.clj | 2 +- imgui-glfw-sys/project.clj | 4 ++-- imgui-opengl2-sys/example/project.clj | 2 +- imgui-opengl2-sys/project.clj | 4 ++-- imgui-sys/example/project.clj | 2 +- imgui-sys/project.clj | 4 ++-- ncurses-sys/example/project.clj | 2 +- ncurses-sys/project.clj | 2 +- raygui-sys/example/project.clj | 2 +- raygui-sys/project.clj | 4 ++-- raylib-sys/example/project.clj | 2 +- raylib-sys/project.clj | 4 ++-- sdl-sys/example/project.clj | 2 +- sdl-sys/project.clj | 4 ++-- sqlite3-sys/example/project.clj | 2 +- sqlite3-sys/project.clj | 4 ++-- template/project.clj | 2 +- 31 files changed, 45 insertions(+), 45 deletions(-) diff --git a/box2d-sys/example/project.clj b/box2d-sys/example/project.clj index f0b3748..8197f4b 100644 --- a/box2d-sys/example/project.clj +++ b/box2d-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/box2d-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main box2d-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/box2d-sys/project.clj b/box2d-sys/project.clj index 1223953..fbfacff 100644 --- a/box2d-sys/project.clj +++ b/box2d-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/erincatto/box2d/blob/main/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :verbatim-paths ["lib/box2d"]) diff --git a/box3d-sys/example/project.clj b/box3d-sys/example/project.clj index 399da1e..f29c84f 100644 --- a/box3d-sys/example/project.clj +++ b/box3d-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/box3d-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main box3d-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/box3d-sys/project.clj b/box3d-sys/project.clj index 07b6ed3..fdc0fcb 100644 --- a/box3d-sys/project.clj +++ b/box3d-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/erincatto/box3d/blob/main/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :verbatim-paths ["lib/box3d"]) diff --git a/cpp-httplib-sys/example/project.clj b/cpp-httplib-sys/example/project.clj index b835592..3d9b8e4 100644 --- a/cpp-httplib-sys/example/project.clj +++ b/cpp-httplib-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/cpp-httplib-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main cpp-httplib-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/cpp-httplib-sys/project.clj b/cpp-httplib-sys/project.clj index fadda9c..24dd8a7 100644 --- a/cpp-httplib-sys/project.clj +++ b/cpp-httplib-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/yhirose/cpp-httplib/blob/master/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :verbatim-paths ["lib/cpp-httplib/README.md" "lib/cpp-httplib/LICENSE" "lib/cpp-httplib/cmake" diff --git a/ftxui-sys/example/project.clj b/ftxui-sys/example/project.clj index 1835bb7..a2b8981 100644 --- a/ftxui-sys/example/project.clj +++ b/ftxui-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/ftxui-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main ftxui-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/ftxui-sys/project.clj b/ftxui-sys/project.clj index a2fdc7b..4f4d2aa 100644 --- a/ftxui-sys/project.clj +++ b/ftxui-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ArthurSonzogni/FTXUI/blob/main/LICENSE"} - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["lib/ftxui"]) diff --git a/gl-sys/example/project.clj b/gl-sys/example/project.clj index 1f7a015..eada12d 100644 --- a/gl-sys/example/project.clj +++ b/gl-sys/example/project.clj @@ -3,7 +3,7 @@ :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/gl-sys "2026.09-4"] [org.jank-lang.commons/glfw-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main gl-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/gl-sys/project.clj b/gl-sys/project.clj index 23c3edc..591c389 100644 --- a/gl-sys/project.clj +++ b/gl-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://docs.mesa3d.org/license.html"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]]) + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]]) diff --git a/glfw-sys/example/project.clj b/glfw-sys/example/project.clj index 8d49a3e..5eac20a 100644 --- a/glfw-sys/example/project.clj +++ b/glfw-sys/example/project.clj @@ -3,7 +3,7 @@ :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/gl-sys "2026.09-4"] [org.jank-lang.commons/glfw-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main glfw-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/glfw-sys/project.clj b/glfw-sys/project.clj index 1fe9d00..b19fcad 100644 --- a/glfw-sys/project.clj +++ b/glfw-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "zlib/libpng" :url "https://github.com/glfw/glfw/blob/master/LICENSE.md"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]]) + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]]) diff --git a/glm-sys/example/project.clj b/glm-sys/example/project.clj index 4a10e90..54c2fef 100644 --- a/glm-sys/example/project.clj +++ b/glm-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/glm-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main glm-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/glm-sys/project.clj b/glm-sys/project.clj index 9d51794..0b9d3fd 100644 --- a/glm-sys/project.clj +++ b/glm-sys/project.clj @@ -3,7 +3,7 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/g-truc/glm/blob/master/copying.txt"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :verbatim-paths ["lib/glm"]) diff --git a/imgui-glfw-sys/example/project.clj b/imgui-glfw-sys/example/project.clj index f280d37..fb35040 100644 --- a/imgui-glfw-sys/example/project.clj +++ b/imgui-glfw-sys/example/project.clj @@ -4,7 +4,7 @@ :dependencies [[org.jank-lang.commons/imgui-glfw-sys "2026.09-9"] [org.jank-lang.commons/imgui-opengl2-sys "2026.09-6"] [org.jank-lang.commons/gl-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main imgui-glfw-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/imgui-glfw-sys/project.clj b/imgui-glfw-sys/project.clj index 55c51a9..dce46f2 100644 --- a/imgui-glfw-sys/project.clj +++ b/imgui-glfw-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ocornut/imgui/blob/master/LICENSE.txt"} - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :dependencies [[org.jank-lang.commons/glfw-sys "2026.09-4"] [org.jank-lang.commons/imgui-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["CMakeLists.txt"]) diff --git a/imgui-opengl2-sys/example/project.clj b/imgui-opengl2-sys/example/project.clj index e763016..18b7a0e 100644 --- a/imgui-opengl2-sys/example/project.clj +++ b/imgui-opengl2-sys/example/project.clj @@ -4,7 +4,7 @@ :dependencies [[org.jank-lang.commons/imgui-glfw-sys "2026.09-9"] [org.jank-lang.commons/imgui-opengl2-sys "2026.09-6"] [org.jank-lang.commons/gl-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main imgui-opengl2-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/imgui-opengl2-sys/project.clj b/imgui-opengl2-sys/project.clj index a0d2bb6..6afcfbb 100644 --- a/imgui-opengl2-sys/project.clj +++ b/imgui-opengl2-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ocornut/imgui/blob/master/LICENSE.txt"} - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :dependencies [[org.jank-lang.commons/gl-sys "2026.09-4"] [org.jank-lang.commons/imgui-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["CMakeLists.txt"]) diff --git a/imgui-sys/example/project.clj b/imgui-sys/example/project.clj index 13f7c89..ca99f3b 100644 --- a/imgui-sys/example/project.clj +++ b/imgui-sys/example/project.clj @@ -4,7 +4,7 @@ :dependencies [[org.jank-lang.commons/imgui-glfw-sys "2026.09-9"] [org.jank-lang.commons/imgui-opengl2-sys "2026.09-6"] [org.jank-lang.commons/gl-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main imgui-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/imgui-sys/project.clj b/imgui-sys/project.clj index 3b9d5c6..77920c8 100644 --- a/imgui-sys/project.clj +++ b/imgui-sys/project.clj @@ -3,8 +3,8 @@ :url "https://github.com/jank-lang/commons" :license {:name "MIT" :url "https://github.com/ocornut/imgui/blob/master/LICENSE.txt"} - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :dependencies [] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :verbatim-paths ["lib/imgui" "CMakeLists.txt"]) diff --git a/ncurses-sys/example/project.clj b/ncurses-sys/example/project.clj index 0936f90..2e62935 100644 --- a/ncurses-sys/example/project.clj +++ b/ncurses-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/ncurses-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main ncurses-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/ncurses-sys/project.clj b/ncurses-sys/project.clj index aeacd13..121d146 100644 --- a/ncurses-sys/project.clj +++ b/ncurses-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "X11" :url "https://invisible-island.net/ncurses/ncurses-license.html"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :build-dependencies [[org.jank-lang.commons/jank-build-pkg-config "2026.09-3"]]) diff --git a/raygui-sys/example/project.clj b/raygui-sys/example/project.clj index ea05a1c..15b4e0c 100644 --- a/raygui-sys/example/project.clj +++ b/raygui-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/raygui-sys "2026.09-5"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main raygui-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/raygui-sys/project.clj b/raygui-sys/project.clj index 4303c53..386a9da 100644 --- a/raygui-sys/project.clj +++ b/raygui-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] ;; raygui at this revision calls raylib's TextToFloat, which raylib gained in ;; 5.5. raygui carries its own copy, but only behind RAYGUI_STANDALONE, which ;; this package does not define. So raylib-sys has to stay on raylib 5.5 or diff --git a/raylib-sys/example/project.clj b/raylib-sys/example/project.clj index 237d5a0..e49f684 100644 --- a/raylib-sys/example/project.clj +++ b/raylib-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/raylib-sys "2026.09-3"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main raylib-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/raylib-sys/project.clj b/raylib-sys/project.clj index de5ce57..0ee75a0 100644 --- a/raylib-sys/project.clj +++ b/raylib-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "zlib/libpng" :url "https://github.com/raysan5/raylib/blob/master/LICENSE"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :verbatim-paths ["lib/raylib/LICENSE" "lib/raylib/README.md" "lib/raylib/raylib.pc.in" diff --git a/sdl-sys/example/project.clj b/sdl-sys/example/project.clj index 0c2c3e1..8e0899a 100644 --- a/sdl-sys/example/project.clj +++ b/sdl-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/sdl-sys "2026.09-1"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main sdl-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/sdl-sys/project.clj b/sdl-sys/project.clj index b214c49..98a2ad0 100644 --- a/sdl-sys/project.clj +++ b/sdl-sys/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/jank-lang/commons" :license {:name "zlib" :url "https://github.com/libsdl-org/SDL/blob/main/LICENSE.txt"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]] + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]] :verbatim-paths ["lib/SDL/LICENSE.txt" "lib/SDL/CMakeLists.txt" "lib/SDL/cmake" diff --git a/sqlite3-sys/example/project.clj b/sqlite3-sys/example/project.clj index 1ce0cd4..1babfb6 100644 --- a/sqlite3-sys/example/project.clj +++ b/sqlite3-sys/example/project.clj @@ -2,7 +2,7 @@ :license {:name "MPL 2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"} :dependencies [[org.jank-lang.commons/sqlite3-sys "2026.09-4"]] - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :main sqlite3-sys.example :profiles {:base {:jank {:target-dir "target/debug" diff --git a/sqlite3-sys/project.clj b/sqlite3-sys/project.clj index fe9d4bf..478a6b9 100644 --- a/sqlite3-sys/project.clj +++ b/sqlite3-sys/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "Public Domain" :url "https://www.sqlite.org/copyright.html"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build "0.1-SNAPSHOT"]]) + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]]) diff --git a/template/project.clj b/template/project.clj index 1529e06..2aea131 100644 --- a/template/project.clj +++ b/template/project.clj @@ -3,6 +3,6 @@ :url "https://github.com/jank-lang/commons" :license {:name "TODO" :url "TODO"} - :plugins [[org.jank-lang/lein-jank "2026.09-9"]] + :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] :build-dependencies []) From 904464134db3b4b6357b119a035486ccd5e7fc80 Mon Sep 17 00:00:00 2001 From: Kyle Cesare Date: Sun, 11 Oct 2026 13:36:34 -0600 Subject: [PATCH 3/3] Use jank-build in ncurses-sys --- ncurses-sys/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncurses-sys/project.clj b/ncurses-sys/project.clj index 121d146..3ca028d 100644 --- a/ncurses-sys/project.clj +++ b/ncurses-sys/project.clj @@ -5,4 +5,4 @@ :url "https://invisible-island.net/ncurses/ncurses-license.html"} :plugins [[org.jank-lang/lein-jank "2026.10-1"]] :middleware [leiningen.jank/middleware] - :build-dependencies [[org.jank-lang.commons/jank-build-pkg-config "2026.09-3"]]) + :build-dependencies [[org.jank-lang.commons/jank-build "2026.10-1"]])