my ($class, %opts)=@_;
my $this = bless({ sourcedir => '.',
- builddir => undef, }, $class);
+ builddir => undef,
+ cwd => Cwd::getcwd() }, $class);
if (exists $opts{sourcedir}) {
# Get relative sourcedir abs_path (without symlinks)
- my $curdir = Cwd::getcwd();
my $abspath = Cwd::abs_path($opts{sourcedir});
- if (! -d $abspath || $abspath !~ /^\Q$curdir\E/) {
+ if (! -d $abspath || $abspath !~ /^\Q$this->{cwd}\E/) {
error("invalid or non-existing path to the source directory: ".$opts{sourcedir});
}
- $this->{sourcedir} = File::Spec->abs2rel($abspath, $curdir);
+ $this->{sourcedir} = File::Spec->abs2rel($abspath, $this->{cwd});
}
if (exists $opts{builddir}) {
$this->_set_builddir($opts{builddir});
# unset the build directory.
sub _set_builddir {
my $this=shift;
- my $builddir=shift;
- $this->{builddir} = ($builddir) ? $builddir : $this->DEFAULT_BUILD_DIRECTORY;
-
- # Canonicalize. If build directory ends up the same as source directory, drop it
- if (defined $this->{builddir}) {
- $this->{builddir} = $this->_canonpath($this->{builddir});
- if ($this->{builddir} eq $this->get_sourcedir()) {
- $this->{builddir} = undef;
+ my $builddir=shift || $this->DEFAULT_BUILD_DIRECTORY;
+
+ if (defined $builddir) {
+ $builddir = $this->canonpath($builddir); # Canonicalize
+
+ # Sanitize $builddir
+ if ($builddir =~ m#^\.\./#) {
+ # We can't handle those as relative. Make them absolute
+ $builddir = File::Spec->catdir($this->{cwd}, $builddir);
+ }
+ elsif ($builddir =~ /\Q$this->{cwd}\E/) {
+ $builddir = File::Spec::abs2rel($builddir, $this->{cwd});
+ }
+
+ # If build directory ends up the same as source directory, drop it
+ if ($builddir eq $this->get_sourcedir()) {
+ $builddir = undef;
}
}
+ $this->{builddir} = $builddir;
+ return $builddir;
}
-# This instance method is called to check if the build system is capable
+# This instance method is called to check if the build system is able
# to auto build a source package. Additional argument $step describes
# which operation the caller is going to perform (either configure,
# build, test, install or clean). You must override this method for the
# build system module to be ever picked up automatically. This method is
# used in conjuction with @Dh_Buildsystems::BUILDSYSTEMS.
#
-# This method is supposed to be called with source root directory being
-# working directory. Use $this->get_buildpath($path) method to get full
-# path to the files in the build directory.
+# This method is supposed to be called inside the source root directory.
+# Use $this->get_buildpath($path) method to get full path to the files
+# in the build directory.
sub check_auto_buildable {
my $this=shift;
my ($step) = @_;
}
}
-# Derived class can call this method in its constructor to enforce
-# out of source building even if the user didn't request it. However,
-# if $builddir is specified, accept it even if it matches the source
-# directory (i.e. out of source is prefered to in source).
-sub enforce_out_of_source_building {
- my ($this, $builddir) = @_;
+# Derived class can call this method in its constructor to *prefer*
+# out of source building. Unless build directory has already been
+# specified building will proceed in the DEFAULT_BUILD_DIRECTORY or
+# the one specified in the 'builddir' named parameter (which may
+# match the source directory). Typically you should pass @_ from
+# the constructor to this call.
+sub prefer_out_of_source_building {
+ my $this=shift;
+ my %args=@_;
if (!defined $this->get_builddir()) {
- $this->_set_builddir($builddir);
- if (!defined $this->get_builddir() && !$builddir) {
+ if (!$this->_set_builddir($args{builddir}) && !$args{builddir}) {
# If we are here, DEFAULT_BUILD_DIRECTORY matches
# the source directory, building might fail.
error("default build directory is the same as the source directory." .
}
}
+# Derived class can call this method in its constructor to *enforce*
+# out of source building even if the user didn't request it.
+# Build directory is set to DEFAULT_BUILD_DIRECTORY or building
+# fails if it is not possible to set it
+sub enforce_out_of_source_building {
+ my $this=shift;
+ $this->prefer_out_of_source_building();
+}
+
# Enhanced version of File::Spec::canonpath. It collapses ..
# too so it may return invalid path if symlinks are involved.
# On the other hand, it does not need for the path to exist.
-sub _canonpath {
+sub canonpath {
my ($this, $path)=@_;
my @canon;
my $back=0;
return (@canon + $back > 0) ? join('/', ('..')x$back, @canon) : '.';
}
-# Given both $path and $base are relative to the same directory,
-# converts and returns path of $path being relative the $base.
+# Given both $path and $base are relative to the $root, converts and
+# returns path of $path being relative to the $base. If either $path or
+# $base is absolute, returns another $path (converted to) absolute.
sub _rel2rel {
my ($this, $path, $base, $root)=@_;
- $root = "/tmp" if !defined $root;
-
- return File::Spec->abs2rel(
- File::Spec->rel2abs($path, $root),
- File::Spec->rel2abs($base, $root)
- );
+ $root = $this->{cwd} unless defined $root;
+
+ if (File::Spec->file_name_is_absolute($path)) {
+ return $path;
+ } elsif (File::Spec->file_name_is_absolute($base)) {
+ return File::Spec->rel2abs($path, $root);
+ } else {
+ return File::Spec->abs2rel(
+ File::Spec->rel2abs($path, $root),
+ File::Spec->rel2abs($base, $root)
+ );
+ }
}
# Get path to the source directory
}
}
-# Changes working directory to the source directory (if needed)
+# Changes working directory to the source directory (if needed),
# calls doit(@_) and changes working directory back to the top
# directory.
sub doit_in_sourcedir {
my $this=shift;
if ($this->get_sourcedir() ne '.') {
my $sourcedir = $this->get_sourcedir();
- my $curdir = Cwd::getcwd();
$this->_cd($sourcedir);
doit(@_);
- $this->_cd($this->_rel2rel($curdir, $sourcedir, $curdir));
+ $this->_cd($this->_rel2rel($this->{cwd}, $sourcedir));
}
else {
doit(@_);
my $this=shift;
if ($this->get_buildpath() ne '.') {
my $buildpath = $this->get_buildpath();
- my $curdir = Cwd::getcwd();
$this->_cd($buildpath);
doit(@_);
- $this->_cd($this->_rel2rel($curdir, $buildpath, $curdir));
+ $this->_cd($this->_rel2rel($this->{cwd}, $buildpath));
}
else {
doit(@_);
doit("rm", "-rf", $buildpath);
pop @spdir;
}
- # If build directory had 2 or more levels, delete empty
- # parent directories until the source directory level.
- while (($peek=pop(@spdir)) && $peek ne '.' && $peek ne '..') {
- last if ! rmdir($this->get_sourcepath(File::Spec->catdir(@spdir, $peek)));
+ # If build directory is relative and had 2 or more levels, delete
+ # empty parent directories until the source directory level.
+ if (not File::Spec->file_name_is_absolute($buildpath)) {
+ while (($peek=pop(@spdir)) && $peek ne '.' && $peek ne '..') {
+ my $dir = $this->get_sourcepath(File::Spec->catdir(@spdir, $peek));
+ verbose_print("rmdir $dir");
+ last if ! rmdir($dir);
+ }
}
}
return 1;
my $this=shift;
}
-1;
+1
projects / debhelper.git / blobdiff