From a81dd8b003e5152bddeccc0c92f40c003890cbdc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 18 Nov 2009 14:28:47 -0500 Subject: comment munging --- Debian/Debhelper/Buildsystem.pm | 14 +++++++------- Debian/Debhelper/Buildsystem/cmake.pm | 3 +++ Debian/Debhelper/Buildsystem/perl_makemaker.pm | 6 ------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm index 7f7465a4..5b3423e6 100644 --- a/Debian/Debhelper/Buildsystem.pm +++ b/Debian/Debhelper/Buildsystem.pm @@ -109,16 +109,16 @@ sub _set_builddir { } # This instance method is called to check if the build system is able -# to build a source package. It will be called during build -# system auto-selection process inside the root directory of the debian -# source package. Current build step will be passed as an additional -# argument. The value returned must be 0 if the source is not buildable -# or a positive integer otherwise. +# to build a source package. It will be called during the build +# system auto-selection process, inside the root directory of the debian +# source package. The current build step is passed as an argument. +# Return 0 if the source is not buildable, or a positive integer +# otherwise. # # Generally, it is enough to look for invariant unique build system # files shipped with clean source to determine if the source might -# be buildable or not. However, if the build system enhances (i.e. -# derives) from the other auto-buildable build system, this method +# be buildable or not. However, if the build system is derived from +# another other auto-buildable build system, this method # may also check if the source has already been built with this build # system partitially by looking for temporary files or other common # results the build system produces during the build process. The diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index 3eddc74f..ee90c1f9 100644 --- a/Debian/Debhelper/Buildsystem/cmake.pm +++ b/Debian/Debhelper/Buildsystem/cmake.pm @@ -18,6 +18,9 @@ sub check_auto_buildable { my ($step)=@_; if (-e $this->get_sourcepath("CMakeLists.txt")) { my $ret = $this->SUPER::check_auto_buildable(@_); + # Existence of CMakeCache.txt indicates cmake has already + # been used by a prior build step, so should be used + # instead of the parent makefile class. $ret++ if ($ret && -e $this->get_buildpath("CMakeCache.txt")); return $ret > 0 ? $ret : 1; } diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm index 473a3a7e..b2500ab7 100644 --- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm +++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm @@ -23,12 +23,6 @@ sub check_auto_buildable { return 1; } else { - # This is backwards compatible (with << 7.3) until build, test and - # clean steps are not reimplemented in the backwards compatibility - # breaking way. However, this is absolutely necessary for - # enforce_in_source_building() to work in corner cases in build, - # test and clean steps as the next class (makefile) does not - # enforce it. return $this->SUPER::check_auto_buildable(@_); } } -- cgit v1.2.3