Move require to prepare

Author: jcs090218

Makefile

@@ -9,7 +9,7 @@ ci: build
 build:
 	@echo "Building..."
 	$(LISP) $(LISP_ARGS) --script './scripts/deploy.lisp'
-	$(LISP) $(LISP_ARGS) --script './scripts/build.lisp'
+#	$(LISP) $(LISP_ARGS) --script './scripts/build.lisp'
 
 download-ql:
 	@echo "Downloading Quicklisp..."

scripts/_prepare.lisp

@@ -2,6 +2,26 @@
 ;;; Commentary
 ;;; Code
 
+(require 'asdf)
+
+(load "~/quicklisp/setup.lisp")
+(ql:quickload "clingon")
+(ql:quickload "copy-directory")
+
+(push '*default-pathname-defaults* asdf:*central-registry*)
+(asdf:load-system "qob-cli")
+(asdf:load-system "copy-directory")
+
+;;
+;;; Util
+
+(defun qob-copy-lisp-dir ()
+  "Copy `lisp' directory over."
+  (when (probe-file "bin/lisp/")
+    (el-lib:el-delete-directory "bin/lisp/"))
+  (copy-directory:copy (el-lib:el-expand-fn "lisp/")
+                       (el-lib:el-expand-fn "bin/lisp/")))
+
 (defun qob-delete-exec ()
   "Delete the qob executable."
   ;; Delete executable

scripts/build.lisp

@@ -7,25 +7,9 @@
 
 ;;; Code
 
-(require 'asdf)
-
-(load "~/quicklisp/setup.lisp")
-(ql:quickload "clingon")
-(ql:quickload "copy-directory")
-
-(push '*default-pathname-defaults* asdf:*central-registry*)
-(asdf:load-system "qob-cli")
-(asdf:load-system "copy-directory")
-
 (load "scripts/_prepare.lisp")
 
-;;; Copy lisp directory
-(progn
-  (when (probe-file "bin/lisp/")
-    (el-lib:el-delete-directory "bin/lisp/"))
-  (copy-directory:copy (el-lib:el-expand-fn "lisp/")
-                       (el-lib:el-expand-fn "bin/lisp/")))
-
+(qob-copy-lisp-dir)
 (qob-delete-exec)
 
 ;; Build executable

scripts/deploy.lisp

@@ -7,18 +7,9 @@
 
 ;;; Code
 
-(require 'asdf)
-
-(load "~/quicklisp/setup.lisp")
-(ql:quickload "clingon")
-(ql:quickload "deploy")
-
-(push '*default-pathname-defaults* asdf:*central-registry*)
-(asdf:load-system "qob-cli")
-(asdf:load-system "qob-cli/deploy")
-
 (load "scripts/_prepare.lisp")
 
+(qob-copy-lisp-dir)
 (qob-delete-exec)
 
 ;; Deploy