Skip to content

Commit 04d819b

Browse files
committed
0.9.8.27:
Merge patch from James Bielman fixing self-build under Win32. ... a little bit of an accident ensued; I ran canonicalize-whitespace on .sh files, which seemed to work (except on wc.sh) until it scribbled all over make.sh, confusing the shell interpreter utterly. ... the resulting files have built the system, nevertheless.
1 parent 732ad80 commit 04d819b

32 files changed

+376
-307
lines changed

binary-distribution.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ tar -cf $b-binary.tar \
1818
$b/pubring.pgp \
1919
$b/contrib/asdf-module.mk \
2020
$b/contrib/vanilla-module.mk \
21-
`for dir in $b/contrib/*; do
22-
if test -d $dir && test -f $dir/test-passed; then
21+
`for dir in $b/contrib/*; do
22+
if test -d $dir && test -f $dir/test-passed; then
2323
echo $dir
2424
fi
2525
done`

clean.sh

+32-32
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ done
4040
# are never in the sources, so must've been created
4141
# sbcl
4242
# the runtime environment, created by compiling C code
43-
# sbcl.h
43+
# sbcl.h
4444
# information about Lisp code needed to build the runtime environment,
4545
# created by running GENESIS
4646
# Config, target
@@ -59,7 +59,7 @@ done
5959
# .#*, *.orig, .*.orig, *.rej
6060
# rubbish left behind by CVS updates
6161
# *.htm, *.html
62-
# The system doc sources are mostly texinfo, plus various odds
62+
# The system doc sources are mostly texinfo, plus various odds
6363
# and ends like docstrings embedded in .lisp sources; any HTML is
6464
# automatically-generated output.
6565
# depend
@@ -73,34 +73,34 @@ done
7373
# test-passed
7474
# generated by automatic directory-test-thyself procedure
7575
find . \( \
76-
-type l -o \
77-
-name '*~' -o \
78-
-name '#*#' -o \
79-
-name '.#*' -o \
80-
-name '*.orig' -o \
81-
-name '.*.orig' -o \
76+
-type l -o \
77+
-name '*~' -o \
78+
-name '#*#' -o \
79+
-name '.#*' -o \
80+
-name '*.orig' -o \
81+
-name '.*.orig' -o \
8282
-name '*.rej' -o \
83-
-name '?*.x86f' -o \
84-
-name '?*.axpf' -o \
85-
-name '?*.lbytef' -o \
86-
-name '?*.fasl' -o \
87-
-name 'core' -o \
88-
-name '?*.core' -o \
89-
-name '*.map' -o \
90-
-name '*.nm' -o \
91-
-name '*.host-obj' -o \
92-
-name '*.lisp-obj' -o \
93-
-name '*.target-obj' -o \
94-
-name '*.lib' -o \
95-
-name '*.tmp' -o \
96-
-name '*.lisp-temp' -o \
97-
-name '*.o' -o \
98-
-name '*.so' -o \
99-
-name 'a.out' -o \
100-
-name 'sbcl' -o \
101-
-name 'sbcl.h' -o \
102-
-name 'depend' -o \
103-
-name 'TAGS' -o \
104-
-name 'tags' -o \
105-
-name 'test-passed' -o \
106-
-name 'local-target-features.lisp-expr' \) -print | xargs rm -f
83+
-name '?*.x86f' -o \
84+
-name '?*.axpf' -o \
85+
-name '?*.lbytef' -o \
86+
-name '?*.fasl' -o \
87+
-name 'core' -o \
88+
-name '?*.core' -o \
89+
-name '*.map' -o \
90+
-name '*.nm' -o \
91+
-name '*.host-obj' -o \
92+
-name '*.lisp-obj' -o \
93+
-name '*.target-obj' -o \
94+
-name '*.lib' -o \
95+
-name '*.tmp' -o \
96+
-name '*.lisp-temp' -o \
97+
-name '*.o' -o \
98+
-name '*.so' -o \
99+
-name 'a.out' -o \
100+
-name 'sbcl' -o \
101+
-name 'sbcl.h' -o \
102+
-name 'depend' -o \
103+
-name 'TAGS' -o \
104+
-name 'tags' -o \
105+
-name 'test-passed' -o \
106+
-name 'local-target-features.lisp-expr' \) -print | xargs rm -f

distclean.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
# a superset of clean.sh, cleaning up not only automatically
4+
# a superset of clean.sh, cleaning up not only automatically
55
# generated files but other things (e.g. customization files)
66
# which shouldn't be in the distribution
77

@@ -16,10 +16,10 @@ rm -rf customize-target-features.lisp
1616
# Since the CVS/ subdirectories on my (WHN) machine have CVS/Root
1717
# containing
1818
# :ext:[email protected]:/cvsroot/sbcl
19-
# they're not useful for anyone else, so blow them away. (And even
20-
# if we could set them up to refer to CVS in a way that someone else
21-
# could use, perhaps referring to SourceForge anoncvs, what'd be the
22-
# point? I'd expect a comfortable majority of those who want to do
19+
# they're not useful for anyone else, so blow them away. (And even
20+
# if we could set them up to refer to CVS in a way that someone else
21+
# could use, perhaps referring to SourceForge anoncvs, what'd be the
22+
# point? I'd expect a comfortable majority of those who want to do
2323
# CVS operations would be inclined to start with "cvs co" anyway.)
2424
find . \( -type d -a -name CVS \) -print | xargs rm -r
2525

doc/internals/make-top.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/sh
22

3-
# After the ordeal, we went back to the Factory. Greenblatt said he
3+
# After the ordeal, we went back to the Factory. Greenblatt said he
44
# was gonna locate us in a cell. He said: "Kid, I'm gonna INTERN you in a
55
# cell. I want your manual and your mouse."
6-
# I said, "Greenblatt, I can understand your wantin' my manual, so
6+
# I said, "Greenblatt, I can understand your wantin' my manual, so
77
# I don't have any documentation about the cell, but what do you want my
8-
# mouse for?" and he said, "Kid, we don't want any window system problems".
8+
# mouse for?" and he said, "Kid, we don't want any window system problems".
99
# I said, "Greenblatt, did you think I was gonna deexpose myself for
1010
# litterin'?"
11-
# Greenblatt said he was makin' sure, and, friends, Greenblatt
11+
# Greenblatt said he was makin' sure, and, friends, Greenblatt
1212
# was, 'cause he took out the left Meta-key so I couldn't double bucky the
1313
# rubout and cold-boot, and he took out the Inspector so I couldn't
1414
# click-left on Modify, set the PROCESS-WARM-BOOT-ACTION on the window,

doc/manual/make-tempfiles.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ DOCSTRINGDIR="${DOCSTRINGDIR:-docstrings/}"
5454

5555
echo /creating docstring snippets from SBCL=\'$SBCLRUNTIME\' for packages \'$PACKAGES\'
5656
$SBCL <<EOF
57-
(load "docstrings.lisp")
57+
(load "docstrings.lisp")
5858
(require :asdf)
59-
(dolist (module (quote ($MODULES)))
60-
(require module))
61-
(sb-texinfo:generate-includes "$DOCSTRINGDIR" $PACKAGES)
59+
(dolist (module (quote ($MODULES)))
60+
(require module))
61+
(sb-texinfo:generate-includes "$DOCSTRINGDIR" $PACKAGES)
6262
(sb-ext:quit))
6363
EOF
6464

find-gnumake.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ find_gnumake() {
1111
GNUMAKE=gmake
1212
elif [ -x "`which gnumake`" ] ; then
1313
# MacOS X aka Darwin
14-
GNUMAKE=gnumake
14+
GNUMAKE=gnumake
1515
elif [ "GNU Make" = "`make -v | head -n 1 | cut -b 0-8`" ]; then
1616
GNUMAKE=make
1717
else

install.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ set -e
33

44
# Install SBCL files into the usual places.
55

6-
ensure_dirs ()
6+
ensure_dirs ()
77
{
8-
for j in $*; do
9-
test -d $j || mkdir -p $j
8+
for j in $*; do
9+
test -d $j || mkdir -p $j
1010
done;
1111
}
1212

@@ -28,10 +28,10 @@ fi
2828
# Before doing anything else, make sure we have an SBCL to install
2929
if [ -f src/runtime/sbcl ]; then
3030
if [ -f output/sbcl.core ]; then
31-
true
31+
true
3232
else
33-
echo "output/sbcl.core not found, aborting installation."
34-
exit 1
33+
echo "output/sbcl.core not found, aborting installation."
34+
exit 1
3535
fi
3636
else
3737
echo "src/runtime/sbcl not found, aborting installation."
@@ -58,7 +58,7 @@ test -f $BUILD_ROOT$SBCL_HOME/sbcl.core && \
5858
cp src/runtime/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/
5959
cp output/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core
6060

61-
# installing contrib
61+
# installing contrib
6262

6363
SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
6464
SBCL_BUILDING_CONTRIB=1

0 commit comments

Comments
 (0)