blob: bf4c7d4da950d677e15dae8bbb4cc5b724517a75 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
diff -ur common-lisp-controller-3.91.orig/clc-autobuild-check common-lisp-controller-3.91/clc-autobuild-check
--- common-lisp-controller-3.91.orig/clc-autobuild-check 2002-09-26 01:41:28.000000000 -0500
+++ common-lisp-controller-3.91/clc-autobuild-check 2004-08-01 14:11:35.233389176 -0500
@@ -31,7 +31,7 @@
return
fi
if [ -r $file ]; then
- first_line="$(cat $file | head -1)"
+ first_line="$(cat $file | head -n 1)"
if [ "$first_line" ]; then
first_line="$(echo "$first_line" | tr "[A-Z]" "[a-z]")"
if [ "$(expr "$first_line" : ".*\(yes\).*")" ]; then
Only in common-lisp-controller-3.91: clc-autobuild-check~
diff -ur common-lisp-controller-3.91.orig/post-sysdef-install.lisp common-lisp-controller-3.91/post-sysdef-install.lisp
--- common-lisp-controller-3.91.orig/post-sysdef-install.lisp 2004-07-13 10:22:02.000000000 -0500
+++ common-lisp-controller-3.91/post-sysdef-install.lisp 2004-08-01 14:13:26.991399376 -0500
@@ -219,76 +219,22 @@
"T if we are recompiling on orders of the clc-build-daemon")
(defun require-defsystem3 (module-name)
- ;; if in the clc root:
- (let ((system (mk:find-system module-name
- :load-or-nil)))
- (or
- ;; try to load it
- (progn
- (mk:oos module-name
- :load
- :load-source-instead-of-binary nil
- :load-source-if-no-binary nil
- :bother-user-if-no-binary nil
- :compile-during-load nil)
- ;; did we load it?
- (find module-name mk::*modules* :test #'string=))
- (progn
- (format t "~&;;;Please wait, recompiling library...")
- (cond
- (*recompiling-from-daemon*
- (mk:oos module-name
- :compile
- :verbose nil))
- (t
- ;; first compile the sub-components!
- (dolist (sub-system (make::component-depends-on system))
- (when (stringp sub-system)
- (setf sub-system (intern sub-system (find-package :keyword))))
- (clc-require sub-system))
- (common-lisp-controller:send-clc-command :recompile
- (if (stringp module-name)
- module-name
- (string-downcase
- (symbol-name
- module-name))))))
- (terpri)
- (mk:oos module-name
- :load
- :load-source-instead-of-binary nil
- :load-source-if-no-binary nil
- :bother-user-if-no-binary nil
- :compile-during-load nil)
- t))))
+ (let ((system (mk:find-system module-name :load-or-nil)))
+ (mk:oos module-name
+ :load
+ :load-source-instead-of-binary nil
+ :load-source-if-no-binary nil
+ :bother-user-if-no-binary nil
+ :compile-during-load nil)
+ ;; did we load it?
+ (find module-name mk::*modules* :test #'string=)))
(defun require-asdf (module-name)
(let ((system (asdf:find-system module-name)))
(when system
- (if (asdf-system-compiled-p system)
- (asdf:oos 'asdf:load-op module-name)
- (progn
- (format t "~&;;; Please wait, recompiling library...")
- (cond
- (*recompiling-from-daemon*
- (asdf:oos 'asdf:compile-op module-name))
- (t
- ;; first compile the depends-on
- (dolist (sub-system
- ;; skip asdf:load-op at beginning of first list
- (cdar (asdf:component-depends-on
- (make-instance 'asdf:compile-op) system)))
- (clc-require sub-system))
- (let ((module-name-str
- (if (stringp module-name)
- module-name
- (string-downcase (symbol-name module-name)))))
- ;; clc-build-daemon will report pkg built unless all components are removed
- (common-lisp-controller:send-clc-command :remove module-name-str)
- (common-lisp-controller:send-clc-command :recompile module-name-str))))
- (terpri)
- (asdf:oos 'asdf:load-op module-name)))
- t)))
+ (asdf:oos 'asdf:load-op module-name)))
+ t)
;; we need to hack the require to
;; call clc-send-command on load failure...
Only in common-lisp-controller-3.91: post-sysdef-install.lisp~
|
GitWeb