TFC/tfcconnection
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

updates to build system

Browse source
This commit is contained in:
Chris Cochrun 2023-06-13 14:07:39 -05:00
parent 88729c36df
commit 3620ead09b
5 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
all: build-server all: build-server
build-server: build-server:
sbcl --eval '(ql:quickload "deploy")' --eval '(asdf:load-asd "/home/chris/dev/tfcconnection/tfcserver.asd")' --eval '(ql:quickload :tfcserver)' --eval '(push :deploy-console *features*)' --eval "(asdf:make :tfcserver)" --eval '(quit)' sbcl --eval '(asdf:load-asd "/home/chris/dev/tfcconnection/tfcserver.asd")' --eval '(ql:quickload :tfcserver)' --eval '(push :deploy-console *features*)' --eval "(asdf:make :tfcserver)" --eval '(quit)'
serve: serve:
hugo server --noHTTPCache hugo server --noHTTPCache

5
build.lisp
View file

@ -1,3 +1,4 @@
(asdf:load-asd "/home/chris/dev/tfcconnection/tfcserver.asd") (load (sb-ext:posix-getenv "ASDF"))
(ql:quickload :tfcserver) (asdf:load-asd (pathname (truename "tfcserver.asd")))
;; (ql:quickload :tfcserver)
(asdf:make :tfcserver) (asdf:make :tfcserver)

4
default.nix
View file

@ -11,6 +11,7 @@
let let
sbcl' = sbcl.withPackages (ps: with ps; [ sbcl' = sbcl.withPackages (ps: with ps; [
deploy
hunchentoot hunchentoot
dexador dexador
clack clack
@ -39,7 +40,8 @@ stdenv.mkDerivation rec {
]; ];
buildPhase = '' buildPhase = ''
make export HOME=$(pwd)
${sbcl'}/bin/sbcl --load build.lisp
''; '';
installPhase = '' installPhase = ''

6
src/main.lisp
View file

@ -1,4 +1,6 @@
(ql:quickload '(hunchentoot clack dexador com.inuoe.jzon serapeum bordeaux-threads)) ;; (ql:quickload '(hunchentoot clack dexador com.inuoe.jzon serapeum bordeaux-threads))
(asdf:load-systems '(hunchentoot clack dexador com.inuoe.jzon serapeum bordeaux-threads))
;; (require '(hunchentoot clack dexador com.inuoe.jzon serapeum bordeaux-threads))
(defpackage tfc-server (defpackage tfc-server
(:use :cl :uiop :com.inuoe.jzon :clack)) (:use :cl :uiop :com.inuoe.jzon :clack))
@ -114,7 +116,7 @@
(if (listp content) (if (listp content)
(setq content (serapeum:mapconcat (setq content (serapeum:mapconcat
(lambda (x) (if (string= x "") (lambda (x) (if (string= x "")
(coerce #\Newline 'string) (coerce #\linefeed 'string)
x)) x))
content "")))) content ""))))
(if name (if (string/= name "image") (progn (if name (if (string/= name "image") (progn

8
tfcserver.asd
View file

@ -1,4 +1,5 @@
#-asdf3.1 (error "requires asdf 3.1") #-asdf3.1 (error "requires asdf 3.1")
;; #+linux (deploy:define-library deploy::compression-lib :dont-deploy T)
(defsystem "tfcserver" (defsystem "tfcserver"
:version "0.1.0" :version "0.1.0"
@ -11,8 +12,7 @@
:description "Restful server to handle website pieces" :description "Restful server to handle website pieces"
:long-description "Restful server to handle website pieces" :long-description "Restful server to handle website pieces"
;; :in-order-to ((test-op (test-op "tfcserver-test"))) ;; :in-order-to ((test-op (test-op "tfcserver-test")))
:defsystem-depends-on (:deploy) ;; (ql:quickload "deploy") before ;; :defsystem-depends-on (:deploy) ;; (ql:quickload "deploy") before
:build-operation "deploy-op" ;; leave as is :build-operation "program-op" ;; leave as is
:build-pathname "tfcapi" :build-pathname "tfcapi"
:entry-point "tfc-server::main" :entry-point "tfc-server::main")
)