summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorModestas Vainius <modestas@vainius.eu>2009-06-15 16:20:11 +0300
committerModestas Vainius <modestas@vainius.eu>2009-06-17 22:44:31 +0300
commit95f0a0968c30a6737c3f321f305985b3fd33a63e (patch)
treee0bf3bd0f3745792682e7f4397c7f7b84072761b /Debian
parent49b64c7852744f54250121b1c60544e1f5de70b6 (diff)
Some cosmetic changes in the comments and strings.
* buildsystem -> build system * dh_auto build system -> debhelper build system * plugin -> class * a few rewording changes in the comments. * Enhance python_distutils::DESCRIPTION().
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Debhelper/Buildsystem.pm10
-rw-r--r--Debian/Debhelper/Buildsystem/autoconf.pm2
-rw-r--r--Debian/Debhelper/Buildsystem/cmake.pm6
-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.pm6
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm18
8 files changed, 24 insertions, 24 deletions
diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index d144cf5..da43b7d 100644
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -1,4 +1,4 @@
-# Defines debhelper buildsystem class interface and implementation
+# Defines debhelper build system class interface and implementation
# of common functionality.
#
# Copyright: © 2008-2009 Modestas Vainius
@@ -13,7 +13,7 @@ use File::Spec;
use Debian::Debhelper::Dh_Lib;
# Cache DEB_BUILD_GNU_TYPE value. Performance hit of multiple
-# invocations is noticable when listing buildsystems.
+# invocations is noticable when listing build systems.
our $DEB_BUILD_GNU_TYPE = dpkg_architecture_value("DEB_BUILD_GNU_TYPE");
# Build system name. Defaults to the last component of the class
@@ -26,7 +26,7 @@ sub NAME {
return $1;
}
else {
- error("ınvalid buildsystem class name: $class");
+ error("ınvalid build system class name: $class");
}
}
@@ -120,7 +120,7 @@ sub enforce_in_source_building {
# 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 (soft mode).
+# directory (i.e. out of source is prefered to in source).
sub enforce_out_of_source_building {
my ($this, $builddir) = @_;
if (!defined $this->get_builddir()) {
@@ -347,7 +347,7 @@ sub post_building_step {
# In case of failure, the method may just error() out.
#
# These methods should be overriden by derived classes to
-# implement buildsystem specific steps needed to build the
+# implement build system specific steps needed to build the
# source. Arbitary number of custom step arguments might be
# passed. Default implementations do nothing.
sub configure {
diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index c92e2c1..60fa9e8 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -1,4 +1,4 @@
-# A buildsystem plugin for handling autoconf based projects
+# A debhelper build system class for handling Autoconf based projects
#
# Copyright: © 2008 Joey Hess
# © 2008-2009 Modestas Vainius
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 057f327..c2a3769 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -1,5 +1,5 @@
-# A buildsystem plugin for handling CMake based projects.
-# It enforces out of source tree building.
+# A debhelper build system class for handling CMake based projects.
+# It prefers out of source tree building.
#
# Copyright: © 2008-2009 Modestas Vainius
# License: GPL-2+
@@ -25,7 +25,7 @@ sub new {
my $class=shift;
my $this=$class->SUPER::new(@_);
my %args=@_;
- # Enforce out of source tree building (soft mode).
+ # Prefer out of source tree building.
$this->enforce_out_of_source_building($args{builddir});
return $this;
}
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index 6a9e687..d84d334 100644
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -1,4 +1,4 @@
-# A buildsystem plugin for handling simple Makefile based projects.
+# A debhelper build system class for handling simple Makefile based projects.
#
# Copyright: © 2008 Joey Hess
# © 2008-2009 Modestas Vainius
diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 525b0e1..3567cb1 100644
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -1,4 +1,4 @@
-# A buildsystem plugin for handling Perl Build based projects.
+# A build system class for handling Perl Build based projects.
#
# Copyright: © 2008-2009 Joey Hess
# © 2008-2009 Modestas Vainius
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 4281fa2..07a827a 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -1,4 +1,4 @@
-# A buildsystem plugin for handling Perl MakeMaker based projects.
+# A debhelper build system class for handling Perl MakeMaker based projects.
#
# Copyright: © 2008-2009 Joey Hess
# © 2008-2009 Modestas Vainius
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 2641173..d05e381 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -1,5 +1,5 @@
-# A buildsystem plugin for building Python Distutils based
-# projects.
+# A debhelper build system class for building Python Distutils based
+# projects. It prefers out of source tree building.
#
# Copyright: © 2008 Joey Hess
# © 2008-2009 Modestas Vainius
@@ -13,7 +13,7 @@ use Debian::Debhelper::Dh_Lib qw(error);
use base 'Debian::Debhelper::Buildsystem';
sub DESCRIPTION {
- "Python distutils"
+ "Python Distutils (setup.py)"
}
sub DEFAULT_BUILD_DIRECTORY {
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 6748a74..0e11dba 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -1,4 +1,4 @@
-# A module for loading and managing debhelper buildsystem plugins.
+# A module for loading and managing debhelper build system plugins.
# This module is intended to be used by all dh_auto_* helper commands.
#
# Copyright: © 2009 Modestas Vainius
@@ -15,7 +15,7 @@ use base 'Exporter';
our @EXPORT=qw(&buildsystems_init &buildsystems_do &load_buildsystem &load_all_buildsystems);
# Historical order must be kept for backwards compatibility. New
-# buildsystems MUST be added to the END of the list.
+# build systems MUST be added to the END of the list.
our @BUILDSYSTEMS = (
"autoconf",
"perl_makemaker",
@@ -38,7 +38,7 @@ sub create_buildsystem_instance {
eval "use $module";
if ($@) {
- error("unable to load buildsystem class '$system': $@");
+ error("unable to load build system class '$system': $@");
}
if (!exists $bsopts{builddir} && defined $opt_builddir) {
@@ -50,8 +50,8 @@ sub create_buildsystem_instance {
return $module->new(%bsopts);
}
-# Similar to create_buildsystem_instance(), but it attempts to autoselect
-# a buildsystem if none was specified. In case autoselection fails, undef
+# Similar to create_build system_instance(), but it attempts to autoselect
+# a build system if none was specified. In case autoselection fails, undef
# is returned.
sub load_buildsystem {
my $system=shift;
@@ -88,15 +88,15 @@ sub load_all_buildsystems {
}
}
- # Push debhelper built-in buildsystems first
+ # Push debhelper built-in build systems first
for my $name (@BUILDSYSTEMS) {
- error("debhelper built-in buildsystem '$name' could not be found/loaded")
+ error("debhelper built-in build system '$name' could not be found/loaded")
if not exists $buildsystems{$name};
push @buildsystems, $buildsystems{$name};
delete $buildsystems{$name};
}
- # The rest are 3rd party buildsystems
+ # The rest are 3rd party build systems
for my $name (keys %buildsystems) {
my $inst = $buildsystems{$name};
$inst->{thirdparty} = 1;
@@ -132,7 +132,7 @@ sub buildsystems_init {
sub buildsystems_list {
my $step=shift;
- # List buildsystems (including auto and specified status)
+ # List build systems (including auto and specified status)
my ($auto, $specified);
my @buildsystems = load_all_buildsystems();
for my $inst (@buildsystems) {