X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=1ba238cad0b81ff6f4e45f3e179e161e4217120a;hb=4bc030a8d1ea59870daed681e8e6266281724732;hp=12b7eab8832d965c3d84053f62b21cf153513f59;hpb=2d45d7a5feaaaf28b0ab42be148e675835759c11;p=blhc%2Fblhc.git diff --git a/bin/blhc b/bin/blhc index 12b7eab..1ba238c 100755 --- a/bin/blhc +++ b/bin/blhc @@ -24,7 +24,7 @@ use warnings; use Getopt::Long (); use Text::ParseWords (); -our $VERSION = '0.01'; +our $VERSION = '0.02'; # CONSTANTS/VARIABLES @@ -226,6 +226,14 @@ my %exit_code = ( invalid_cmake => 1 << 5, ); +my %buildd_tag = ( + no_compiler_commands => 'W-no-compiler-commands', + non_verbose_build => 'W-compiler-flags-hidden', + flags_missing => 'W-dpkg-buildflags-missing', + hardening_wrapper => 'I-hardening-wrapper-used', + invalid_cmake => 'W-invalid-cmake-used', +); + # Statistics of missing flags and non-verbose build commands. Used for # $option_buildd. my %statistics = ( @@ -449,8 +457,7 @@ if (not Getopt::Long::GetOptions( 'color' => \$option_color, 'arch=s' => \$option_arch, 'buildd' => \$option_buildd, - ) - or scalar @ARGV == 0) { + )) { require Pod::Usage; Pod::Usage::pod2usage(2); } @@ -477,6 +484,12 @@ along with this program. If not, see . exit 0; } +# Arguments missing. +if (scalar @ARGV == 0) { + require Pod::Usage; + Pod::Usage::pod2usage(2); +} + # Don't load Term::ANSIColor in buildd mode because Term::ANSIColor is not # installed on Debian's buildds. if (not $option_buildd) { @@ -575,7 +588,7 @@ foreach my $file (@ARGV) { if (not $option_buildd) { error_invalid_cmake($1); } else { - print "W-invalid-cmake-used $1\n"; + print "$buildd_tag{invalid_cmake} $1\n"; } $exit |= $exit_code{invalid_cmake}; } @@ -587,7 +600,7 @@ foreach my $file (@ARGV) { if (not $option_buildd) { error_hardening_wrapper(); } else { - print "I-hardening-wrapper-used\n"; + print "$buildd_tag{hardening_wrapper}\n"; } $exit |= $exit_code{hardening_wrapper}; next FILE; @@ -713,7 +726,7 @@ foreach my $file (@ARGV) { if (not $option_buildd) { print "No compiler commands!\n"; } else { - print "W-no-compiler-commands\n"; + print "$buildd_tag{no_compiler_commands}\n"; } $exit |= $exit_code{no_compiler_commands}; next FILE; @@ -961,11 +974,11 @@ if ($option_buildd) { } if (scalar @warning) { local $" = ', '; # array join string - print "W-dpkg-buildflags-missing @warning missing\n"; + print "$buildd_tag{flags_missing} @warning missing\n"; } if ($statistics{commands_nonverbose}) { - printf "W-compiler-flags-hidden %d (of %d) hidden\n", + printf "$buildd_tag{non_verbose_build} %d (of %d) hidden\n", $statistics{commands_nonverbose}, $statistics{commands}, }