summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-01-20 20:37:43 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-01-20 20:37:43 (GMT)
commit1115b43f868e1802da67a193a84428af5b958607 (patch)
tree3dc46263566bff6f16ec0c71be7cf2b1331a807e
parent0fc2762de75ab7c6ef91654dd7883cbbeef7dc92 (diff)
On 20090115.0012+0100, "Andy Johnson" <ajohnson@aecno.com> wrote:
... I added a step after "debug" called "finish", and moved the code in crosstool.sh after the loop that processes the steps from crosstool.sh into a do_finish function in functions. Thus, it is now possible to restart after the "debug" step to re-do the final few things (clean and compress). /trunk/scripts/crosstool-NG.sh | 38 0 38 0 -------------------------------------- /trunk/scripts/functions | 42 42 0 0 ++++++++++++++++++++++++++++++++++++++++++ /trunk/steps.mk | 3 2 1 0 ++- 3 files changed, 44 insertions(+), 39 deletions(-)
-rwxr-xr-xscripts/crosstool-NG.sh38
-rw-r--r--scripts/functions42
-rw-r--r--steps.mk3
3 files changed, 44 insertions, 39 deletions
diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh
index dd1156f..277f75c 100755
--- a/scripts/crosstool-NG.sh
+++ b/scripts/crosstool-NG.sh
@@ -456,44 +456,6 @@ if [ "${CT_ONLY_DOWNLOAD}" != "y" -a "${CT_ONLY_EXTRACT}" != "y" ]; then
fi
prev_step="${step}"
done
-
- CT_DoLog INFO "================================================================="
-
- CT_DoLog DEBUG "Removing access to the build system tools"
- find "${CT_PREFIX_DIR}/bin" -name "${CT_BUILD}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
- find "${CT_PREFIX_DIR}/bin" -name "${CT_HOST}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
- CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/makeinfo"
-
- if [ "${CT_BARE_METAL}" != "y" ]; then
- CT_DoLog EXTRA "Installing the populate helper"
- sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
- "${CT_LIB_DIR}/scripts/populate.in" \
- >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
- CT_DoExecLog ALL chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
- fi
-
- # Create the aliases to the target tools
- CT_DoLog EXTRA "Creating toolchain aliases"
- CT_Pushd "${CT_PREFIX_DIR}/bin"
- for t in "${CT_TARGET}-"*; do
- if [ -n "${CT_TARGET_ALIAS}" ]; then
- _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
- CT_DoExecLog ALL ln -sv "${t}" "${_t}"
- fi
- if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
- _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
- CT_DoExecLog ALL ln -sv "${t}" "${_t}"
- fi
- done
- CT_Popd
-
- # Remove the generated documentation files
- if [ "${CT_REMOVE_DOCS}" = "y" ]; then
- CT_DoLog INFO "Removing installed documentation"
- CT_DoForceRmdir "${CT_PREFIX_DIR}/"{,usr/}{man,info}
- CT_DoForceRmdir "${CT_SYSROOT_DIR}/"{,usr/}{man,info}
- CT_DoForceRmdir "${CT_DEBUG_INSTALL_DIR}/"{,usr/}{man,info}
- fi
fi
CT_DoEnd INFO
diff --git a/scripts/functions b/scripts/functions
index b8d31a0..d6beccf 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -891,3 +891,45 @@ CT_DoLoadState(){
rm -f "${state_dir}/tail.log"
fi
}
+
+do_finish() {
+ CT_DoStep INFO "Cleaning-up the toolchain's directory"
+
+ CT_DoLog EXTRA "Removing access to the build system tools"
+ find "${CT_PREFIX_DIR}/bin" -name "${CT_BUILD}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
+ find "${CT_PREFIX_DIR}/bin" -name "${CT_HOST}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
+ CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/makeinfo"
+
+ if [ "${CT_BARE_METAL}" != "y" ]; then
+ CT_DoLog EXTRA "Installing the populate helper"
+ sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
+ "${CT_LIB_DIR}/scripts/populate.in" \
+ >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
+ CT_DoExecLog ALL chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
+ fi
+
+ # Create the aliases to the target tools
+ CT_DoLog EXTRA "Creating toolchain aliases"
+ CT_Pushd "${CT_PREFIX_DIR}/bin"
+ for t in "${CT_TARGET}-"*; do
+ if [ -n "${CT_TARGET_ALIAS}" ]; then
+ _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
+ CT_DoExecLog ALL ln -sv "${t}" "${_t}"
+ fi
+ if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
+ _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
+ CT_DoExecLog ALL ln -sv "${t}" "${_t}"
+ fi
+ done
+ CT_Popd
+
+ # Remove the generated documentation files
+ if [ "${CT_REMOVE_DOCS}" = "y" ]; then
+ CT_DoLog EXTRA "Removing installed documentation"
+ CT_DoForceRmdir "${CT_PREFIX_DIR}/"{,usr/}{man,info}
+ CT_DoForceRmdir "${CT_SYSROOT_DIR}/"{,usr/}{man,info}
+ CT_DoForceRmdir "${CT_DEBUG_INSTALL_DIR}/"{,usr/}{man,info}
+ fi
+
+ CT_EndStep
+}
diff --git a/steps.mk b/steps.mk
index efe5e75..4546fba 100644
--- a/steps.mk
+++ b/steps.mk
@@ -14,7 +14,7 @@ help-env::
# ----------------------------------------------------------
# The steps list
-# Please keep the last line with a '\' and keep the folowing empy line:
+# Please keep the last line with a '\' and keep the following empy line:
# it helps when diffing and merging.
CT_STEPS := libc_check_config \
kernel_headers \
@@ -33,6 +33,7 @@ CT_STEPS := libc_check_config \
binutils_target \
tools \
debug \
+ finish \
# Make the list available to sub-processes (scripts/crosstool-NG.sh needs it)
export CT_STEPS