Skip to content

Commit

Permalink
Cleanup: Remove first/last backported printing code.
Browse files Browse the repository at this point in the history
The first/last code was backported in the past to make the scripts more forward-compatible.

I have decided to remove the first/last printing feature after significant testing and review.
The 0.7 development and later no longer has the first/last and so the backported code is no longer needed.
  • Loading branch information
thekevinday committed May 23, 2024
1 parent f180e1c commit 05e440a
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 832 deletions.
43 changes: 21 additions & 22 deletions build/scripts/bootstrap-example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ build_mode_extra_value_1=
build_mode_extra_param_2=
build_mode_extra_value_2=
shell_command=bash
suppress_first=""
exclude_programs=
grab_next=
skip=
Expand Down Expand Up @@ -150,11 +149,11 @@ if [[ ${1} == "individual" ]] ; then

cd package/individual/${i}-${version}/ &&

${shell_command} ./bootstrap.sh clean ${verbose} ${color} ${suppress_first} &&
${shell_command} ./bootstrap.sh clean ${verbose} ${color} &&

${shell_command} ./bootstrap.sh build ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} -m individual -m individual_thread ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&
${shell_command} ./bootstrap.sh build ${verbose} ${color} ${shared} ${static} -w ${path_work} -m individual -m individual_thread ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&

${shell_command} ./install.sh ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} &&
${shell_command} ./install.sh ${verbose} ${color} ${shared} ${static} -w ${path_work} &&

cd ${path_original} || break
done
Expand All @@ -166,43 +165,43 @@ if [[ ${1} == "level" ]] ; then

cd package/level/fll-level_0-${version}/ &&

${shell_command} ./bootstrap.sh clean ${verbose} ${color} ${suppress_first} &&
${shell_command} ./bootstrap.sh clean ${verbose} ${color} &&

${shell_command} ./bootstrap.sh build ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} -m level ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&
${shell_command} ./bootstrap.sh build ${verbose} ${color} ${shared} ${static} -w ${path_work} -m level ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&

${shell_command} ./install.sh ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} &&
${shell_command} ./install.sh ${verbose} ${color} ${shared} ${static} -w ${path_work} &&

cd ${path_original} &&

cd package/level/fll-level_1-${version}/ &&

${shell_command} ./bootstrap.sh clean ${verbose} ${color} ${suppress_first} &&
${shell_command} ./bootstrap.sh clean ${verbose} ${color} &&

${shell_command} ./bootstrap.sh build ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} -m level ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&
${shell_command} ./bootstrap.sh build ${verbose} ${color} ${shared} ${static} -w ${path_work} -m level ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&

${shell_command} ./install.sh ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} &&
${shell_command} ./install.sh ${verbose} ${color} ${shared} ${static} -w ${path_work} &&

cd ${path_original} &&

cd package/level/fll-level_2-${version}/ &&

${shell_command} ./bootstrap.sh clean ${verbose} ${color} ${suppress_first} &&
${shell_command} ./bootstrap.sh clean ${verbose} ${color} &&

${shell_command} ./bootstrap.sh build ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} -m level ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&
${shell_command} ./bootstrap.sh build ${verbose} ${color} ${shared} ${static} -w ${path_work} -m level ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&

${shell_command} ./install.sh ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work}
${shell_command} ./install.sh ${verbose} ${color} ${shared} ${static} -w ${path_work}
fi

if [[ ${1} == "monolithic" ]] ; then
${shell_command} build/scripts/package.sh ${verbose} ${color} rebuild -m &&

cd package/monolithic/fll-${version}/ &&

${shell_command} ./bootstrap.sh clean ${verbose} ${color} ${suppress_first} &&
${shell_command} ./bootstrap.sh clean ${verbose} ${color} &&

${shell_command} ./bootstrap.sh build ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} -m monolithic ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&
${shell_command} ./bootstrap.sh build ${verbose} ${color} ${shared} ${static} -w ${path_work} -m monolithic ${mode_thread_param} ${mode_thread_value} ${mode_compiler_param} ${mode_compiler_value} &&

${shell_command} ./install.sh ${verbose} ${color} ${shared} ${suppress_first} ${static} -w ${path_work}
${shell_command} ./install.sh ${verbose} ${color} ${shared} ${static} -w ${path_work}
fi

# The following in an example on building individual projects.
Expand Down Expand Up @@ -254,11 +253,11 @@ if [[ ${mode_part} != "" ]] ; then

cd package/${mode_path}/${mode_part}-${version}/ &&

${shell_command} ./bootstrap.sh clean ${verbose} ${color} ${suppress_first} &&
${shell_command} ./bootstrap.sh clean ${verbose} ${color} &&

${shell_command} ./bootstrap.sh build ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} -m ${build_mode} ${build_mode_extra_param_1} ${build_mode_extra_value_1} ${build_mode_extra_param_2} ${build_mode_extra_value_2} ${mode_compiler_param} ${mode_compiler_value} &&
${shell_command} ./bootstrap.sh build ${verbose} ${color} ${shared} ${static} -w ${path_work} -m ${build_mode} ${build_mode_extra_param_1} ${build_mode_extra_value_1} ${build_mode_extra_param_2} ${build_mode_extra_value_2} ${mode_compiler_param} ${mode_compiler_value} &&

${shell_command} ./install.sh ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work}
${shell_command} ./install.sh ${verbose} ${color} ${shared} ${static} -w ${path_work}

# The following in an example on building all FLL program projects using the project bootstrapped from above.
elif [[ ${1} == "programs-individual" || ${1} == "programs-level" || ${1} == "programs-monolithic" ]] ; then
Expand Down Expand Up @@ -314,11 +313,11 @@ elif [[ ${1} == "programs-individual" || ${1} == "programs-level" || ${1} == "pr

cd ${path_original}package/program/${i} &&

${shell_command} ./bootstrap.sh clean ${verbose} ${color} ${suppress_first} &&
${shell_command} ./bootstrap.sh clean ${verbose} ${color} &&

${shell_command} ./bootstrap.sh build ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} -m ${build_mode} ${build_mode_extra_param_1} ${build_mode_extra_value_1} ${build_mode_extra_param_2} ${build_mode_extra_value_2} ${mode_compiler_param} ${mode_compiler_value} &&
${shell_command} ./bootstrap.sh build ${verbose} ${color} ${shared} ${static} -w ${path_work} -m ${build_mode} ${build_mode_extra_param_1} ${build_mode_extra_value_1} ${build_mode_extra_param_2} ${build_mode_extra_value_2} ${mode_compiler_param} ${mode_compiler_value} &&

${shell_command} ./install.sh ${verbose} ${color} ${suppress_first} ${shared} ${static} -w ${path_work} ||
${shell_command} ./install.sh ${verbose} ${color} ${shared} ${static} -w ${path_work} ||

break
done
Expand Down
Loading

0 comments on commit 05e440a

Please sign in to comment.