KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

metadata: improve code readability by using (s)printf instead of string interpolation

Browse source 
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2018-01-08 18:47:04 +01:00
parent 1e2570dd04
commit de0ccd3532
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/package-metadata.pl
View file

@ -404,9 +404,9 @@ sub gen_package_mk() {
my @vdeps = grep { $srcname ne $_->{src}{name} } @{$vpkg_dep}; my @vdeps = grep { $srcname ne $_->{src}{name} } @{$vpkg_dep};
foreach my $vdep (@vdeps) { foreach my $vdep (@vdeps) {
my $depstr = "\$(curdir)/$vdep->{src}{path}/compile"; my $depstr = sprintf '$(curdir)/%s/compile', $vdep->{src}{path};
if (@vdeps > 1) { if (@vdeps > 1) {
$depstr = "\$(if \$(CONFIG_PACKAGE_$vdep->{name}),$depstr)"; $depstr = sprintf '$(if $(CONFIG_PACKAGE_%s),%s)', $vdep->{name}, $depstr;
} }
my $depline = get_conditional_dep($condition, $depstr); my $depline = get_conditional_dep($condition, $depstr);
if ($depline) { if ($depline) {
@ -416,32 +416,32 @@ sub gen_package_mk() {
} }
my $config = ''; my $config = '';
$config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless $pkg->{buildonly}; $config = sprintf '$(CONFIG_PACKAGE_%s)', $pkg->{name} unless $pkg->{buildonly};
$pkg->{prereq} and print "prereq-$config += $src->{path}\n"; $pkg->{prereq} and printf "prereq-%s += %s\n", $config, $src->{path};
next if $pkg->{buildonly}; next if $pkg->{buildonly};
print "package-$config += $src->{path}\n"; printf "package-%s += %s\n", $config, $src->{path};
if ($pkg->{variant}) { if ($pkg->{variant}) {
if (!defined($variant_default) or $pkg->{variant_default}) { if (!defined($variant_default) or $pkg->{variant_default}) {
$variant_default = $pkg->{variant}; $variant_default = $pkg->{variant};
} }
print "\$(curdir)/$src->{path}/variants += \$(if $config,$pkg->{variant})\n"; printf "\$(curdir)/%s/variants += \$(if %s,%s)\n", $src->{path}, $config, $pkg->{variant};
} }
} }
if (defined($variant_default)) { if (defined($variant_default)) {
print "\$(curdir)/$src->{path}/default-variant := $variant_default\n"; printf "\$(curdir)/%s/default-variant := %s\n", $src->{path}, $variant_default;
} }
unless (grep {!$_->{buildonly}} @{$src->{packages}}) { unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
print "package- += $src->{path}\n"; printf "package- += %s\n", $src->{path};
} }
if (@{$src->{buildtypes}} > 0) { if (@{$src->{buildtypes}} > 0) {
print "buildtypes-$src->{path} = ".join(' ', @{$src->{buildtypes}})."\n"; printf "buildtypes-%s = %s\n", $src->{path}, join(' ', @{$src->{buildtypes}});
} }
foreach my $type ('', @{$src->{buildtypes}}) { foreach my $type ('', @{$src->{buildtypes}}) {
@ -472,12 +472,12 @@ sub gen_package_mk() {
my $src_dep = $srcpackage{$dep}; my $src_dep = $srcpackage{$dep};
unless (defined($src_dep) && (!$deptype || grep { $_ eq $deptype } @{$src_dep->{buildtypes}})) { unless (defined($src_dep) && (!$deptype || grep { $_ eq $deptype } @{$src_dep->{buildtypes}})) {
warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s%s', which does not exist\n", warn sprintf "WARNING: Makefile '%s' has a build dependency on '%s', which does not exist\n",
$src->{makefile}, $dep, $depsuffix; $src->{makefile}, $dep.$depsuffix;
next; next;
} }
my $depstr = "\$(curdir)/$src_dep->{path}$depsuffix/compile"; my $depstr = sprintf '$(curdir)/%s/compile', $src_dep->{path}.$depsuffix;
my $depline = get_conditional_dep($condition, $depstr); my $depline = get_conditional_dep($condition, $depstr);
if ($depline) { if ($depline) {
$deplines{$suffix}{$depline}++; $deplines{$suffix}{$depline}++;
@ -488,7 +488,7 @@ sub gen_package_mk() {
foreach my $suffix (sort keys %deplines) { foreach my $suffix (sort keys %deplines) {
my $depline = join(" ", sort keys %{$deplines{$suffix}}); my $depline = join(" ", sort keys %{$deplines{$suffix}});
if ($depline) { if ($depline) {
$line .= "\$(curdir)/$src->{path}$suffix/compile += $depline\n"; $line .= sprintf "\$(curdir)/%s/compile += %s\n", $src->{path}.$suffix, $depline;
} }
} }
} }