Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
cmucl
cmucl
Commits
987c3f20
Commit
987c3f20
authored
Oct 11, 2011
by
Alex Goncharov
Browse files
Merge branch 'master' of
ssh://common-lisp.net/var/git/projects/cmucl/cmucl
parents
c78ad0fa
1e5b21e2
Changes
4
Hide whitespace changes
Inline
Side-by-side
compiler/main.lisp
View file @
987c3f20
...
...
@@ -1126,11 +1126,13 @@
(
setf
(
default-directory
)
cwd
))))
(
generate-comment
(
file-info
)
(
let*
((
name
(
pathname
(
source-info-stream
file-info
)))
(
proc
(
run-git
name
)))
(
if
(
and
proc
(
zerop
(
process-exit-code
proc
)))
(
proc
(
run-git
name
))
comment
)
(
if
(
and
proc
(
zerop
(
process-exit-code
proc
))
(
setf
comment
(
read-line
(
process-output
proc
)
nil
nil
)))
(
format
nil
"$Header: ~A ~A $"
(
enough-namestring
name
)
(
read-line
(
process-output
proc
))
)
comment
)
(
second
form
)))))
(
cond
((
file-info-comment
file
)
(
compiler-warning
_N
"Ignoring extra file comment:~% ~S."
form
))
...
...
tools/build-all.sh
View file @
987c3f20
...
...
@@ -63,21 +63,20 @@ if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then
exit
1
fi
VERSION
=
${
VERSION
:+-v
"
$VERSION
"
}
buildx86
()
{
if
[
-n
"
$OLD8
"
]
;
then
# Build non-unicode versions
set
-x
src/tools/build.sh
-f
x87
-b
${
BASE
}
-8bit
$bootfiles
"
$VERSION
"
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLD8
"
src/tools/build.sh
-f
sse2
-b
${
BASE
}
-8bit
$bootfiles
"
$VERSION
"
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLD8
"
src/tools/build.sh
-f
x87
-b
${
BASE
}
-8bit
$bootfiles
${
VERSION
:+-v
"
$VERSION
"
}
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLD8
"
src/tools/build.sh
-f
sse2
-b
${
BASE
}
-8bit
$bootfiles
${
VERSION
:+-v
"
$VERSION
"
}
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLD8
"
set
+x
fi
# Build the unicode versions
if
[
-n
"
$OLDLISP
"
]
;
then
set
-x
src/tools/build.sh
-f
x87
-b
${
BASE
}
$bootfiles
"
$VERSION
"
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLDLISP
"
src/tools/build.sh
-f
sse2
-b
${
BASE
}
$bootfiles
"
$VERSION
"
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLDLISP
"
src/tools/build.sh
-f
x87
-b
${
BASE
}
$bootfiles
${
VERSION
:+-v
"
$VERSION
"
}
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLDLISP
"
src/tools/build.sh
-f
sse2
-b
${
BASE
}
$bootfiles
${
VERSION
:+-v
"
$VERSION
"
}
-C
"
${
CREATE_OPT
}
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLDLISP
"
set
+x
fi
}
...
...
@@ -87,13 +86,13 @@ buildsun4 ()
# Build non-unicode versions
if
[
-n
"
$OLD8
"
]
;
then
set
-x
src/tools/build.sh
-b
${
BASE
}
-8bit
$bootfiles
"
$VERSION
"
-C
"
$CREATE_OPT
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLD8
"
src/tools/build.sh
-b
${
BASE
}
-8bit
$bootfiles
${
VERSION
:+-v
"
$VERSION
"
}
-C
"
$CREATE_OPT
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLD8
"
set
+x
fi
# Build the unicode version.
if
[
-n
"
$OLDLISP
"
]
;
then
set
-x
src/tools/build.sh
-b
${
BASE
}
$bootfiles
"
$VERSION
"
-C
"
$CREATE_OPT
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLDLISP
"
src/tools/build.sh
-b
${
BASE
}
$bootfiles
${
VERSION
:+-v
"
$VERSION
"
}
-C
"
$CREATE_OPT
"
${
UPDATE_TRANS
}
${
UPDATE_POT
}
-o
"
$OLDLISP
"
set
+x
fi
}
...
...
tools/create-target.sh
View file @
987c3f20
...
...
@@ -92,7 +92,7 @@ cd $bld_dir/lisp || quit "Can't cd $bld_dir/lisp"
ln
-s
../../src/lisp/GNUmakefile ../../src/lisp/Config.
$lisp_variant
../../src/lisp/Config.
*
_common
.
ln
-s
Config.
$lisp_variant
Config
[
-n
"
$motif_variant
"
]
&&
(
cd
motif/server
||
quit
"Can't cd motif/server"
# We will still continue in the outer shell
cd
../
motif/server
||
quit
"Can't cd motif/server"
# We will still continue in the outer shell
ln
-s
../../../src/motif/server/GNUmakefile ./Makefile
ln
-s
../../../src/motif/server/Config.
$motif_variant
./Config
)
...
...
tools/load-world.sh
View file @
987c3f20
...
...
@@ -11,8 +11,10 @@ usage()
SKIP_PCL
=
NO_PCL_FEATURE
=
# Default version is the date.
VERSION
=
"CVS Head
`
date
'+%Y-%m-%d %H:%M:%S'
`
"
# Default version is the date with the git hash.
GIT_HASH
=
"
`
(
cd
src
;
git describe
--dirty
2>/dev/null
)
`
"
VERSION
=
"
`
date
'+%Y-%m-%d %H:%M:%S'
`
${
GIT_HASH
:+
$GIT_HASH
}
"
echo
$VERSION
while
getopts
"p"
arg
do
...
...
@@ -40,7 +42,7 @@ fi
# If version string give, use it, otherwise use the default.
if
[
-n
"
$2
"
]
;
then
VERSION
=
$2
VERSION
=
"
$2
"
fi
$TARGET
/lisp/lisp
-core
$TARGET
/lisp/kernel.core
<<
EOF
...
...
@@ -57,6 +59,6 @@ $TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF
$NO_PCL_FEATURE
(load "target:tools/worldload")
$
2
$
VERSION
EOF
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment