Improved logs manegament in iterative builds.
This commit is contained in:
parent
5359c48f8c
commit
4edbc92615
2 changed files with 10 additions and 4 deletions
|
@ -146,6 +146,7 @@ chapter5_Makefiles() {
|
||||||
chapter6_Makefiles() {
|
chapter6_Makefiles() {
|
||||||
#----------------------------#
|
#----------------------------#
|
||||||
# Set envars and scripts for iteration targets
|
# Set envars and scripts for iteration targets
|
||||||
|
LOGS="" # Start with an empty global LOGS envar
|
||||||
if [[ -z "$1" ]] ; then
|
if [[ -z "$1" ]] ; then
|
||||||
local N=""
|
local N=""
|
||||||
else
|
else
|
||||||
|
@ -198,10 +199,14 @@ chapter6_Makefiles() {
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# First append each name of the script files to a list (this will become
|
# Append each name of the script files to a list (this will become
|
||||||
# the names of the targets in the Makefile
|
# the names of the targets in the Makefile)
|
||||||
chapter6="$chapter6 ${this_script}${N}"
|
chapter6="$chapter6 ${this_script}${N}"
|
||||||
|
|
||||||
|
# Append each name of the script files to a list (this will become
|
||||||
|
# the names of the logs to be moved for each iteration)
|
||||||
|
LOGS="$LOGS ${this_script}"
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< #
|
# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< #
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
@ -337,7 +342,7 @@ build_Makefile() {
|
||||||
chapter4_Makefiles
|
chapter4_Makefiles
|
||||||
chapter5_Makefiles
|
chapter5_Makefiles
|
||||||
chapter6_Makefiles
|
chapter6_Makefiles
|
||||||
# Add the ICA/farce targets, if needed
|
# Add the iterations targets, if needed
|
||||||
[[ "$COMPARE" != "0" ]] && wrt_compare_targets
|
[[ "$COMPARE" != "0" ]] && wrt_compare_targets
|
||||||
chapter789_Makefiles
|
chapter789_Makefiles
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ wrt_compare_targets() { #
|
||||||
if [ "$N" != "1" ] ; then
|
if [ "$N" != "1" ] ; then
|
||||||
wrt_system_build "$N" "$PREV_IT"
|
wrt_system_build "$N" "$PREV_IT"
|
||||||
fi
|
fi
|
||||||
|
this_script=$ITERATION
|
||||||
wrt_target "$ITERATION" "$PREV"
|
wrt_target "$ITERATION" "$PREV"
|
||||||
wrt_compare_work "$ITERATION" "$PREV_IT"
|
wrt_compare_work "$ITERATION" "$PREV_IT"
|
||||||
wrt_logs "$N"
|
wrt_logs "$N"
|
||||||
|
@ -108,7 +109,7 @@ wrt_logs() { #
|
||||||
cat << EOF
|
cat << EOF
|
||||||
@pushd logs 1> /dev/null && \\
|
@pushd logs 1> /dev/null && \\
|
||||||
mkdir $ITERATION && \\
|
mkdir $ITERATION && \\
|
||||||
cp ${chapter6} $ITERATION && \\
|
mv ${LOGS} $ITERATION && \\
|
||||||
popd 1> /dev/null
|
popd 1> /dev/null
|
||||||
@touch \$@
|
@touch \$@
|
||||||
EOF
|
EOF
|
||||||
|
|
Reference in a new issue