Skip to content

Commit

Permalink
[devtools] Make sure _tmp/shells/ash doesn't override _deps/spec-bin.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Chu committed Apr 18, 2020
1 parent cf98611 commit 4e0002e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions build/dev-shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
#
# Note: assumes that $REPO_ROOT is $PWD.

# test/spec-bin.sh builds binaries
readonly SPEC_DIR="$PWD/_deps/spec-bin"
# build/codegen.sh builds binaries
readonly RE2C_DIR="$PWD/_deps/re2c-1.0.3"

# FALLBACK without test/spec-bin: test/spec.sh link-busybox-ash
readonly ASH_SYMLINK_DIR="$PWD/_tmp/shells"

# build/codegen.sh builds binaries
readonly RE2C_DIR="$PWD/_deps/re2c-1.0.3"
# test/spec-bin.sh builds binaries
readonly SPEC_DIR="$PWD/_deps/spec-bin"

if test -d $SPEC_DIR; then
export PATH="$SPEC_DIR:$PATH"
if test -d $RE2C_DIR; then
export PATH="$RE2C_DIR:$PATH"
fi

if test -d $ASH_SYMLINK_DIR; then
export PATH="$ASH_SYMLINK_DIR:$PATH"
fi

if test -d $RE2C_DIR; then
export PATH="$RE2C_DIR:$PATH"
# This should override $ASH_SYMLINK_DIR
if test -d $SPEC_DIR; then
export PATH="$SPEC_DIR:$PATH"
fi

4 changes: 2 additions & 2 deletions devtools/release-note.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set -o errexit
source devtools/release-version.sh # for escape-segements

readonly OIL_VERSION=$(head -n 1 oil-version.txt)
readonly PREV_VERSION='0.8.pre2'
readonly PREV_VERSION='0.8.pre3'

# adapted from release-version.sh
_git-changelog-body() {
Expand Down Expand Up @@ -59,7 +59,7 @@ issues-table() {
}

write-template() {
local out=../oilshell.org/blog/2020/03/_release-$OIL_VERSION.md
local out=../oilshell.org/blog/2020/04/_release-$OIL_VERSION.md
print-template > $out
echo "Wrote $out"
}
Expand Down

0 comments on commit 4e0002e

Please sign in to comment.