common-lisp/roswell.roswell
1
0
Fork 0
mirror of https://github.com/roswell/roswell.git synced 2026-09-10 07:16:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated clasp 2018-11-28

Browse source
This commit is contained in:
gos-k 2018-11-30 16:19:16 +09:00
parent 5da844872a
commit 35f9d3279c
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/install+externals-clasp.lisp
View file

@ -5,7 +5,8 @@
(defparameter *external-clasp-version*
;; alias commit
'(("5.0-20171109" "f8c4535b474dfec5fd567a161c0a6c94a61743f2")
'(("6.0.1" "8ad13ba592230f13d11c13b2b0498844ca7083ef")
("5.0-20171109" "f8c4535b474dfec5fd567a161c0a6c94a61743f2")
("5.0" "bffc94f06a87b88eecc8fef0731929a97ba3dad8")
("4.0" "489501b0fce58d63d00efbb01d0c3b39a07a57ce")
("3.9.1" "cb00dd0edc7e698162aa176a7d51b9d704bd2596")))
@ -14,7 +15,7 @@
(mapcar #'first *external-clasp-version*))
(defun externals-clasp-download (argv)
(set-opt "download.uri" (format nil "~@{~A~}" "https://github.com/drmeister/externals-clasp/archive/"
(set-opt "download.uri" (format nil "~@{~A~}" "https://github.com/gos-k/externals-clasp/archive/"
(or (second (assoc (getf argv :version) *external-clasp-version* :test 'equal))
(getf argv :version))
".tar.gz"))
@ -25,7 +26,9 @@
(format t "~%Extracting archive:~A~%" (opt "download.archive"))
(let* ((h (homedir))
(v (getf argv :version))
(clasp (merge-pathnames (format nil "lib/~A/~A/externals-clasp/" (uname-m) (uname) v) h)))
;; replace externals-clasp to externals_clasp
;; skip version check of clasp's wscript
(clasp (merge-pathnames (format nil "lib/~A/~A/externals_clasp/" (uname-m) (uname) v) h)))
(set-opt "src" (merge-pathnames (format nil "~A/" v) clasp))
(when (and (probe-file (merge-pathnames "success" (opt "src")))
(not (opt "install.force")))

22
lisp/install-clasp.lisp
View file

@ -5,7 +5,8 @@
(defparameter *clasp-version*
;; alias commit external-clasp-version
'(("2018-05-17" "b561e8fa7300ae774e7d75eb6d6514926657c557" "5.0-20171109")
'(("2018-11-28" "2f2b52ccb750048460562b5987a7eaf7a1aa4445" "6.0.1")
("2018-05-17" "b561e8fa7300ae774e7d75eb6d6514926657c557" "5.0-20171109")
("2018-04-01" "d0de68494af19e8b52fb56d83399b0c27b22a528" "5.0")
("2018-03-11" "ee3e6c7f94e1e9a692541caa9f71ba73cfdbc292" "5.0")
("2018-02-05" "948467383606819bedafd2998c2139e190bd3391" "5.0")
@ -59,6 +60,7 @@
(uiop/run-program:run-program
(list "git" "clone" "https://github.com/clasp-developers/clasp.git" output)
:output t :ignore-error-status nil))
(chdir (opt "src"))
(format t "git fetch~%")
(uiop/run-program:run-program
@ -79,16 +81,14 @@
(homedir))))
(with-open-file (out (merge-pathnames "wscript.config" (opt "src"))
:direction :output :if-exists :supersede)
(format out "EXTERNALS_CLASP_DIR = '~A'~%" (namestring (merge-pathnames (format nil "lib/~A/~A/externals-clasp/~A"
(uname-m) (uname)
(clasp-get-externals-clasp-version argv))
(homedir))))
(let* ((path (format nil "lib/~A/~A/externals-clasp/~A/build/release/bin/llvm-config"
(uname-m) (uname)
(clasp-get-externals-clasp-version argv))))
;; replace externals-clasp to externals_clasp
;; skip version check of clasp's wscript
(let* ((path (format nil "lib/~A/~A/externals_clasp/~A/build/release/bin/llvm-config"
(uname-m) (uname)
(clasp-get-externals-clasp-version argv))))
(format out "LLVM_CONFIG_BINARY = '~A'~%" (namestring (merge-pathnames path (homedir)))))
(format out "SBCL = '~A'~%" (namestring (merge-pathnames "bin/sbcl" sbcl-base))))
(format out "SBCL = '~A'~%" (namestring (merge-pathnames "bin/sbcl" sbcl-base)))
(format out "USE_PARALLEL_BUILD = True~%"))
(setenv "SBCL_HOME" (namestring (merge-pathnames "lib/sbcl" sbcl-base)))
(format t "with sbcl-bin(~A) build clasp" sbcl-base))
(with-open-file (out (ensure-directories-exist
@ -98,7 +98,7 @@
:direction :output :if-exists :append :if-does-not-exist :create)
(format out "~&--~&~A~%" (date))
(let* ((src (opt "src"))
(cmd "./waf update_dependencies configure build_cboehm")
(cmd "./waf configure build_dboehm")
(*standard-output* (make-broadcast-stream out #+sbcl(make-instance 'count-line-stream))))
(chdir src)
(format t "~&~S~%" cmd)