summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-06-29 15:35:18 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-06-29 15:35:18 -0400
commitfe3bf5cfa5e99cec28e0289508faaf9e68efec25 (patch)
tree6960790853004a956fb2dfa94925c1a498139d67
parentd6661136b167b05bb55afab08e8ee53e919a89c1 (diff)
misc minor changes
-rw-r--r--Debian/Debhelper/Buildsystem.pm12
-rw-r--r--Debian/Debhelper/Buildsystem/autoconf.pm2
-rw-r--r--Debian/Debhelper/Buildsystem/cmake.pm2
-rw-r--r--Debian/Debhelper/Buildsystem/makefile.pm2
-rw-r--r--Debian/Debhelper/Buildsystem/perl_build.pm2
-rw-r--r--Debian/Debhelper/Buildsystem/perl_makemaker.pm2
-rw-r--r--Debian/Debhelper/Buildsystem/python_distutils.pm2
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm7
-rw-r--r--doc/PROGRAMMING3
9 files changed, 17 insertions, 17 deletions
diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index 3ee37a5..c63f815 100644
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -91,16 +91,16 @@ sub _set_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) = @_;
@@ -257,7 +257,7 @@ sub _cd {
}
}
-# 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 {
@@ -374,4 +374,4 @@ sub clean {
my $this=shift;
}
-1;
+1
diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index 60fa9e8..7229fc7 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -52,4 +52,4 @@ sub configure {
$this->doit_in_builddir($this->get_source_rel2builddir("configure"), @opts, @_);
}
-1;
+1
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 5662874..fe97f77 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -42,4 +42,4 @@ sub configure {
$this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags);
}
-1;
+1
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index d84d334..3809d59 100644
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -92,4 +92,4 @@ sub clean {
}
}
-1;
+1
diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 3567cb1..caba9b7 100644
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -64,4 +64,4 @@ sub clean {
$this->do_perl("Build", "--allow_mb_mismatch", 1, "distclean", @_);
}
-1;
+1
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 07a827a..702458c 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -61,4 +61,4 @@ sub install {
$this->SUPER::install($destdir, "PREFIX=/usr", @_);
}
-1;
+1
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 39a4466..fce4513 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -111,4 +111,4 @@ sub clean {
$this->doit_in_sourcedir('find', '.', '-name', '*.pyc', '-exec', 'rm', '{}', ';');
}
-1;
+1
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index d37c593..64ec18a 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -87,7 +87,7 @@ sub load_all_buildsystems {
}
}
- # Push standard debhelper build systems first
+ # Standard debhelper build systems first
for my $name (@BUILDSYSTEMS) {
error("standard debhelper build system '$name' could not be found/loaded")
if not exists $buildsystems{$name};
@@ -131,8 +131,7 @@ sub buildsystems_list {
# List build systems (including auto and specified status)
my ($auto, $specified);
- my @buildsystems = load_all_buildsystems();
- for my $inst (@buildsystems) {
+ for my $inst (load_all_buildsystems()) {
my $is_specified = defined $opt_buildsys && $opt_buildsys eq $inst->NAME();
if (! defined $specified && defined $opt_buildsys && $opt_buildsys eq $inst->NAME()) {
$specified = $inst->NAME();
@@ -177,4 +176,4 @@ sub buildsystems_do {
return 0;
}
-1;
+1
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index f338b57..450511e 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -275,7 +275,8 @@ classes.
A buildsystem class needs to inherit or define these methods: DESCRIPTION,
check_auto_buildable, build, test, install, clean. See the comments
-inside Debian::Debhelper::Buildsystem for details.
+inside Debian::Debhelper::Buildsystem for details. Note that this interface
+is still subject to change.
Note that third-party buildsystems will not automatically be used by default,
but can be forced to be used via the --buildsystem parameter.