← Back to branch summary

~m-grant-prg/agmaint/bionic-trunk

« back to all changes in this revision

Viewing changes to bootstrap.sh

  • Committer: Mark Grant
  • Date: 2021-08-20 14:29:27 UTC
  • mfrom: (1.1.32)
  • Revision ID: m.grant.prg@gmail.com-20210820142927-w6cy19hay2zpza62
Merge new upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bootstrap.sh
148
148
#                               make as --jobs                          #
149
149
# 14/04/2021    MG      1.4.8   Add menu-config option to invoke menu   #
150
150
#                               of configurable options.                #
 
151
# 28/05/2021    MG      1.4.9   Process menuconfig before using tee for #
 
152
#                               the build log as menuconfig may involve #
 
153
#                               dialog and redirection.                 #
 
154
#                               Use a temporary file to get result back #
 
155
#                               from configurable-options.sh            #
151
156
#                                                                       #
152
157
#########################################################################
153
158
 
156
161
# Init variables #
157
162
##################
158
163
 
159
 
readonly version=1.4.8                  # set version variable
160
 
readonly packageversion=1.3.11  # Version of the complete package
 
164
readonly version=1.4.9                  # set version variable
 
165
readonly packageversion=1.3.12  # Version of the complete package
161
166
 
162
167
# Set defaults
163
168
atonly=""
477
482
proc_menuconfig()
478
483
{
479
484
        local msg
 
485
        local readonly tmp_file=/tmp/$$.$(basename $0).tmp
480
486
 
481
487
        if [[ ! -f $basedirunq/configurable-options.sh \
482
488
                || ! -r $basedirunq/configurable-options.sh \
486
492
                output "$msg" 1
487
493
                script_exit 77
488
494
        fi
489
 
        configcli_extra_args+=$($basedirunq/configurable-options.sh)
 
495
        $basedirunq/configurable-options.sh $tmp_file
 
496
        std_cmd_err_handler $?
 
497
        configcli_extra_args+=$(cat < $tmp_file)
 
498
        std_cmd_err_handler $?
 
499
        rm -f $tmp_file
490
500
        std_cmd_err_handler $?
491
501
}
492
502
 
565
575
 
566
576
proc_CL "$@"
567
577
 
568
 
# Create build log.
 
578
# Now the main processing.
 
579
if $menuconfig; then
 
580
        proc_menuconfig
 
581
fi
 
582
 
 
583
# Create build log after menuconfig which may use dialog and redirections.
569
584
exec 1> >(tee build-output.txt) 2>&1
570
585
 
571
 
# Now the main processing.
572
586
if $gnulib ; then
573
587
        proc_gnulib
574
588
fi
575
589
 
576
 
if $menuconfig; then
577
 
        proc_menuconfig
578
 
fi
579
 
 
580
590
if $config ; then
581
591
        proc_config
582
592
fi