Skip to content
Snippets Groups Projects
Commit 15fac227 authored by Raymond Toy's avatar Raymond Toy
Browse files

Update paths for the new location of the scripts.

parent cf7fb10f
No related branches found
No related tags found
No related merge requests found
...@@ -63,20 +63,21 @@ if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then ...@@ -63,20 +63,21 @@ if [ "$OLDLISP" = "" -a "$OLD8" = "" ]; then
exit 1 exit 1
fi fi
BINDIR=bin
buildx86 () buildx86 ()
{ {
if [ -n "$OLD8" ]; then if [ -n "$OLD8" ]; then
# Build non-unicode versions # Build non-unicode versions
set -x set -x
src/tools/build.sh -f x87 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" $BINDIR/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" $BINDIR/build.sh -f sse2 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8"
set +x set +x
fi fi
# Build the unicode versions # Build the unicode versions
if [ -n "$OLDLISP" ]; then if [ -n "$OLDLISP" ]; then
set -x set -x
src/tools/build.sh -f x87 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" $BINDIR/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" $BINDIR/build.sh -f sse2 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP"
set +x set +x
fi fi
} }
...@@ -89,13 +90,13 @@ buildsun4 () ...@@ -89,13 +90,13 @@ buildsun4 ()
# Build non-unicode versions # Build non-unicode versions
if [ -n "$OLD8" ]; then if [ -n "$OLD8" ]; then
set -x set -x
src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" $BINDIR/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8"
set +x set +x
fi fi
# Build the unicode version. # Build the unicode version.
if [ -n "$OLDLISP" ]; then if [ -n "$OLDLISP" ]; then
set -x set -x
src/tools/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" $BINDIR/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP"
set +x set +x
fi fi
} }
......
...@@ -41,7 +41,8 @@ ENABLE4="yes" ...@@ -41,7 +41,8 @@ ENABLE4="yes"
version=20c version=20c
SRCDIR=src SRCDIR=src
TOOLDIR=$SRCDIR/tools BINDIR=bin
TOOLDIR=$BINDIR
VERSION="`date '+%Y-%m-%d %H:%M:%S'`" VERSION="`date '+%Y-%m-%d %H:%M:%S'`"
GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`"
# Add the tree hash to the version # Add the tree hash to the version
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment