Commit f6c2bfe8 by James Tucker

ruby-build now supports $RUBY_BUILD_BUILD_PATH to specify the location of the…

ruby-build now supports $RUBY_BUILD_BUILD_PATH to specify the location of the BUILD_PATH instead of a seeded directory under TMP
parent e69f559c
...@@ -28,8 +28,8 @@ build_failed() { ...@@ -28,8 +28,8 @@ build_failed() {
echo "BUILD FAILED" echo "BUILD FAILED"
echo echo
if ! rmdir "${TEMP_PATH}" 2>/dev/null; then if ! rmdir "${BUILD_PATH}" 2>/dev/null; then
echo "Inspect or clean up the working tree at ${TEMP_PATH}" echo "Inspect or clean up the working tree at ${BUILD_PATH}"
if file_is_not_empty "$LOG_PATH"; then if file_is_not_empty "$LOG_PATH"; then
echo "Results logged to ${LOG_PATH}" echo "Results logged to ${LOG_PATH}"
...@@ -68,7 +68,7 @@ install_package_using() { ...@@ -68,7 +68,7 @@ install_package_using() {
local package_name="$3" local package_name="$3"
shift 3 shift 3
pushd "$TEMP_PATH" >&4 pushd "$BUILD_PATH" >&4
"fetch_${package_type}" "$package_name" $* "fetch_${package_type}" "$package_name" $*
shift $(($package_type_nargs)) shift $(($package_type_nargs))
make_package "$package_name" $* make_package "$package_name" $*
...@@ -404,10 +404,15 @@ fi ...@@ -404,10 +404,15 @@ fi
SEED="$(date "+%Y%m%d%H%M%S").$$" SEED="$(date "+%Y%m%d%H%M%S").$$"
LOG_PATH="${TMP}/ruby-build.${SEED}.log" LOG_PATH="${TMP}/ruby-build.${SEED}.log"
TEMP_PATH="${TMP}/ruby-build.${SEED}"
RUBY_BIN="${PREFIX_PATH}/bin/ruby" RUBY_BIN="${PREFIX_PATH}/bin/ruby"
CWD="$(pwd)" CWD="$(pwd)"
if [ -z $RUBY_BUILD_BUILD_PATH ]; then
BUILD_PATH="${TMP}/ruby-build.${SEED}"
else
BUILD_PATH=$RUBY_BUILD_BUILD_PATH
fi
exec 4<> "$LOG_PATH" # open the log file at fd 4 exec 4<> "$LOG_PATH" # open the log file at fd 4
if [ -n "$VERBOSE" ]; then if [ -n "$VERBOSE" ]; then
tail -f "$LOG_PATH" & tail -f "$LOG_PATH" &
...@@ -421,7 +426,7 @@ unset RUBYOPT ...@@ -421,7 +426,7 @@ unset RUBYOPT
unset RUBYLIB unset RUBYLIB
trap build_failed ERR trap build_failed ERR
mkdir -p "$TEMP_PATH" mkdir -p "$BUILD_PATH"
source "$DEFINITION_PATH" source "$DEFINITION_PATH"
rm -fr "$TEMP_PATH" rm -fr "$BUILD_PATH"
trap - ERR trap - ERR
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment