Modular object-orientied buildsystem implementation (try 2).

Major changess:

* Dh_Buildsystem_Option dropped and Dh_Buildsystem_Chdir functionality
  partitially merged into Dh_Buildsystem_Basic. Dh_Buildsystem_Bases.pm
  renamed to Dh_Buildsystem_Basic.pm to match classname.
* *_impl() ditched completely. Previous {configure,build,test,install,clean}_impl()
  renamed to just configure(), build(), test(), install(), clean() instead.
  Added pre_action($action) and post_action($action) hooks instead which are called
  by Dh_Buildsystems::buildsystems_do().
* Builddir is handled via mkdir_builddir(), doit_in_buildddir(), clean_builddir()
  methods which buildsystems should call directly. Removed get_top* method, added
  get_rel2builddir_path().
* is_buildable() method renamed to is_auto_buildable() to reflect its
  purpose more.
* ::perl_makefile renamed to ::perl_makemaker and which is based on ::makefile
  now. MakeMaker hack moved from ::makefile to ::perl_makemaker where it belongs
  (thanks for the tip).
* Dh_Buildsystems refactored into a simple perl module rather than OO class and
  simplified a bit.
* @BUILDSYSTEMS and is_auto_buildable() modified to 100% match historical order.

TODO: user documentation (e.g. DH_AUTO_BUILDDIRECTORY and DH_AUTO_BUILDSYSTEM
environment variables and common dh_auto_* options (--buildsystem and --builddirectory)).

Current plugin inheritance hierarchy is like this:

    Buildsystem::perl_build -> Dh_Buildsystem_Basic  <- Buildsystem::python_distutils
                                      ^
                                      |
                              Buildsystem::makefile  <- Buildsystem::perl_makemaker
                              ^       ^           ^
                             /        |             \
       Buildsystem::autotools  Buildsystem::cmake   Buildsystem::python_distutils

Signed-off-by: Modestas Vainius <modestas@vainius.eu>

1 files changed, 21 insertions, 23 deletions

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 00f6be4d..026004a0 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -10,45 +10,43 @@ use strict;
 use Debian::Debhelper::Dh_Lib;
 use base 'Debian::Debhelper::Buildsystem::makefile';
 
-sub _add_cmake_flag {
-	my ($self, $name, $val) = @_;
-	push @{$self->{cmake_flags}}, "-D$name=$val";
-}
-
 sub DESCRIPTION {
 	"support for building CMake based packages (outside-source tree only)"
 }
 
-sub is_buildable {
-	return -e "CMakeLists.txt";
+sub is_auto_buildable {
+	my $self=shift;
+	my ($action)=@_;
+	my $ret = -e "CMakeLists.txt";
+	$ret &&= $self->SUPER::is_auto_buildable(@_) if $action ne "configure";
+	return $ret;
 }
 
 sub new {
 	my $cls=shift;
 	my $self=$cls->SUPER::new(@_);
-	# Enfore outside-source tree builds.
+	# Enforce outside-source tree builds.
 	$self->enforce_outside_source_building();
-	$self->{cmake_flags} = [];
 	return $self;
 }
 
-sub configure_impl {
+sub configure {
 	my $self=shift;
+	my @flags;
 
 	# Standard set of cmake flags
-	$self->_add_cmake_flag("CMAKE_INSTALL_PREFIX", "/usr");
-	$self->_add_cmake_flag("CMAKE_C_FLAGS", $ENV{CFLAGS}) if (exists $ENV{CFLAGS});
-	$self->_add_cmake_flag("CMAKE_CXX_FLAGS", $ENV{CXXFLAGS}) if (exists $ENV{CXXFLAGS});
-	$self->_add_cmake_flag("CMAKE_SKIP_RPATH", "ON");
-	$self->_add_cmake_flag("CMAKE_VERBOSE_MAKEFILE", "ON");
-	# TODO: LDFLAGS
-	# XXX JEH why are we using a method and an object
-	# field to build up a simple one-time-use list?
-	# 	my @flags;
-	# 	push @flags, ... if $foo
-
-	# XXX JEH again a non-sequitor get_topdir. 
-	doit("cmake", $self->get_topdir(), @{$self->{cmake_flags}}, @_);
+	push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
+	push @flags, "-DCMAKE_C_FLAGS=$ENV{CFLAGS}" if (exists $ENV{CFLAGS});
+	push @flags, "-DCMAKE_CXX_FLAGS=$ENV{CXXFLAGS}" if (exists $ENV{CXXFLAGS});
+	push @flags, "-DCMAKE_LD_FLAGS=$ENV{LDFLAGS}" if (exists $ENV{LDFLAGS});
+	push @flags, "-DCMAKE_SKIP_RPATH=ON";
+	push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
+
+	# XXX JEH again a non-sequitor get_topdir.
+	# XXX MDX I cannot avoid it as I need to pass the path to the sourcedir
+	# to cmake which is relative to the builddir.
+	$self->mkdir_builddir();
+	$self->doit_in_builddir("cmake", $self->get_rel2builddir_path(), @flags);
 }
 
 1;