diff options
| -rw-r--r-- | .github/workflows/test.yml | 4 | ||||
| -rw-r--r-- | README.md | 11 | ||||
| -rw-r--r-- | bundle/build.janet | 62 | ||||
| -rw-r--r-- | bundle/clean.janet | 5 | ||||
| -rw-r--r-- | bundle/init-backup.janet | 23 | ||||
| -rw-r--r-- | bundle/test.janet | 7 |
6 files changed, 10 insertions, 102 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c2256ab..9fd2ec0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: - name: Test Install run: sudo janet -e '(bundle/install "spork")' - name: Run Tests - run: cd spork && janet bundle/test.janet + run: cd spork && janet -l ./bundle -e "(check)" test-windows: name: Build and test on Windows @@ -64,4 +64,4 @@ jobs: - name: Run Tests shell: cmd run: | - refreshenv & cd spork & janet bundle/test.janet + refreshenv & cd spork & janet -l ./bundle -e "(check)" @@ -12,13 +12,16 @@ as seen in the example for the part. ## Build ``` -janet bundle/build.janet +janet -l ./bundle -e '(build)' ``` ## Test +Spork must be installed to test properly. + ``` -janet bundle/test.janet +janet --install . +janet -l ./bundle -e '(check)' ``` ## Installation @@ -29,13 +32,15 @@ As of Janet version 1.38.0, the normal Janet binary can install spork in the fol [sudo] janet --install . ``` +This will install all spork modules to `$JANET_PATH` and all executable scripts to `$JANET_PATH/bin`. + For versions prior to 1.38.0, but with support for the bundle module: ``` [sudo] janet -e '(bundle/install ".")' ``` -Or, finally, with JPM: +Or, finally, with JPM (legacy): ``` [sudo] jpm install spork diff --git a/bundle/build.janet b/bundle/build.janet deleted file mode 100644 index 1f2f91d..0000000 --- a/bundle/build.janet +++ /dev/null @@ -1,62 +0,0 @@ -(import "/spork/cc" :as cc) - -(defn main - [& argv] - (os/mkdir "build") - (os/mkdir "build/objects") - (os/mkdir "build/spork") - - # How should we do toolchain detection? - (def toolchain - (cond - (os/getenv "MSVC") :msvc - (os/getenv "GCC") :gcc - (os/getenv "CLANG") :clang - (os/getenv "CC") :cc # any posix compatible compiler accessed via `cc` - (= :windows (os/which)) :msvc - :cc)) - - (def suffix (case toolchain :msvc ".dll" ".so")) - (def asuffix (case toolchain :msvc ".lib" ".a")) - - (def cc - (case toolchain - :msvc cc/msvc-compile-and-link-shared - cc/compile-and-link-shared)) - - (def compile-c - (case toolchain - :msvc cc/msvc-compile-c - :msvc cc/compile-c)) - - (def static-cc - (case toolchain - :msvc cc/msvc-compile-and-make-archive - cc/compile-and-make-archive)) - - (when (= :msvc toolchain) - (cc/msvc-find) - (assert (cc/msvc-setup?)) - (setdyn cc/*msvc-libs* @[(cc/msvc-janet-import-lib)])) - - (defn make1 - [name & other-srcs] - (def from (string "src/" name ".c")) - (def to (string "build/spork/" name suffix)) - (def toa (string "build/spork/" name asuffix)) - (cc to from ;other-srcs) - (static-cc toa from ;other-srcs)) - - (setdyn cc/*visit* cc/visit-execute-if-stale) - (setdyn cc/*build-dir* "build/objects") - (make1 "crc") - (make1 "json") - (make1 "cmath") - (make1 "utf8") - (make1 "rawterm") - (make1 "tarray") - (make1 "base64") - (setdyn cc/*defines* {"_LARGEFILE64_SOURCE" true}) - (make1 "zip" "deps/miniz/miniz.c") - - (print "done!")) diff --git a/bundle/clean.janet b/bundle/clean.janet deleted file mode 100644 index 7b4f1df..0000000 --- a/bundle/clean.janet +++ /dev/null @@ -1,5 +0,0 @@ -(import "/spork/sh" :as sh) - -(defn main - [&] - (sh/rm "build")) diff --git a/bundle/init-backup.janet b/bundle/init-backup.janet deleted file mode 100644 index 03bb8ed..0000000 --- a/bundle/init-backup.janet +++ /dev/null @@ -1,23 +0,0 @@ -(import ./test) -(import ./build :as b) -(import ./clean :as c) - -(defn clean [&] - (c/main)) - -(defn check [&] - (test/main)) - -(defn build [&] - (b/main)) - -(defn install [m &] - (bundle/add-file m "src/tarray.h" "tarray.h") - (bundle/add m "spork") - (compwhen (dyn 'bundle/add-bin) - (bundle/add-bin m "bin/janet-format") - (bundle/add-bin m "bin/janet-netrepl")) - (each file (os/dir "build/spork") - (def f (string "build/spork/" file)) - (when (= (os/stat f :mode) :file) - (bundle/add-file m f (string "spork/" file))))) diff --git a/bundle/test.janet b/bundle/test.janet deleted file mode 100644 index d614074..0000000 --- a/bundle/test.janet +++ /dev/null @@ -1,7 +0,0 @@ -# -# Run test scripts, and error if any fail. -# Pass through any args -# -(use /spork/declare-cc) -(dofile "project.janet" :env (jpm-shim-env)) -(check) |