Skip to content

Commit 33fcce7

Browse files
lockielockie
committed
Changed build system again, to ocicl
1 parent 28acd64 commit 33fcce7

File tree

6 files changed

+55
-11
lines changed

6 files changed

+55
-11
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ allegro.log
8181
config.cfg
8282
.qlot/
8383
qlfile.lock
84+
systems/

‎README.org‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ To run manually:
1616
liballegro-image5-dev liballegro-dialog5-dev liballegro-ttf5-dev \
1717
liballegro-physfs5-dev liballegro-video5-dev libffi-dev
1818
#+end_src
19-
+ Install [[https://sbcl.org/platform-table.html][SBCL]] and [[https://github.com/fukamachi/qlot][Qlot]]
19+
+ Install [[https://sbcl.org/platform-table.html][SBCL]] and [[https://github.com/ocicl/ocicl][ocicl]]
2020
+ In the project directory, run
2121
#+begin_src bash
22-
qlot install
23-
qlot exec ros -S . run
22+
ocicl install
23+
sbcl
2424
#+end_src
2525
+ In REPL started on previous step, run
2626
#+begin_src lisp
27-
(ql:quickload :thoughtbound)
27+
(asdf:load-system :thoughtbound)
2828
(uiop:chdir "Resources")
2929
(setf *default-pathname-defaults* (truename "./Resources"))
3030
(thoughtbound:main)

‎package.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ fi
1010
export VERSION=${GITHUB_REF_NAME:-$(git describe --always --tags --dirty=+ --abbrev=6)}
1111

1212
function do_build () {
13-
sbcl --quit --eval "(ql:quickload '(:qlot :qlot/cli))" --eval "(qlot/cli:install)"
14-
mkdir .qlot/local-projects/thoughtbound
15-
cp -r "$(pwd)"/* .qlot/local-projects/thoughtbound # no working ln on windoze
16-
sbcl --dynamic-space-size 2048 --disable-debugger --quit --no-userinit --load .qlot/setup.lisp --load package/build.lisp
17-
mv .qlot/local-projects/thoughtbound/bin .
13+
ocicl install
14+
sbcl --dynamic-space-size 2048 --disable-debugger --quit --load package/build.lisp
1815
}
1916

2017
case $1 in

‎package/build.lisp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
(push :ecs-unsafe *features*)
22
(proclaim '(optimize (speed 3) (safety 0) (debug 0) (compilation-speed 0)))
3-
(ql:quickload '(:deploy :thoughtbound))
3+
(asdf:load-system :thoughtbound)
44
(asdf:make :thoughtbound)

‎systems.csv‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
deploy, ghcr.io/ocicl/deploy@sha256:a653f8bb98537bc9f0e57685fc5b6137e64902f35c58340f30f64ff09ecce454, deploy-20230718-5fc9c5e/deploy.asd
2+
deploy-test, ghcr.io/ocicl/deploy@sha256:a653f8bb98537bc9f0e57685fc5b6137e64902f35c58340f30f64ff09ecce454, deploy-20230718-5fc9c5e/deploy-test.asd
3+
uffi, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/uffi-compat/uffi.asd
4+
cffi, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/cffi.asd
5+
cffi-uffi-compat, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/cffi-uffi-compat.asd
6+
cffi-toolchain, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/cffi-toolchain.asd
7+
cffi-tests, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/cffi-tests.asd
8+
cffi-libffi, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/cffi-libffi.asd
9+
cffi-grovel, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/cffi-grovel.asd
10+
cffi-examples, ghcr.io/ocicl/cffi@sha256:a601813749dfe0629c5863e97666f15a0a6a1cad140b6e43cea2e4c88349f7a8, cffi-20230614-c42b42e/cffi-examples.asd
11+
alexandria, ghcr.io/ocicl/alexandria@sha256:4609f65007a48f9e4c6b4f67d9fc69be8abd3a9335a213729324ba7c7be4746f, alexandria-20230511-db1288fb/alexandria.asd
12+
trivial-features, ghcr.io/ocicl/trivial-features@sha256:1eb0ceeaa5c08c4e8e78073a6b5935fff16d656a91362cb2b797bc9b45646c88, trivial-features-1.0/trivial-features.asd
13+
trivial-features-tests, ghcr.io/ocicl/trivial-features@sha256:1eb0ceeaa5c08c4e8e78073a6b5935fff16d656a91362cb2b797bc9b45646c88, trivial-features-1.0/trivial-features-tests.asd
14+
babel, ghcr.io/ocicl/babel@sha256:a858a5d8da1fef0700f206c353ff24238c82105ee4824a04117d0d94d6531e5a, babel-20230511-627d6a6/babel.asd
15+
babel-tests, ghcr.io/ocicl/babel@sha256:a858a5d8da1fef0700f206c353ff24238c82105ee4824a04117d0d94d6531e5a, babel-20230511-627d6a6/babel-tests.asd
16+
babel-streams, ghcr.io/ocicl/babel@sha256:a858a5d8da1fef0700f206c353ff24238c82105ee4824a04117d0d94d6531e5a, babel-20230511-627d6a6/babel-streams.asd
17+
multilang-documentation-utils, ghcr.io/ocicl/documentation-utils@sha256:b2a1b3f3bcd1a738af85ae2b0168d408c177661eab6d6bbebb254e394d983f54, documentation-utils-20230511-98630dd/multilang-documentation-utils.asd
18+
documentation-utils, ghcr.io/ocicl/documentation-utils@sha256:b2a1b3f3bcd1a738af85ae2b0168d408c177661eab6d6bbebb254e394d983f54, documentation-utils-20230511-98630dd/documentation-utils.asd
19+
trivial-indent, ghcr.io/ocicl/trivial-indent@sha256:26fcd2e51697562e52ac4a28122ee13484998f87d1808792ba662a3aaefa20a1, trivial-indent-20230511-f252750/trivial-indent.asd
20+
cl-fast-ecs, ghcr.io/ocicl/cl-fast-ecs@sha256:a34cbf2e3091c37e3f62bce1b8f9ce4ef8ff87ecfbfc455b54003f8104730640, cl-fast-ecs-20230801-9d1aec7/cl-fast-ecs.asd
21+
trivial-garbage, ghcr.io/ocicl/trivial-garbage@sha256:a9a17c399c64ae7e15e13106b99322ec500306afc877b63a7d0d6595cfd3c1bc, trivial-garbage-20230704-bd0e9d7/trivial-garbage.asd
22+
cl-liballegro, ghcr.io/ocicl/cl-liballegro@sha256:4483f4492f3580e823ae36b15b5ebc621ff00037bbd84a59c405b40ea26278b0, cl-liballegro-20230801-afd4073/cl-liballegro.asd
23+
trivial-gray-streams, ghcr.io/ocicl/trivial-gray-streams@sha256:b6ae940f55813af5e913930eb21ed0530c37cd1537d3b679533a9c8d79b4b8e2, trivial-gray-streams-20230704-f873865/trivial-gray-streams.asd
24+
trivial-gray-streams-test, ghcr.io/ocicl/trivial-gray-streams@sha256:b6ae940f55813af5e913930eb21ed0530c37cd1537d3b679533a9c8d79b4b8e2, trivial-gray-streams-20230704-f873865/trivial-gray-streams-test.asd
25+
trivial-main-thread, ghcr.io/ocicl/trivial-main-thread@sha256:5a624d5102aa0cb4807d037f0561254dcc0d23732a312718b3974c8bb4b223bb, trivial-main-thread-20230718-ebcb7b7/trivial-main-thread.asd
26+
bordeaux-threads, ghcr.io/ocicl/bordeaux-threads@sha256:385554d605206528c5a5603747a13133fd6e22d6b7f81ff1a6a8bed87e4ac911, bordeaux-threads-0.9.1/bordeaux-threads.asd
27+
global-vars, ghcr.io/ocicl/global-vars@sha256:574ad8db0145b8099d12de00702f7f2caecccf67f9cf02d950b61ef0e70afc32, global-vars-20230511-c749f32/global-vars.asd
28+
global-vars-test, ghcr.io/ocicl/global-vars@sha256:574ad8db0145b8099d12de00702f7f2caecccf67f9cf02d950b61ef0e70afc32, global-vars-20230511-c749f32/global-vars-test.asd
29+
simple-tasks, ghcr.io/ocicl/simple-tasks@sha256:19f9c222826dafcbec2289e98eae1606bb5f8dbb848e25e9b3caf1149d7a5468, simple-tasks-20230718-918553c/simple-tasks.asd
30+
array-utils, ghcr.io/ocicl/array-utils@sha256:e1b55b1487b06a633325b6b0b6fcf55058b1e7f828dd345d338d5316ce473e6f, array-utils-20230718-dffb2dc/array-utils.asd
31+
array-utils-test, ghcr.io/ocicl/array-utils@sha256:e1b55b1487b06a633325b6b0b6fcf55058b1e7f828dd345d338d5316ce473e6f, array-utils-20230718-dffb2dc/array-utils-test.asd
32+
dissect, ghcr.io/ocicl/dissect@sha256:54c3b0ce857b7a77f76c429514385702741741714c481cb3ecbf507b44498e4c, dissect-20230718-446f998/dissect.asd
33+
float-features, ghcr.io/ocicl/float-features@sha256:21d72f6a7816f3ba89c7809faa65d0f5ebb1dabd64b7d17e513ed3f79dd26d4b, float-features-20230718-a9dd62b/float-features.asd
34+
float-features-tests, ghcr.io/ocicl/float-features@sha256:21d72f6a7816f3ba89c7809faa65d0f5ebb1dabd64b7d17e513ed3f79dd26d4b, float-features-20230718-a9dd62b/float-features-tests.asd
35+
cl-liballegro-nuklear, ghcr.io/ocicl/cl-liballegro-nuklear@sha256:8cd9d7be4f9ab6e95fdd9292f016759113a4ecfee75d1bcf4e15e007c9eff436, cl-liballegro-nuklear-20230801-f450bf4/cl-liballegro-nuklear.asd
36+
cl-tiled, ghcr.io/ocicl/cl-tiled@sha256:23676481a4a5d582450a52ec974854a1e7f91afbf91a6a84e2b2f29734027a5b, cl-tiled-20230725-c48ebf7/cl-tiled.asd
37+
chipz, ghcr.io/ocicl/chipz@sha256:986a007a37eb1fadef11833f4aabe3a70e8bc6a7f16433ada0ae6e76d358047d, chipz-20230513-6f80368/chipz.asd
38+
cl-base64, ghcr.io/ocicl/cl-base64@sha256:4835383cd501f63d2a1ac1a34748a622d631f48bc658c32a2722cde5cd624662, cl-base64-20230513-80496b7/cl-base64.asd
39+
cl-base64-tests, ghcr.io/ocicl/cl-base64@sha256:4835383cd501f63d2a1ac1a34748a622d631f48bc658c32a2722cde5cd624662, cl-base64-20230513-80496b7/cl-base64-tests.asd
40+
cl-json, ghcr.io/ocicl/cl-json@sha256:0f363655ed2847344ff5ac7f042be9080bdeedff2a60a70a237549d3c9ba1e04, cl-json-20230517-6dfebb9/cl-json.asd
41+
nibbles, ghcr.io/ocicl/nibbles@sha256:68d5901757aee641506f21ccc94a9837ef51f8b336893394b9c4eb78aafb15c1, nibbles-20230605-f37322b/nibbles.asd
42+
parse-float, ghcr.io/ocicl/parse-float@sha256:d276672cbcfcccb9f937625eefcb5748a5aea7c88019f4b336d0e5ea34ac87f5, parse-float-20230518-3074765/parse-float.asd
43+
split-sequence, ghcr.io/ocicl/split-sequence@sha256:bca8a6eb390a7a5946250236d8c1eb4e75d8271ccbf53b58058c940c22249bba, split-sequence-2.0.1/split-sequence.asd
44+
xmls, ghcr.io/ocicl/xmls@sha256:f018abfa32b9f7d582550732bd11da451f46f8ed65e113dc0fb63d5c8bd89932, xmls-3.2.0/xmls.asd
45+
livesupport, ghcr.io/ocicl/livesupport@sha256:89324975553eccb9ab33769f5450b473d72a13e692de47f48c51b6bd97a5d204, livesupport-20230801-bda4f54/livesupport.asd

‎thoughtbound.asd‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#:cl-liballegro
88
#:cl-liballegro-nuklear
99
#:cl-tiled
10-
#:livesupport)
10+
#:livesupport
11+
#+sbcl #:sb-posix)
1112
:serial t
1213
:components ((:module "src"
1314
:components

0 commit comments

Comments
 (0)