From ddde04a8b60d6abce48ff857eda34495b3ebf059 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 30 Jan 2016 10:02:36 +0100 Subject: Dpkg::BuildEnv: Rename to Dpkg::Build::Env --- scripts/Dpkg/Arch.pm | 6 +-- scripts/Dpkg/Build/Env.pm | 113 ++++++++++++++++++++++++++++++++++++++++++ scripts/Dpkg/BuildEnv.pm | 113 ------------------------------------------ scripts/Dpkg/BuildFlags.pm | 34 ++++++------- scripts/Dpkg/BuildOptions.pm | 6 +-- scripts/Dpkg/BuildProfiles.pm | 8 +-- scripts/Dpkg/Vendor.pm | 6 +-- 7 files changed, 143 insertions(+), 143 deletions(-) create mode 100644 scripts/Dpkg/Build/Env.pm delete mode 100644 scripts/Dpkg/BuildEnv.pm (limited to 'scripts/Dpkg') diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm index 373d0b144..10e2f85ad 100644 --- a/scripts/Dpkg/Arch.pm +++ b/scripts/Dpkg/Arch.pm @@ -62,7 +62,7 @@ use Dpkg (); use Dpkg::Gettext; use Dpkg::ErrorHandling; use Dpkg::Util qw(:list); -use Dpkg::BuildEnv; +use Dpkg::Build::Env; my (@cpu, @os); my (%cputable, %ostable); @@ -111,7 +111,7 @@ if available. sub get_build_arch() { - return Dpkg::BuildEnv::get('DEB_BUILD_ARCH') || get_raw_build_arch(); + return Dpkg::Build::Env::get('DEB_BUILD_ARCH') || get_raw_build_arch(); } { @@ -191,7 +191,7 @@ if available. sub get_host_arch() { - return Dpkg::BuildEnv::get('DEB_HOST_ARCH') || get_raw_host_arch(); + return Dpkg::Build::Env::get('DEB_HOST_ARCH') || get_raw_host_arch(); } =item @arch_list = get_valid_arches() diff --git a/scripts/Dpkg/Build/Env.pm b/scripts/Dpkg/Build/Env.pm new file mode 100644 index 000000000..9312d2d3c --- /dev/null +++ b/scripts/Dpkg/Build/Env.pm @@ -0,0 +1,113 @@ +# Copyright © 2012 Guillem Jover +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +package Dpkg::Build::Env; + +use strict; +use warnings; + +our $VERSION = '0.01'; + +my %env_modified = (); +my %env_accessed = (); + +=encoding utf8 + +=head1 NAME + +Dpkg::Build::Env - track build environment + +=head1 DESCRIPTION + +The Dpkg::Build::Env module is used by dpkg-buildflags to track the build +environment variables being used and modified. + +=head1 FUNCTIONS + +=over 4 + +=item $bf->set($varname, $value) + +Update the build environment variable $varname with value $value. Record +it as being accessed and modified. + +=cut + +sub set { + my ($varname, $value) = @_; + $env_modified{$varname} = 1; + $env_accessed{$varname} = 1; + $ENV{$varname} = $value; +} + +=item $bf->get($varname) + +Get the build environment variable $varname value. Record it as being +accessed. + +=cut + +sub get { + my $varname = shift; + $env_accessed{$varname} = 1; + return $ENV{$varname}; +} + +=item $bf->has($varname) + +Return a boolean indicating whether the environment variable exists. +Record it as being accessed. + +=cut + +sub has { + my $varname = shift; + $env_accessed{$varname} = 1; + return exists $ENV{$varname}; +} + +=item @list = $bf->list_accessed() + +Returns a list of all environment variables that have been accessed. + +=cut + +sub list_accessed { + my @list = sort keys %env_accessed; + return @list; +} + +=item @list = $bf->list_modified() + +Returns a list of all environment variables that have been modified. + +=cut + +sub list_modified { + my @list = sort keys %env_modified; + return @list; +} + +=back + +=head1 CHANGES + +=head2 Version 0.xx + +This is a private module. + +=cut + +1; diff --git a/scripts/Dpkg/BuildEnv.pm b/scripts/Dpkg/BuildEnv.pm deleted file mode 100644 index ff8faa13a..000000000 --- a/scripts/Dpkg/BuildEnv.pm +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright © 2012 Guillem Jover -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -package Dpkg::BuildEnv; - -use strict; -use warnings; - -our $VERSION = '0.01'; - -my %env_modified = (); -my %env_accessed = (); - -=encoding utf8 - -=head1 NAME - -Dpkg::BuildEnv - track build environment - -=head1 DESCRIPTION - -The Dpkg::BuildEnv module is used by dpkg-buildflags to track the build -environment variables being used and modified. - -=head1 FUNCTIONS - -=over 4 - -=item $bf->set($varname, $value) - -Update the build environment variable $varname with value $value. Record -it as being accessed and modified. - -=cut - -sub set { - my ($varname, $value) = @_; - $env_modified{$varname} = 1; - $env_accessed{$varname} = 1; - $ENV{$varname} = $value; -} - -=item $bf->get($varname) - -Get the build environment variable $varname value. Record it as being -accessed. - -=cut - -sub get { - my $varname = shift; - $env_accessed{$varname} = 1; - return $ENV{$varname}; -} - -=item $bf->has($varname) - -Return a boolean indicating whether the environment variable exists. -Record it as being accessed. - -=cut - -sub has { - my $varname = shift; - $env_accessed{$varname} = 1; - return exists $ENV{$varname}; -} - -=item @list = $bf->list_accessed() - -Returns a list of all environment variables that have been accessed. - -=cut - -sub list_accessed { - my @list = sort keys %env_accessed; - return @list; -} - -=item @list = $bf->list_modified() - -Returns a list of all environment variables that have been modified. - -=cut - -sub list_modified { - my @list = sort keys %env_modified; - return @list; -} - -=back - -=head1 CHANGES - -=head2 Version 0.xx - -This is a private module. - -=cut - -1; diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm index 41c46d846..06ae9e705 100644 --- a/scripts/Dpkg/BuildFlags.pm +++ b/scripts/Dpkg/BuildFlags.pm @@ -22,7 +22,7 @@ our $VERSION = '1.03'; use Dpkg (); use Dpkg::Gettext; -use Dpkg::BuildEnv; +use Dpkg::Build::Env; use Dpkg::BuildOptions; use Dpkg::ErrorHandling; use Dpkg::Vendor qw(run_vendor_hook); @@ -152,20 +152,20 @@ sub load_environment_config { foreach my $flag (keys %{$self->{flags}}) { my $envvar = 'DEB_' . $flag . '_SET'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->set($flag, Dpkg::BuildEnv::get($envvar), 'env'); + if (Dpkg::Build::Env::has($envvar)) { + $self->set($flag, Dpkg::Build::Env::get($envvar), 'env'); } $envvar = 'DEB_' . $flag . '_STRIP'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->strip($flag, Dpkg::BuildEnv::get($envvar), 'env'); + if (Dpkg::Build::Env::has($envvar)) { + $self->strip($flag, Dpkg::Build::Env::get($envvar), 'env'); } $envvar = 'DEB_' . $flag . '_APPEND'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->append($flag, Dpkg::BuildEnv::get($envvar), 'env'); + if (Dpkg::Build::Env::has($envvar)) { + $self->append($flag, Dpkg::Build::Env::get($envvar), 'env'); } $envvar = 'DEB_' . $flag . '_PREPEND'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->prepend($flag, Dpkg::BuildEnv::get($envvar), 'env'); + if (Dpkg::Build::Env::has($envvar)) { + $self->prepend($flag, Dpkg::Build::Env::get($envvar), 'env'); } } } @@ -182,20 +182,20 @@ sub load_maintainer_config { foreach my $flag (keys %{$self->{flags}}) { my $envvar = 'DEB_' . $flag . '_MAINT_SET'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->set($flag, Dpkg::BuildEnv::get($envvar), undef, 1); + if (Dpkg::Build::Env::has($envvar)) { + $self->set($flag, Dpkg::Build::Env::get($envvar), undef, 1); } $envvar = 'DEB_' . $flag . '_MAINT_STRIP'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->strip($flag, Dpkg::BuildEnv::get($envvar), undef, 1); + if (Dpkg::Build::Env::has($envvar)) { + $self->strip($flag, Dpkg::Build::Env::get($envvar), undef, 1); } $envvar = 'DEB_' . $flag . '_MAINT_APPEND'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->append($flag, Dpkg::BuildEnv::get($envvar), undef, 1); + if (Dpkg::Build::Env::has($envvar)) { + $self->append($flag, Dpkg::Build::Env::get($envvar), undef, 1); } $envvar = 'DEB_' . $flag . '_MAINT_PREPEND'; - if (Dpkg::BuildEnv::has($envvar)) { - $self->prepend($flag, Dpkg::BuildEnv::get($envvar), undef, 1); + if (Dpkg::Build::Env::has($envvar)) { + $self->prepend($flag, Dpkg::Build::Env::get($envvar), undef, 1); } } } diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm index 8ca285962..92b0bb7c5 100644 --- a/scripts/Dpkg/BuildOptions.pm +++ b/scripts/Dpkg/BuildOptions.pm @@ -24,7 +24,7 @@ our $VERSION = '1.01'; use Dpkg::Gettext; use Dpkg::ErrorHandling; -use Dpkg::BuildEnv; +use Dpkg::Build::Env; =encoding utf8 @@ -60,7 +60,7 @@ sub new { envvar => $opts{envvar} // 'DEB_BUILD_OPTIONS', }; bless $self, $class; - $self->merge(Dpkg::BuildEnv::get($self->{envvar}), $self->{envvar}); + $self->merge(Dpkg::Build::Env::get($self->{envvar}), $self->{envvar}); return $self; } @@ -183,7 +183,7 @@ sub export { my ($self, $var) = @_; $var //= $self->{envvar}; my $content = $self->output(); - Dpkg::BuildEnv::set($var, $content); + Dpkg::Build::Env::set($var, $content); return $content; } diff --git a/scripts/Dpkg/BuildProfiles.pm b/scripts/Dpkg/BuildProfiles.pm index 781613766..85d24febe 100644 --- a/scripts/Dpkg/BuildProfiles.pm +++ b/scripts/Dpkg/BuildProfiles.pm @@ -29,7 +29,7 @@ our @EXPORT_OK = qw( use Exporter qw(import); use Dpkg::Util qw(:list); -use Dpkg::BuildEnv; +use Dpkg::Build::Env; my $cache_profiles; my @build_profiles; @@ -59,8 +59,8 @@ the environment variable B. sub get_build_profiles { return @build_profiles if $cache_profiles; - if (Dpkg::BuildEnv::has('DEB_BUILD_PROFILES')) { - @build_profiles = split /\s+/, Dpkg::BuildEnv::get('DEB_BUILD_PROFILES'); + if (Dpkg::Build::Env::has('DEB_BUILD_PROFILES')) { + @build_profiles = split /\s+/, Dpkg::Build::Env::get('DEB_BUILD_PROFILES'); } $cache_profiles = 1; @@ -79,7 +79,7 @@ sub set_build_profiles { $cache_profiles = 1; @build_profiles = @profiles; - Dpkg::BuildEnv::set('DEB_BUILD_PROFILES', join ' ', @profiles); + Dpkg::Build::Env::set('DEB_BUILD_PROFILES', join ' ', @profiles); } =item @profiles = parse_build_profiles($string) diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm index fcb2d3fdd..4ddcc8414 100644 --- a/scripts/Dpkg/Vendor.pm +++ b/scripts/Dpkg/Vendor.pm @@ -34,7 +34,7 @@ use Exporter qw(import); use Dpkg (); use Dpkg::ErrorHandling; use Dpkg::Gettext; -use Dpkg::BuildEnv; +use Dpkg::Build::Env; use Dpkg::Control::HashCore; my $origins = "$Dpkg::CONFDIR/origins"; @@ -131,8 +131,8 @@ If that file doesn't exist, it returns undef. sub get_current_vendor() { my $f; - if (Dpkg::BuildEnv::has('DEB_VENDOR')) { - $f = get_vendor_info(Dpkg::BuildEnv::get('DEB_VENDOR')); + if (Dpkg::Build::Env::has('DEB_VENDOR')) { + $f = get_vendor_info(Dpkg::Build::Env::get('DEB_VENDOR')); return $f->{'Vendor'} if defined $f; } $f = get_vendor_info(); -- cgit v1.2.3